X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=af8f7f2dd4df9828361a1dccfdb54d09473875b9;hb=b5c82cc9aabe7e641011130240ae1b2e84348e23;hp=e3d3dbd7df5d7aaf92daa164ef566eea5dc8abd9;hpb=bce579d144b66ca2eee18f6d27d847285a96d7b9;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index e3d3dbd7..af8f7f2d 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, 2007 Free Software Foundation, Inc. + 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 @@ -16,7 +16,6 @@ #include -#include #include #include #include @@ -30,11 +29,12 @@ #include #endif + +#include #include #include #include #include -#include #include #include #include @@ -48,20 +48,22 @@ #include #include #include -#include #include #include #include +#include +#include +#include +#include "fatal-signal.h" #include "progname.h" #include "gettext.h" #define _(msgid) gettext (msgid) -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,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) { 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); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - fmt_init (); outp_init (); fn_init (); fh_init (); @@ -106,55 +110,62 @@ 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, + _("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); + + 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 -i18n_init (void) -{ -#if ENABLE_NLS -#if HAVE_LC_MESSAGES - setlocale (LC_MESSAGES, ""); -#endif -#if HAVE_LC_PAPER - setlocale (LC_PAPER, ""); -#endif - bindtextdomain (PACKAGE, locale_dir); - textdomain (PACKAGE); -#endif /* ENABLE_NLS */ -} - static void fpu_init (void) { @@ -188,17 +199,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 +217,8 @@ terminate (bool success) destroy_source_stream (the_source_stream); prompt_done (); readln_uninitialize (); - outp_done (); msg_ui_done (); - fmt_done (); + i18n_done (); } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }