X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=1366bd7aad307090b7118c1473771b37a5905f7c;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=2f7d1fbea7baada5b5aafd6d50ff09139518e78f;hpb=9491a8bd354152d3a228e1bf041c7ad6228750d7;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 2f7d1fbe..1366bd7a 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,38 +1,40 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #include <signal.h>
 #include <stdio.h>
+#include <stdlib.h>
+#if HAVE_FPU_CONTROL_H
+#include <fpu_control.h>
+#endif
+#if HAVE_FENV_H
+#include <fenv.h>
+#endif
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
 
-#include <ui/debugger.h>
-#include "command-line.h"
-#include "msg-ui.h"
-#include "progname.h"
-#include "read-line.h"
 
-#include <data/fastfile-factory.h>
+#include <libpspp/i18n.h>
 #include <data/dictionary.h>
 #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>
@@ -44,28 +46,25 @@
 #include <libpspp/message.h>
 #include <libpspp/version.h>
 #include <math/random.h>
-#include <output/output.h>
-
-#if HAVE_FPU_CONTROL_H
-#include <fpu_control.h>
-#endif
-
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#if HAVE_FENV_H
-#include <fenv.h>
-#endif
+#include <output/driver.h>
+#include <ui/debugger.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 "relocatable.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <stdlib.h>
 
-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);
@@ -77,24 +76,26 @@ 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)
 {
-  struct casefile_factory *factory;
+  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);
+  at_fatal_signal (clean_up);
 
-  set_program_name ("pspp");
   i18n_init ();
   fpu_init ();
   gsl_set_error_handler_off ();
 
-  fmt_init ();
-  outp_init ();
   fn_init ();
   fh_init ();
   the_source_stream =
@@ -103,72 +104,76 @@ main (int argc, char **argv)
 			  );
   prompt_init ();
   readln_initialize ();
-  settings_init ();
+  terminal_init (&view_width_p, &view_length_p);
+  settings_init (view_width_p, view_length_p);
   random_init ();
 
-  factory = fastfile_factory_create ();
+  the_dataset = create_dataset ();
+
+
+
+  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,
+				      _("Diagnostic 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);
 
-  the_dataset = create_dataset (factory, NULL, NULL);
+  the_lexer = lex_create (the_source_stream);
 
-  if (parse_command_line (argc, argv, the_source_stream))
+  for (;;)
     {
-      msg_ui_init (the_source_stream);
-      outp_read_devices ();
-      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);
-        }
+      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);
     }
 
-  terminate (!any_errors ());
+
+  clean_up ();
+  return any_errors ();
 }
 
-static void
-i18n_init (void) 
-{
-#if ENABLE_NLS
-#if HAVE_LC_MESSAGES
-  setlocale (LC_MESSAGES, "");
-#endif
-  setlocale (LC_MONETARY, "");
-  bindtextdomain (PACKAGE, locale_dir);
-  textdomain (PACKAGE);
-#endif /* ENABLE_NLS */
-}
 
 static void
-fpu_init (void) 
+fpu_init (void)
 {
 #if HAVE_FEHOLDEXCEPT
   fenv_t foo;
   feholdexcept (&foo);
 #elif HAVE___SETFPUCW && defined(_FPU_IEEE)
   __setfpucw (_FPU_IEEE);
+#elif HAVE_FPSETMASK
+  fpsetmask (0);
 #endif
 }
 
 /* If a segfault happens, issue a message to that effect and halt */
-void 
+void
 bug_handler(int sig)
 {
 #if DEBUGGING
   connect_debugger ();
 #endif
-  switch (sig) 
+  switch (sig)
     {
     case SIGABRT:
       request_bug_report_and_abort("Assertion Failure/Abort");
@@ -181,20 +186,12 @@ 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) 
+  if (!terminating)
     {
       terminating = true;
 
@@ -207,10 +204,8 @@ terminate (bool success)
       destroy_source_stream (the_source_stream);
       prompt_done ();
       readln_uninitialize ();
-
-      outp_done ();
+      output_close ();
       msg_ui_done ();
-      fmt_done ();
+      i18n_done ();
     }
-  exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
 }