X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Fget-data.c;h=7e75b413ea49cf82fcb87a81daea8ba570e4b905;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=c3e842211dd95ac3bd06262cdeeab97cc0f84b38;hpb=332f2de0d9130b4746a30f473cbbdef481956fac;p=pspp-builds.git

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index c3e84221..7e75b413 100644
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,23 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/gnumeric-reader.h>
-#include <data/psql-reader.h>
-
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <language/data-io/data-parser.h>
-#include <language/data-io/data-reader.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/placement-parser.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/gnumeric-reader.h"
+#include "data/procedure.h"
+#include "data/psql-reader.h"
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/data-io/data-parser.h"
+#include "language/data-io/data-reader.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/placement-parser.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -163,6 +162,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 	{
 	  lex_match (lexer, T_EQUALS);
 	  gri.asw = lex_integer (lexer);
+	  lex_get (lexer);
 	}
       else if (lex_match_id (lexer, "SHEET"))
 	{
@@ -174,10 +174,13 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 
 	      gri.sheet_name = ss_xstrdup (lex_tokss (lexer));
 	      gri.sheet_index = -1;
+
+	      lex_get (lexer);
 	    }
 	  else if (lex_match_id (lexer, "INDEX"))
 	    {
 	      gri.sheet_index = lex_integer (lexer);
+	      lex_get (lexer);
 	    }
 	  else
 	    goto error;
@@ -189,7 +192,6 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 	  if (lex_match_id (lexer, "FULL"))
 	    {
 	      gri.cell_range = NULL;
-	      lex_put_back (lexer, T_ID);
 	    }
 	  else if (lex_match_id (lexer, "RANGE"))
 	    {
@@ -197,6 +199,7 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 		goto error;
 
 	      gri.cell_range = ss_xstrdup (lex_tokss (lexer));
+	      lex_get (lexer);
 	    }
 	  else
 	    goto error;
@@ -215,14 +218,12 @@ parse_get_gnm (struct lexer *lexer, struct dataset *ds)
 	    }
 	  else
 	    goto error;
-	  lex_put_back (lexer, T_ID);
 	}
       else
 	{
-	  printf ("Unknown data file type `%s'\n", lex_tokcstr (lexer));
+	  lex_error (lexer, NULL);
 	  goto error;
 	}
-      lex_get (lexer);
     }
 
   {
@@ -274,6 +275,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
   struct dictionary *dict = dict_create ();
   struct file_handle *fh = NULL;
   struct dfm_reader *reader = NULL;
+  char *name = NULL;
 
   int record;
   enum data_parser_type type;
@@ -465,15 +467,13 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
     }
   lex_match (lexer, T_EQUALS);
 
-
   record = 1;
   type = data_parser_get_type (parser);
   do
     {
-      char name[VAR_NAME_LEN + 1];
       struct fmt_spec input, output;
-      int fc, lc;
       struct variable *v;
+      int fc, lc;
 
       while (type == DP_FIXED && lex_match (lexer, T_SLASH))
         {
@@ -502,7 +502,7 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
 
       if (!lex_force_id (lexer))
         goto error;
-      strcpy (name, lex_tokcstr (lexer));
+      name = xstrdup (lex_tokcstr (lexer));
       lex_get (lexer);
 
       if (type == DP_DELIMITED)
@@ -539,6 +539,8 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
       else
         data_parser_add_fixed_field (parser, &input, var_get_case_index (v),
                                      name, record, fc);
+      free (name);
+      name = NULL;
     }
   while (lex_token (lexer) != T_ENDCMD);
 
@@ -554,5 +556,6 @@ parse_get_txt (struct lexer *lexer, struct dataset *ds)
   data_parser_destroy (parser);
   dict_destroy (dict);
   fh_unref (fh);
+  free (name);
   return CMD_CASCADING_FAILURE;
 }