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

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index e3d3dbd7df..904c9a1dbc 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>
@@ -48,11 +47,14 @@
 #include <math/random.h>
 #include <output/output.h>
 #include <ui/debugger.h>
-#include <ui/terminal/command-line.h>
 #include <ui/terminal/msg-ui.h>
 #include <ui/terminal/read-line.h>
 #include <ui/terminal/terminal.h>
+#include <ui/terminal/terminal-opts.h>
+#include <ui/command-line.h>
+#include <ui/source-init-opts.h>
 
+#include "fatal-signal.h"
 #include "progname.h"
 
 #include "gettext.h"
@@ -61,7 +63,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);
@@ -73,24 +75,27 @@ static struct dataset * the_dataset = NULL;
 static struct lexer *the_lexer;
 static struct source_stream *the_source_stream ;
 
+const char *argp_program_version = version;
+const char *argp_program_bug_address = PACKAGE_BUGREPORT;
+
 /* Program entry point. */
 int
 main (int argc, char **argv)
 {
   int *view_width_p, *view_length_p;
-
+  struct command_line_processor *clp;
   set_program_name (argv[0]);
 
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
-  signal (SIGINT, interrupt_handler);
+  signal (SIGALRM, SIG_IGN);
+  at_fatal_signal (clean_up);
 
   i18n_init ();
   fpu_init ();
   gsl_set_error_handler_off ();
 
-  fmt_init ();
   outp_init ();
   fn_init ();
   fh_init ();
@@ -106,38 +111,60 @@ main (int argc, char **argv)
 
   the_dataset = create_dataset ();
 
-  if (parse_command_line (argc, argv, the_source_stream))
+
+
+  clp = command_line_processor_create (_("PSPP --- A program for statistical analysis"),
+				       _("FILE1, FILE2 ... FILEn"), NULL);
+
+  command_line_processor_add_options (clp, &io_argp,
+				      _("Options affecting input and output locations:"), the_source_stream);
+
+  command_line_processor_add_options (clp, &test_argp,
+				      _("Diagnositic options:"), the_source_stream);
+
+  command_line_processor_add_options (clp, &post_init_argp,
+				      _("Options affecting syntax and behavior:"), the_source_stream);
+
+  command_line_processor_parse (clp, argc, argv);
+
+  msg_ui_init (the_source_stream);
+
+  if (!settings_get_testing_mode ())
+    {
+      outp_read_devices ();
+    }
+  else
     {
-      msg_ui_init (the_source_stream);
-      if (!get_testing_mode ())
-        outp_read_devices ();
+      outp_configure_driver_line
+	(
+	 ss_cstr ("raw-ascii:ascii:listing:width=9999 length=9999 "
+		  "output-file=\"pspp.list\" emphasis=none "
+		  "headers=off paginate=off squeeze=on "
+		  "top-margin=0 bottom-margin=0"));
+    }
+
+  the_lexer = lex_create (the_source_stream);
+
+  for (;;)
+    {
+      int result = cmd_parse (the_lexer, the_dataset);
+
+      if (result == CMD_EOF || result == CMD_FINISH)
+	break;
+      if (result == CMD_CASCADING_FAILURE &&
+	  !getl_is_interactive (the_source_stream))
+	{
+	  msg (SE, _("Stopping syntax file processing here to avoid "
+		     "a cascade of dependent command failures."));
+	  getl_abort_noninteractive (the_source_stream);
+	}
       else
-        outp_configure_driver_line (
-          ss_cstr ("raw-ascii:ascii:listing:width=9999 length=9999 "
-                   "output-file=\"pspp.list\" emphasis=none "
-                   "headers=off paginate=off squeeze=on "
-                   "top-margin=0 bottom-margin=0"));
-      the_lexer = lex_create (the_source_stream);
-
-      for (;;)
-        {
-          int result = cmd_parse (the_lexer, the_dataset);
-
-          if (result == CMD_EOF || result == CMD_FINISH)
-            break;
-          if (result == CMD_CASCADING_FAILURE &&
-	      !getl_is_interactive (the_source_stream))
-            {
-              msg (SE, _("Stopping syntax file processing here to avoid "
-                         "a cascade of dependent command failures."));
-              getl_abort_noninteractive (the_source_stream);
-            }
-          else
-            check_msg_count (the_source_stream);
-        }
+	check_msg_count (the_source_stream);
     }
 
-  terminate (!any_errors ());
+
+  clean_up ();
+  return any_errors ();
 }
 
 static void
@@ -188,17 +215,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 +233,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);
 }