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

diff --git a/src/main.c b/src/main.c
index c747287c71..4c21603072 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,9 +18,9 @@
    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 "error.h"
@@ -28,7 +28,7 @@
 #include "glob.h"
 #include "lexer.h"
 #include "output.h"
-#include "version.h"
+#include "settings.h"
 #include <signal.h>
 
 #include <stdlib.h>
@@ -56,14 +56,14 @@ void bug_handler(int sig);
    we hit end-of-file unexpectedly (or whatever). */
 int start_interactive;
 
+
 /* Program entry point. */
 int
 main (int argc, char **argv)
 {
-  struct sigaction bug ;
-  bug.sa_handler = bug_handler;
+  signal (SIGSEGV, bug_handler);
 
-  sigaction(SIGSEGV, &bug,0);
+  gsl_set_error_handler_off();
 
   /* Initialization. */
   if (!outp_init ())
@@ -74,7 +74,6 @@ main (int argc, char **argv)
     msg (FE, _("Error initializing output drivers."));
 
   lex_init ();
-  cmd_init ();
 
   /* Execution. */
   parse_script ();
@@ -100,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.
@@ -118,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
@@ -161,8 +166,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 (); 
+    }
 }
 
 
@@ -171,36 +179,5 @@ 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);
+  request_bug_report_and_abort("Segmentation Violation");
 }
-