[Pspp-cvs] Changes to pspp/src/pfm-read.c

[John Darrington]

Index: pspp/src/pfm-read.c
diff -u pspp/src/pfm-read.c:1.19 pspp/src/pfm-read.c:1.20
--- pspp/src/pfm-read.c:1.19    Sat Mar 12 20:22:18 2005
+++ pspp/src/pfm-read.c Wed Apr 13 10:09:59 2005
@@ -497,7 +497,7 @@
   if (match (r, '6'))
     {
       weight_name = read_pool_string (r);
-      if (strlen (weight_name) > 8) 
+      if (strlen (weight_name) > SHORT_NAME_LEN) 
         error (r, _("Weight variable name (%s) truncated."), weight_name);
     }
   
@@ -520,7 +520,29 @@
       read_string (r, name);
       for (j = 0; j < 6; j++)
         fmt[j] = read_int (r);
+#if 0 
+        /* Weirdly enough, there is no # character in the SPSS portable
+        character set, so we can't check for it. */
+      if (strlen (name) > SHORT_NAME_LEN)
+       lose ((r, _("position %d: Variable name has %u characters."),
+              i, strlen (name)));
+      if ((name[0] < 74 /* A */ || name[0] > 125 /* Z */)
+         && name[0] != 152 /* @ */)
+       lose ((r, _("position %d: Variable name begins with invalid "
+                   "character."), i));
+      if (name[0] >= 100 /* a */ && name[0] <= 125 /* z */)
+       {
+         corrupt_msg (r, _("position %d: Variable name begins with "
+                           "lowercase letter %c."),
+                      i, name[0] - 100 + 'a');
+         name[0] -= 26 /* a - A */;
+       }
 
+      /* Verify remaining characters of variable name. */
+      for (j = 1; j < (int) strlen (name); j++)
+       {
+         int c = name[j];
+#endif
       if (!var_is_valid_name (name, false) || *name == '#') 
         error (r, _("position %d: Invalid variable name `%s'."), name);
       st_uppercase (name);