X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=4c216030726516b2d51a538b6a6e4f0f0266db67;hb=d2f8593a1f1d39a3264682af0da898a3d67b68cf;hp=3f519e5e0f6974ab477b1d01c268a111a0083660;hpb=fcb9e49b2a2d57af7c001ae5d2eda9ac443ba36b;p=pspp

diff --git a/src/main.c b/src/main.c
index 3f519e5e0f..4c21603072 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,19 +18,24 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
 #include <stdio.h>
+#include <gsl/gsl_errno.h>
+#include "main.h"
+#include "cmdline.h"
 #include "command.h"
 #include "error.h"
 #include "getline.h"
+#include "glob.h"
 #include "lexer.h"
 #include "output.h"
+#include "settings.h"
+#include <signal.h>
 
 #include <stdlib.h>
 
 #include "debug-print.h"
 
-static void parse_script (void) __attribute__ ((noreturn));
+static void parse_script (void) NO_RETURN;
 static void handle_error (int code);
 static int execute_command (void);
 
@@ -43,16 +48,22 @@ int finished;
 /* The current date in the form DD MMM YYYY. */
 char curdate[12];
 
+
+/* If a segfault happens, issue a message to that effect and halt */
+void bug_handler(int sig);
+
 /* Whether we're dropping down to interactive mode immediately because
    we hit end-of-file unexpectedly (or whatever). */
 int start_interactive;
 
+
 /* Program entry point. */
 int
 main (int argc, char **argv)
 {
-  void init_glob (int, char **);	/* Exported by glob.c. */
-  void parse_command_line (int, char **);	/* Exported by cmdline.c */
+  signal (SIGSEGV, bug_handler);
+
+  gsl_set_error_handler_off();
 
   /* Initialization. */
   if (!outp_init ())
@@ -63,7 +74,6 @@ main (int argc, char **argv)
     msg (FE, _("Error initializing output drivers."));
 
   lex_init ();
-  cmd_init ();
 
   /* Execution. */
   parse_script ();
@@ -89,6 +99,7 @@ parse_script (void)
 static int
 execute_command (void)
 {
+  int result;
   /* Read the command's first token.
      We may hit end of file.
      If so, give the line reader a chance to proceed to the next file.
@@ -107,7 +118,12 @@ execute_command (void)
 
   /* Parse the command. */
   getl_prompt = GETL_PRPT_CONTINUATION;
-  return cmd_parse ();
+  result =  cmd_parse ();
+ 
+  /* Unset the /ALGORITHM subcommand if it was used */
+  unset_cmd_algorithm ();
+
+  return result;
 }
 
 /* Print an error message corresponding to the command return code
@@ -150,6 +166,18 @@ handle_error (int code)
       while (token != T_STOP && token != '.')
 	lex_get ();
     }
-  else
-    lex_discard_line ();
+  else 
+    {
+      msg (SW, _("The rest of this command has been discarded."));
+      lex_discard_line (); 
+    }
+}
+
+
+
+/* If a segfault happens, issue a message to that effect and halt */
+void 
+bug_handler(int sig UNUSED)
+{
+  request_bug_report_and_abort("Segmentation Violation");
 }