Check token type before trying to match tokid. Fixes PR 12923.

[pspp] / src / file-type.c

diff --git a/src/file-type.c b/src/file-type.c
index e549ae9693a3ae42490130562bd33d16f27c6f45..87bd874f102dddec1b84a5757bc48500225dfe98 100644 (file)
--- a/src/file-type.c
+++ b/src/file-type.c
@@ -14,8 +14,8 @@
 
    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 <stdlib.h>
@@ -44,7 +44,7 @@ enum
 /* Limited variable column specifications. */
 struct col_spec
   {
-   char name[9];               /* Variable name. */
+    char name[LONG_NAME_LEN + 1]; /* Variable name. */
     int fc, nc;                        /* First column (1-based), # of columns. */
     int fmt;                   /* Format type. */
     struct variable *v;                /* Variable. */
@@ -264,7 +264,7 @@ cmd_file_type (void)
          goto error;
        }
       
-      if (!strcmp (fty->case_sbc.name, fty->record.name))
+      if (!strcasecmp (fty->case_sbc.name, fty->record.name))
        {
          msg (SE, _("CASE and RECORD must specify different variable "
                     "names."));
@@ -280,7 +280,7 @@ cmd_file_type (void)
   create_col_var (&fty->record);
   if (fty->case_sbc.name[0])
     create_col_var (&fty->case_sbc);
-  vfm_source = create_case_source (&file_type_source_class, default_dict, fty);
+  vfm_source = create_case_source (&file_type_source_class, fty);
 
   return CMD_SUCCESS;
 
@@ -435,7 +435,7 @@ cmd_record_type (void)
     {
       int mv = 0;
 
-      while (token == T_NUM || token == T_STRING)
+      while (lex_is_number () || token == T_STRING)
        {
          if (rct->nv >= mv)
            {