Had to get last call to multipass_split_output() inside

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

diff --git a/src/main.c b/src/main.c
index 97fbdf8b951eb10225a7ebe6674e84a3693da952..987daa8f638a7e1b395a7c87ed3a06726320bcfe 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -18,8 +18,9 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include "main.h"
 #include <stdio.h>
+#include <gsl/gsl_errno.h>
+#include "main.h"
 #include "cmdline.h"
 #include "command.h"
 #include "error.h"
@@ -54,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);
@@ -155,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 (); 
+    }
 }