Omit `-' in F format if value rounds to zero.

[pspp-builds.git] / src / title.c

diff --git a/src/title.c b/src/title.c
index cb56f84db2db7e38a57b2b7d543b83ac93b3bca7..e8d95bf0e58a26c7cc02c578428f9bc4d01cb60f 100644 (file)
--- a/src/title.c
+++ b/src/title.c
@@ -14,14 +14,15 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include <ctype.h>
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
 #include "lexer.h"
 #include "main.h"
@@ -60,7 +61,7 @@ get_title (const char *cmd, char **title)
        return CMD_FAILURE;
       if (*title)
        free (*title);
-      *title = xstrdup (ds_value (&tokstr));
+      *title = xstrdup (ds_c_str (&tokstr));
       lex_get ();
       if (token != '.')
        {
@@ -116,7 +117,7 @@ add_document_line (const char *line, int indent)
 
   memcpy (new_documents, old_documents, old_len);
   memset (new_documents + old_len, ' ', indent);
-  st_bare_pad_copy (new_documents + old_len + indent, line, 80 - indent);
+  buf_copy_str_rpad (new_documents + old_len + indent, 80 - indent, line);
   new_documents[old_len + 80] = '\0';
 
   dict_set_documents (default_dict, new_documents);