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

diff --git a/src/main.c b/src/main.c
index b20f8a24..c5f9c34f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,17 +18,19 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include "main.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 "version.h"
+#include "settings.h"
+#include "var.h"
 #include <signal.h>
 
 #include <stdlib.h>
@@ -52,15 +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;
 
+
+
+
+
+
 /* 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_off();
 
   /* Initialization. */
   if (!outp_init ())
@@ -96,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.
@@ -114,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
@@ -157,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 (); 
+    }
 }
 
 
@@ -167,36 +195,23 @@ handle_error (int code)
 void 
 bug_handler(int sig UNUSED)
 {
-  fprintf(stderr,
-	  "******************************************************************\n"
-	  "You have discovered a bug in PSPP.\n\n"
-	  "  Please report this, by sending "
-	  "an email to " PACKAGE_BUGREPORT ",\n"
-	  "explaining what you were doing when this happened, and including\n"
-	  "a sample of your input file which caused it.\n");
-
-  fprintf(stderr,
-	  "Also, please copy the following lines into your bug report:\n\n"
-	  "bare_version:        %s\n" 
-	  "version:             %s\n"
-	  "stat_version:        %s\n"
-	  "host_system:         %s\n"
-	  "build_system:        %s\n"
-	  "default_config_path: %s\n"
-	  "include_path:        %s\n"
-	  "groff_font_path:     %s\n"
-	  "locale_dir:          %s\n"
-	  "******************************************************************\n",
-	  bare_version,         
-	  version,
-	  stat_version,
-	  host_system,        
-	  build_system,
-	  default_config_path,
-	  include_path, 
-	  groff_font_path,
-	  locale_dir);     
-
-  exit(-1);
+  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);
+}