Change enum legacy_encoding to const char *.

[pspp-builds.git] / src / language / data-io / file-handle.q

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index d53017735259eeec6b6cb2635fa4dd5734e9f17e..60eeee7b559089fd7e65766ceef1b8e777afe5a4 100644 (file)
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -15,6 +15,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+#include <limits.h>
 #include <language/data-io/file-handle.h>
 #include <libpspp/message.h>
 #include <errno.h>
@@ -41,7 +42,8 @@
      name=string;
      lrecl=integer;
      tabwidth=integer "x>=0" "%s must be nonnegative";
-     mode=mode:!character/image/scratch.
+     mode=mode:!character/binary/image/360/scratch;
+     recform=recform:fixed/f/variable/v/spanned/vs.
 */
 /* (declarations) */
 /* (functions) */
@@ -49,9 +51,7 @@
 int
 cmd_file_handle (struct lexer *lexer, struct dataset *ds)
 {
-  char handle_name[LONG_NAME_LEN + 1];
-  struct fh_properties properties = *fh_default_properties ();
-
+  char handle_name[VAR_NAME_LEN + 1];
   struct cmd_file_handle cmd;
   struct file_handle *handle;
 
@@ -78,39 +78,69 @@ cmd_file_handle (struct lexer *lexer, struct dataset *ds)
   if (lex_end_of_command (lexer) != CMD_SUCCESS)
     goto lossage;
 
-  if (cmd.s_name == NULL && cmd.mode != FH_SCRATCH)
+  if (cmd.mode != FH_SCRATCH)
     {
-      lex_sbc_missing (lexer, "NAME");
-      goto lossage;
-    }
+      struct fh_properties properties = *fh_default_properties ();
 
-  switch (cmd.mode)
-    {
-    case FH_CHARACTER:
-      properties.mode = FH_MODE_TEXT;
-      if (cmd.sbc_tabwidth)
-        properties.tab_width = cmd.n_tabwidth[0];
-      break;
-    case FH_IMAGE:
-      properties.mode = FH_MODE_BINARY;
-      if (cmd.n_lrecl[0] == LONG_MIN)
-        msg (SE, _("Fixed-length records were specified on /RECFORM, but "
-                   "record length was not specified on /LRECL.  "
-                   "Assuming %zu-character records."),
-             properties.record_width);
-      else if (cmd.n_lrecl[0] < 1)
-        msg (SE, _("Record length (%ld) must be at least one byte.  "
-                   "Assuming %zu-character records."),
-             cmd.n_lrecl[0], properties.record_width);
-      else
-        properties.record_width = cmd.n_lrecl[0];
-      break;
-    default:
-      NOT_REACHED ();
-    }
+      if (cmd.s_name == NULL)
+        {
+          lex_sbc_missing (lexer, "NAME");
+          goto lossage;
+        }
 
-  if (cmd.mode != FH_SCRATCH)
-    fh_create_file (handle_name, cmd.s_name, &properties);
+      switch (cmd.mode)
+        {
+        case FH_CHARACTER:
+          properties.mode = FH_MODE_TEXT;
+          if (cmd.sbc_tabwidth)
+            properties.tab_width = cmd.n_tabwidth[0];
+          break;
+        case FH_IMAGE:
+          properties.mode = FH_MODE_FIXED;
+          break;
+        case FH_BINARY:
+          properties.mode = FH_MODE_VARIABLE;
+          break;
+        case FH_360:
+          properties.encoding = "PSPP-LEGACY-EBCDIC";
+          if (cmd.recform == FH_FIXED || cmd.recform == FH_F)
+            properties.mode = FH_MODE_FIXED;
+          else if (cmd.recform == FH_VARIABLE || cmd.recform == FH_V)
+            {
+              properties.mode = FH_MODE_360_VARIABLE;
+              properties.record_width = 8192;
+            }
+          else if (cmd.recform == FH_SPANNED || cmd.recform == FH_VS)
+            {
+              properties.mode = FH_MODE_360_SPANNED;
+              properties.record_width = 8192;
+            }
+          else
+            {
+              msg (SE, _("RECFORM must be specified with MODE=360."));
+              goto lossage;
+            }
+          break;
+        default:
+          NOT_REACHED ();
+        }
+
+      if (properties.mode == FH_MODE_FIXED || cmd.n_lrecl[0] != LONG_MIN)
+        {
+          if (cmd.n_lrecl[0] == LONG_MIN)
+            msg (SE, _("The specified file mode requires LRECL.  "
+                       "Assuming %d-character records."),
+                 properties.record_width);
+          else if (cmd.n_lrecl[0] < 1 || cmd.n_lrecl[0] >= (1UL << 31))
+            msg (SE, _("Record length (%ld) must be between 1 and %lu bytes.  "
+                       "Assuming %d-character records."),
+                 cmd.n_lrecl[0], (1UL << 31) - 1, properties.record_width);
+          else
+            properties.record_width = cmd.n_lrecl[0];
+        }
+
+      fh_create_file (handle_name, cmd.s_name, &properties);
+    }
   else
     fh_create_scratch (handle_name);
 
@@ -181,7 +211,7 @@ fh_parse (struct lexer *lexer, enum fh_referent referent_mask)
         handle = fh_from_id (lex_tokid (lexer));
       if (handle == NULL)
         {
-          if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || get_syntax () != ENHANCED)
+          if (lex_token (lexer) != T_ID || lex_tokid (lexer)[0] != '#' || settings_get_syntax () != ENHANCED)
             handle = fh_create_file (NULL, ds_cstr (lex_tokstr (lexer)),
                                      fh_default_properties ());
           else