X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=c5f9c34f4478f743a06f6cb983194b6be8dd7034;hb=e32e05bf60402d3229e45adcc9b4c8d5bb27d174;hp=e25991862f7301b2e90e2bf5df0fc84093f648c4;hpb=4944c86a9318bc5b5578ab145a95c116ffd2c9fd;p=pspp-builds.git

diff --git a/src/main.c b/src/main.c
index e2599186..c5f9c34f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,21 +18,26 @@
    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 "dictionary.h"
 #include "error.h"
 #include "getline.h"
+#include "glob.h"
 #include "lexer.h"
 #include "output.h"
+#include "settings.h"
+#include "var.h"
+#include <signal.h>
 
 #include <stdlib.h>
 
-#undef DEBUGGING
-/*#define DEBUGGING 1*/
 #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);
 
@@ -45,16 +50,32 @@ 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);
+
+/* Handle quit/term/int signals */
+void interrupt_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);
+  signal (SIGFPE,  bug_handler);
+  signal (SIGINT,  interrupt_handler);
+
+  gsl_set_error_handler_off();
 
   /* Initialization. */
   if (!outp_init ())
@@ -65,10 +86,12 @@ main (int argc, char **argv)
     msg (FE, _("Error initializing output drivers."));
 
   lex_init ();
-  cmd_init ();
 
   /* Execution. */
   parse_script ();
+
+  /* Should never be reached */
+  return (-1);
 }
 
 /* Parses the entire script. */
@@ -81,13 +104,15 @@ parse_script (void)
       handle_error (execute_command ());
     }
 
-  err_hcf (1);
+  err_hcf (err_error_count==0);
 }
 
 /* Parse and execute a command, returning its return code. */
 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.
@@ -101,12 +126,20 @@ execute_command (void)
 	break;
 
       if (!getl_perform_delayed_reset ())
-	err_hcf (1);
+	err_hcf (err_error_count==0);
     }
 
   /* 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 ();
+
+  /* Clear any auxiliary data from the dictionary. */
+  dict_clear_aux (default_dict);
+
+  return result;
 }
 
 /* Print an error message corresponding to the command return code
@@ -149,6 +182,36 @@ 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)
+{
+  switch (sig) 
+    {
+    case SIGFPE:
+      request_bug_report_and_abort("Floating Point Exception");
+      break;
+    case SIGSEGV:
+      request_bug_report_and_abort("Segmentation Violation");
+      break;
+    default:
+      request_bug_report_and_abort("");
+      break;
+    }
+}
+
+
+void 
+interrupt_handler(int sig UNUSED)
+{
+  err_hcf(0);
 }