* Makefile.am: Add pspp-mode.el to EXTRA_DIST.

[pspp] / src / file-type.c

diff --git a/src/file-type.c b/src/file-type.c
index 42ca684304cb088e20e8275a674c1b7a83dfb654..b90ae1840dbc1b7a462086ea85fcdb4ee76c5326 100644 (file)
--- a/src/file-type.c
+++ b/src/file-type.c
@@ -44,7 +44,7 @@ enum
 /* Limited variable column specifications. */
 struct col_spec
   {
-   char name[SHORT_NAME_LEN + 1];      /* 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. */
@@ -94,6 +94,8 @@ struct file_type_pgm
 static int parse_col_spec (struct col_spec *, const char *);
 static void create_col_var (struct col_spec *c);
 
+int cmd_file_type (void);
+
 /* Parses FILE TYPE command. */
 int
 cmd_file_type (void)
@@ -264,7 +266,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."));
@@ -448,8 +450,8 @@ cmd_record_type (void)
              if (!lex_force_string ())
                goto error;
              rct->v[rct->nv].c = xmalloc (fty->record.nc + 1);
-             st_bare_pad_copy (rct->v[rct->nv].c, ds_c_str (&tokstr),
-                               fty->record.nc + 1);
+             buf_copy_str_rpad (rct->v[rct->nv].c, fty->record.nc + 1,
+                                 ds_c_str (&tokstr));
            }
          else
            {
@@ -569,6 +571,7 @@ cmd_record_type (void)
 \f
 /* END FILE TYPE. */
 
+int cmd_end_file_type (void);
 int
 cmd_end_file_type (void)
 {