Fixed configuration problems with gsl

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

diff --git a/src/main.c b/src/main.c
index 97fbdf8b951eb10225a7ebe6674e84a3693da952..4c216030726516b2d51a538b6a6e4f0f0266db67 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"
@@ -27,6 +28,7 @@
 #include "glob.h"
 #include "lexer.h"
 #include "output.h"
+#include "settings.h"
 #include <signal.h>
 
 #include <stdlib.h>
@@ -54,12 +56,15 @@ 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)
 {
   signal (SIGSEGV, bug_handler);
 
+  gsl_set_error_handler_off();
+
   /* Initialization. */
   if (!outp_init ())
     err_hcf (0);
@@ -94,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.
@@ -112,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
@@ -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 (); 
+    }
 }