X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=e37cace39ec05af2527c6e23493689b46e75d75b;hb=6d077bbfd3230959846621bbfb1447410e17dd8c;hp=5b4ad2d3ac54d6002dbb81c51678375298406d36;hpb=2d4dd90964061defa92972156ae2a12323708519;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 5b4ad2d3..e37cace3 100644 --- a/src/ui/terminal/main.c +++ b/src/ui/terminal/main.c @@ -1,39 +1,39 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* 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 . */ #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 @@ -46,27 +46,24 @@ #include #include #include - -#if HAVE_FPU_CONTROL_H -#include -#endif - -#if HAVE_LOCALE_H -#include -#endif - -#if HAVE_FENV_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); @@ -76,91 +73,135 @@ void interrupt_handler(int sig); 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); - set_program_name ("pspp"); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - fmt_init (); outp_init (); fn_init (); fh_init (); - getl_initialize (); + the_source_stream = + create_source_stream ( + fn_getenv_default ("STAT_INCLUDE_PATH", include_path) + ); 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)) + + + 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 ()) { - msg_ui_init (); outp_read_devices (); - the_lexer = lex_create (do_read_line); - - for (;;) - { - int result = cmd_parse (the_lexer, the_dataset, - proc_has_source (the_dataset) - ? CMD_STATE_DATA : CMD_STATE_INITIAL); - if (result == CMD_EOF || result == CMD_FINISH) - break; - if (result == CMD_CASCADING_FAILURE && !getl_is_interactive ()) - { - msg (SE, _("Stopping syntax file processing here to avoid " - "a cascade of dependent command failures.")); - getl_abort_noninteractive (); - } - else - check_msg_count (); - } } - - terminate (!any_errors ()); + 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); + } + + + clean_up (); + return any_errors (); } static void -i18n_init (void) +i18n_init (void) { #if ENABLE_NLS #if HAVE_LC_MESSAGES setlocale (LC_MESSAGES, ""); #endif - setlocale (LC_MONETARY, ""); +#if HAVE_LC_PAPER + setlocale (LC_PAPER, ""); +#endif 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"); @@ -173,20 +214,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; @@ -196,13 +229,10 @@ terminate (bool success) settings_done (); fh_done (); lex_destroy (the_lexer); - getl_uninitialize (); + destroy_source_stream (the_source_stream); prompt_done (); readln_uninitialize (); - outp_done (); msg_ui_done (); - fmt_done (); } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); }