Make the expression code a little nicer and fix bugs found

[pspp-builds.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index b20f8a24414ad7887483cc5bd0da636c55f31ba3..987daa8f638a7e1b395a7c87ed3a06726320bcfe 100644 (file)
--- 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,6 @@
 #include "glob.h"
 #include "lexer.h"
 #include "output.h"
-#include "version.h"
 #include <signal.h>
 
 #include <stdlib.h>
@@ -56,12 +55,22 @@ void bug_handler(int sig);
    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);
 
+  gsl_set_error_handler(err_handler_gsl);
+
   /* Initialization. */
   if (!outp_init ())
     err_hcf (0);
@@ -157,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 (); 
+    }
 }
 
 
@@ -167,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");
 }
-