Adopt use of gnulib for portability.

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

diff --git a/src/title.c b/src/title.c
index cea04c63a966c96a46220d17b4905462eda8ad8b..d4a95c18d478e3eb35fd6d602df1b9301aca8f9f 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"
@@ -30,8 +31,9 @@
 #include "version.h"
 #include "vfm.h"
 
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "debug-print.h"
 
 static int get_title (const char *cmd, char **title);
@@ -62,7 +64,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 != '.')
        {
@@ -77,6 +79,7 @@ get_title (const char *cmd, char **title)
       if (*title)
        free (*title);
       *title = xstrdup (lex_rest_of_line (NULL));
+      lex_discard_line ();
       for (cp = *title; *cp; cp++)
        *cp = toupper ((unsigned char) (*cp));
       token = '.';
@@ -89,16 +92,14 @@ get_title (const char *cmd, char **title)
 int
 cmd_file_label (void)
 {
-  char *label;
+  const char *label;
 
   label = lex_rest_of_line (NULL);
+  lex_discard_line ();
   while (isspace ((unsigned char) *label))
     label++;
 
-  free (default_dict.label);
-  default_dict.label = xstrdup (label);
-  if (strlen (default_dict.label) > 60)
-    default_dict.label[60] = 0;
+  dict_set_label (default_dict, label);
   token = '.';
 
   return CMD_SUCCESS;
@@ -109,14 +110,22 @@ cmd_file_label (void)
 static void
 add_document_line (const char *line, int indent)
 {
-  char *doc;
-
-  default_dict.n_documents++;
-  default_dict.documents = xrealloc (default_dict.documents,
-                                    80 * default_dict.n_documents);
-  doc = &default_dict.documents[80 * (default_dict.n_documents - 1)];
-  memset (doc, ' ', indent);
-  st_bare_pad_copy (&doc[indent], line, 80 - indent);
+  const char *old_documents;
+  size_t old_len;
+  char *new_documents;
+
+  old_documents = dict_get_documents (default_dict);
+  old_len = old_documents != NULL ? strlen (old_documents) : 0;
+  new_documents = xmalloc (old_len + 81);
+
+  memcpy (new_documents, old_documents, old_len);
+  memset (new_documents + old_len, ' ', 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);
+
+  free (new_documents);
 }
 
 /* Performs the DOCUMENT command. */
@@ -128,7 +137,7 @@ cmd_document (void)
     char buf[256];
     struct tm *tmp = localtime (&last_vfm_invocation);
 
-    if (default_dict.n_documents)
+    if (dict_get_documents (default_dict) != NULL)
       add_document_line ("", 0);
 
     sprintf (buf, _("Document entered %s %02d:%02d:%02d by %s (%s):"),
@@ -140,20 +149,21 @@ cmd_document (void)
   for (;;)
     {
       int had_dot;
-      char *line;
+      const char *orig_line;
+      char *copy_line;
 
-      line = lex_rest_of_line (&had_dot);
-      while (isspace ((unsigned char) *line))
-       line++;
+      orig_line = lex_rest_of_line (&had_dot);
+      lex_discard_line ();
+      while (isspace ((unsigned char) *orig_line))
+       orig_line++;
 
+      copy_line = xmalloc (strlen (orig_line) + 2);
+      strcpy (copy_line, orig_line);
       if (had_dot)
-       {
-         char *cp = strchr (line, 0);
-         *cp++ = '.';
-         *cp = 0;
-       }
+        strcat (copy_line, ".");
 
-      add_document_line (line, 3);
+      add_document_line (copy_line, 3);
+      free (copy_line);
 
       lex_get_line ();
       if (had_dot)
@@ -168,12 +178,7 @@ cmd_document (void)
 int
 cmd_drop_documents (void)
 {
-  lex_match_id ("DROP");
-  lex_match_id ("DOCUMENTS");
-
-  free (default_dict.documents);
-  default_dict.documents = NULL;
-  default_dict.n_documents = 0;
+  dict_set_documents (default_dict, NULL);
 
   return lex_end_of_command ();
 }