X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=b8cabb3acb0fff818faf3e1de71766309b21f7ce;hb=1dabf6c48c0f5827a933af82c01a26bdf55488bd;hp=e3d3dbd7df5d7aaf92daa164ef566eea5dc8abd9;hpb=bce579d144b66ca2eee18f6d27d847285a96d7b9;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index e3d3dbd7..b8cabb3a 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -34,7 +34,6 @@
 #include <data/file-handle-def.h>
 #include <libpspp/getl.h>
 #include <data/file-name.h>
-#include <data/format.h>
 #include <data/procedure.h>
 #include <data/settings.h>
 #include <data/variable.h>
@@ -53,6 +52,7 @@
 #include <ui/terminal/read-line.h>
 #include <ui/terminal/terminal.h>
 
+#include "fatal-signal.h"
 #include "progname.h"
 
 #include "gettext.h"
@@ -61,7 +61,7 @@
 
 static void i18n_init (void);
 static void fpu_init (void);
-static void terminate (bool success) NO_RETURN;
+static void clean_up (void);
 
 /* If a segfault happens, issue a message to that effect and halt */
 void bug_handler(int sig);
@@ -84,13 +84,12 @@ main (int argc, char **argv)
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
-  signal (SIGINT, interrupt_handler);
+  at_fatal_signal (clean_up);
 
   i18n_init ();
   fpu_init ();
   gsl_set_error_handler_off ();
 
-  fmt_init ();
   outp_init ();
   fn_init ();
   fh_init ();
@@ -109,7 +108,7 @@ main (int argc, char **argv)
   if (parse_command_line (argc, argv, the_source_stream))
     {
       msg_ui_init (the_source_stream);
-      if (!get_testing_mode ())
+      if (!settings_get_testing_mode ())
         outp_read_devices ();
       else
         outp_configure_driver_line (
@@ -137,7 +136,8 @@ main (int argc, char **argv)
         }
     }
 
-  terminate (!any_errors ());
+  clean_up ();
+  return any_errors ();
 }
 
 static void
@@ -188,17 +188,9 @@ bug_handler(int sig)
     }
 }
 
-void
-interrupt_handler(int sig UNUSED)
-{
-  terminate (false);
-}
-
-
-/* Terminate PSPP.  SUCCESS should be true to exit successfully,
-   false to exit as a failure.  */
+/* Clean up PSPP in preparation for termination.  */
 static void
-terminate (bool success)
+clean_up (void)
 {
   static bool terminating = false;
   if (!terminating)
@@ -214,10 +206,7 @@ terminate (bool success)
       destroy_source_stream (the_source_stream);
       prompt_done ();
       readln_uninitialize ();
-
       outp_done ();
       msg_ui_done ();
-      fmt_done ();
     }
-  exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }