Continue reforming error message support. In this phase, drop actual

[pspp] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 0a09cda97c71d27200f2802fd2a53804f04c0847..16058e45d33913dda0224d721fc7e188409e93a9 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -18,24 +18,29 @@
    02110-1301, USA. */
 
 #include <config.h>
-#include <gsl/gsl_errno.h>
-#include <signal.h>
-#include <stdio.h>
+
 #include "command-line.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "file-handle-def.h"
-#include "filename.h"
-#include "line-buffer.h"
-#include "lexer.h"
-#include "output.h"
+#include "msg-ui.h"
 #include "progname.h"
-#include "random.h"
 #include "read-line.h"
-#include "settings.h"
-#include "variable.h"
-#include "version.h"
+
+#include <data/dictionary.h>
+#include <data/file-handle-def.h>
+#include <data/file-name.h>
+#include <data/settings.h>
+#include <data/variable.h>
+#include <gsl/gsl_errno.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/line-buffer.h>
+#include <libpspp/compiler.h>
+#include <libpspp/message.h>
+#include <libpspp/version.h>
+#include <math/random.h>
+#include <output/output.h>
+#include <signal.h>
+#include <stdio.h>
+
 
 #if HAVE_FPU_CONTROL_H
 #include <fpu_control.h>
@@ -54,12 +59,11 @@
 
 #include <stdlib.h>
 
-#include "debug-print.h"
-
 static void i18n_init (void);
 static void fpu_init (void);
 static void handle_error (int code);
 static int execute_command (void);
+static void terminate (bool success) NO_RETURN;
 
 /* If a segfault happens, issue a message to that effect and halt */
 void bug_handler(int sig);
@@ -67,7 +71,6 @@ void bug_handler(int sig);
 /* Handle quit/term/int signals */
 void interrupt_handler(int sig);
 
-void terminate (bool success);
 
 /* Program entry point. */
 int
@@ -83,6 +86,7 @@ main (int argc, char **argv)
   gsl_set_error_handler_off ();
 
   outp_init ();
+  msg_ui_init ();
   fn_init ();
   fh_init ();
   getl_initialize ();
@@ -101,7 +105,7 @@ main (int argc, char **argv)
         {
           int retval;
 
-          err_check_count ();
+          check_msg_count ();
 
           retval = execute_command ();
           if (retval == CMD_EOF)
@@ -111,8 +115,7 @@ main (int argc, char **argv)
         }
     }
   
-  terminate (err_error_count == 0);
-  abort ();
+  terminate (!any_errors ());
 }
 
 /* Parse and execute a command, returning its return code. */
@@ -246,25 +249,26 @@ interrupt_handler(int sig UNUSED)
 
 /* Terminate PSPP.  SUCCESS should be true to exit successfully,
    false to exit as a failure.  */
-void
+static void
 terminate (bool success)
 {
   static bool terminating = false;
-  if (terminating)
-    return;
-  terminating = true;
-
-  err_done ();
-  outp_done ();
+  if (!terminating) 
+    {
+      terminating = true;
 
-  cancel_transformations ();
-  dict_destroy (default_dict);
+      cancel_transformations ();
+      dict_destroy (default_dict);
 
-  random_done ();
-  settings_done ();
-  fh_done ();
-  lex_done ();
-  getl_uninitialize ();
+      random_done ();
+      settings_done ();
+      fh_done ();
+      lex_done ();
+      getl_uninitialize ();
+      readln_uninitialize ();
 
+      outp_done ();
+      msg_ui_done ();
+    }
   exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }