X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=904c9a1dbc772bb1bcbf33d591124da8a41db9b6;hb=a992bf1121d3e1eef76fd6184b95fe079bb91558;hp=46ded354f7e392903c61d93712d0ad8baff38610;hpb=873165af1d9ae450483816b892aa17afd669a7c0;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 46ded354..904c9a1d 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007 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 @@ -16,20 +16,24 @@ #include +#include #include #include - -#include -#include "command-line.h" -#include "msg-ui.h" -#include "progname.h" -#include "read-line.h" +#include +#if HAVE_FPU_CONTROL_H +#include +#endif +#if HAVE_FENV_H +#include +#endif +#if HAVE_IEEEFP_H +#include +#endif #include #include #include #include -#include #include #include #include @@ -42,31 +46,24 @@ #include #include #include - -#if HAVE_FPU_CONTROL_H -#include -#endif - -#if HAVE_LOCALE_H -#include -#endif - -#if HAVE_FENV_H -#include -#endif - -#if HAVE_IEEEFP_H -#include -#endif +#include +#include +#include +#include +#include +#include +#include + +#include "fatal-signal.h" +#include "progname.h" #include "gettext.h" #define _(msgid) gettext (msgid) -#include 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); @@ -78,23 +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); - - set_program_name (argv[0]); + 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 (); @@ -104,43 +105,66 @@ 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 (); 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 + { + 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 (;;) { - msg_ui_init (the_source_stream); - if (!get_testing_mode ()) - outp_read_devices (); + 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 @@ -191,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) @@ -217,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); }