X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.c;h=c5f9c34f4478f743a06f6cb983194b6be8dd7034;hb=29c51e39acf3554a56aa2adc9451cc5fd70318ae;hp=3b7687b2cede0bb7367d99dc3cc2d1153ac0d7bf;hpb=e132e968f80b02482422a14b6c0a20ce63ad1d09;p=pspp-builds.git

diff --git a/src/main.c b/src/main.c
index 3b7687b2..c5f9c34f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,11 +23,14 @@
 #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>
@@ -51,25 +54,28 @@ 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;
 
-/* Initialise error handling on the gsl library */
-static void 
-err_handler_gsl (const char *reason, const char *file,
-	int line, int gsl_errno UNUSED)
-{
-  msg(FE, _("gsl error at %s:%d; reason: \"%s\""), file,line,reason);
-}
+
+
+
+
 
 /* Program entry point. */
 int
 main (int argc, char **argv)
 {
+
   signal (SIGSEGV, bug_handler);
+  signal (SIGFPE,  bug_handler);
+  signal (SIGINT,  interrupt_handler);
 
-  gsl_set_error_handler(err_handler_gsl);
+  gsl_set_error_handler_off();
 
   /* Initialization. */
   if (!outp_init ())
@@ -105,6 +111,8 @@ 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.
@@ -123,7 +131,15 @@ 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 ();
+
+  /* Clear any auxiliary data from the dictionary. */
+  dict_clear_aux (default_dict);
+
+  return result;
 }
 
 /* Print an error message corresponding to the command return code
@@ -166,8 +182,11 @@ 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 (); 
+    }
 }
 
 
@@ -176,5 +195,23 @@ handle_error (int code)
 void 
 bug_handler(int sig UNUSED)
 {
-  request_bug_report_and_abort("Segmentation Violation");
+  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);
 }