X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fcommand-line.c;h=95b22cebf8bea93995e87833ed3fec52bf64f044;hb=f606d3c31ea117f7b9cb187f3521c7051a8db2ba;hp=e152f7009992eb55ad6194bddb62d4efd323488e;hpb=458d169f64134f4e0a9d9b72398666a01761fcf8;p=pspp

diff --git a/src/ui/terminal/command-line.c b/src/ui/terminal/command-line.c
index e152f70099..95b22cebf8 100644
--- a/src/ui/terminal/command-line.c
+++ b/src/ui/terminal/command-line.c
@@ -23,7 +23,6 @@
 #include <errno.h>
 #include <getopt.h>
 #include <stdlib.h>
-#include <libpspp/alloc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/copyleft.h>
 #include <libpspp/message.h>
@@ -38,6 +37,8 @@
 #include <libpspp/verbose-msg.h>
 #include "read-line.h"
 
+#include "xalloc.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -95,9 +96,9 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 	  /* Compatibility options */
         case 'a':
 	  if ( 0 == strcmp(optarg,"compatible") )
-	      set_algorithm(COMPATIBLE);
+	      settings_set_algorithm(COMPATIBLE);
 	  else if ( 0 == strcmp(optarg,"enhanced"))
-	      set_algorithm(ENHANCED);
+	      settings_set_algorithm(ENHANCED);
 	  else
 	    {
 	      usage ();
@@ -107,9 +108,9 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 
 	case 'x':
 	  if ( 0 == strcmp(optarg,"compatible") )
-	    set_syntax(COMPATIBLE);
+	    settings_set_syntax (COMPATIBLE);
 	  else if ( 0 == strcmp(optarg,"enhanced"))
-	    set_syntax(ENHANCED);
+	    settings_set_syntax (ENHANCED);
 	  else
 	    {
 	      usage ();
@@ -161,7 +162,7 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 	  process_statrc = false;
 	  break;
 	case 's':
-	  set_safer_mode ();
+	  settings_set_safer_mode ();
 	  break;
 	case 'v':
 	  verbose_increment_level ();
@@ -171,8 +172,7 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
 	  puts (legal);
 	  return false;
         case 'T':
-          force_long_view ();
-          set_testing_mode (true);
+          settings_set_testing_mode (true);
           break;
 	case '?':
 	  usage ();
@@ -189,7 +189,11 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
       char *pspprc_fn = fn_search_path ("rc", config_path);
       if (pspprc_fn != NULL)
         {
-	  getl_append_source (ss, create_syntax_file_source (pspprc_fn));
+	  getl_append_source (ss,
+			      create_syntax_file_source (pspprc_fn),
+			      GETL_BATCH,
+			      ERRMODE_CONTINUE
+			      );
 
           free (pspprc_fn);
         }
@@ -200,13 +204,20 @@ parse_command_line (int argc, char **argv, struct source_stream *ss)
       outp_configure_macro (argv[i]);
     else
       {
-	getl_append_source (ss, create_syntax_file_source (argv[i]));
+	getl_append_source (ss,
+			    create_syntax_file_source (argv[i]),
+			    GETL_BATCH,
+			    ERRMODE_CONTINUE
+			    );
         syntax_files++;
       }
 
   if (!syntax_files || interactive_mode)
     {
-      getl_append_source (ss, create_readln_source () );
+      getl_append_source (ss, create_readln_source (),
+			  GETL_INTERACTIVE,
+			  ERRMODE_CONTINUE
+			  );
       if (!cleared_device_defaults)
         outp_configure_add ("interactive");
     }