Clean up file handle code in preparation to add temporary file

[pspp] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4918eefc2091ed567a897c7ba5bae518b0651b55..d52741d1bd8605c35c73daf67f09fa541d933d3c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,7 +26,7 @@
 #include "command.h"
 #include "dictionary.h"
 #include "error.h"
-#include "file-handle.h"
+#include "file-handle-def.h"
 #include "filename.h"
 #include "getl.h"
 #include "glob.h"
@@ -34,6 +34,7 @@
 #include "output.h"
 #include "progname.h"
 #include "random.h"
+#include "readln.h"
 #include "settings.h"
 #include "var.h"
 #include "version.h"
@@ -92,6 +93,7 @@ main (int argc, char **argv)
   fn_init ();
   fh_init ();
   getl_initialize ();
+  readln_initialize ();
   settings_init ();
   random_init ();
 
@@ -155,7 +157,16 @@ execute_command (void)
       if (token != T_STOP)
        break;
 
-      if (!getl_perform_delayed_reset ())
+      /* Sets the options flag of the current script to 0, thus allowing it
+        to be read in.  Returns nonzero if this action was taken, zero
+        otherwise. */
+      if (getl_head && getl_head->separate)
+       {
+         getl_head->separate = 0;
+         discard_variables ();
+         lex_reset_eof ();
+       }
+      else
        terminate (err_error_count == 0);
     }
 
@@ -206,7 +217,7 @@ handle_error (int code)
       assert (0);
     }
 
-  if (getl_reading_script)
+  if (getl_reading_script())
     {
       err_break ();
       while (token != T_STOP && token != '.')