X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=5fa1604143fe7a7ba136988d85401cafaf0d2b26;hb=cef9c4febe441542613998a1510ef09490730399;hp=8acbdc2dde79d7bd1a8a97be24da76523bf0f928;hpb=005ac6d163e0e535a06e9bfb223f2f75f9320c9a;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index 8acbdc2d..5fa16041 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, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 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 @@ -29,131 +28,141 @@ #if HAVE_IEEEFP_H #include #endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "fatal-signal.h" -#include "progname.h" -#include "relocatable.h" +#include + +#include "data/dictionary.h" +#include "data/file-handle-def.h" +#include "data/file-name.h" +#include "data/procedure.h" +#include "data/settings.h" +#include "data/variable.h" +#include "gsl/gsl_errno.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/syntax-file.h" +#include "libpspp/argv-parser.h" +#include "libpspp/compiler.h" +#include "libpspp/getl.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/version.h" +#include "math/random.h" +#include "output/driver.h" +#include "ui/debugger.h" +#include "ui/source-init-opts.h" +#include "ui/terminal/msg-ui.h" +#include "ui/terminal/read-line.h" +#include "ui/terminal/terminal-opts.h" +#include "ui/terminal/terminal.h" + +#include "gl/fatal-signal.h" +#include "gl/progname.h" +#include "gl/relocatable.h" #include "gettext.h" #define _(msgid) gettext (msgid) - -static void i18n_init (void); -static void fpu_init (void); -static void clean_up (void); - -/* If a segfault happens, issue a message to that effect and halt */ -void bug_handler(int sig); - -/* Handle quit/term/int signals */ -void interrupt_handler(int sig); static struct dataset * the_dataset = NULL; static struct lexer *the_lexer; static struct source_stream *the_source_stream ; +static void add_syntax_file (struct source_stream *, enum syntax_mode, + const char *file_name); +static void bug_handler(int sig); +static void fpu_init (void); + /* Program entry point. */ int main (int argc, char **argv) { - int *view_width_p, *view_length_p; + struct terminal_opts *terminal_opts; + struct argv_parser *parser; + enum syntax_mode syntax_mode; + bool process_statrc; set_program_name (argv[0]); signal (SIGABRT, bug_handler); signal (SIGSEGV, bug_handler); signal (SIGFPE, bug_handler); - at_fatal_signal (clean_up); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - outp_init (); - fn_init (); fh_init (); - the_source_stream = - create_source_stream ( - fn_getenv_default ("STAT_INCLUDE_PATH", include_path) - ); - prompt_init (); + the_source_stream = create_source_stream (); readln_initialize (); - terminal_init (&view_width_p, &view_length_p); - settings_init (view_width_p, view_length_p); + settings_init (); + terminal_check_size (); random_init (); the_dataset = create_dataset (); - if (parse_command_line (argc, argv, the_source_stream)) + parser = argv_parser_create (); + terminal_opts = terminal_opts_init (parser, &syntax_mode, &process_statrc); + source_init_register_argv_parser (parser, the_source_stream); + if (!argv_parser_run (parser, argc, argv)) + exit (EXIT_FAILURE); + terminal_opts_done (terminal_opts, argc, argv); + argv_parser_destroy (parser); + + msg_ui_init (the_source_stream); + + /* Add syntax files to source stream. */ + if (process_statrc) { - 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 (;;) + char *rc = fn_search_path ("rc", getl_include_path (the_source_stream)); + if (rc != NULL) { - 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); + add_syntax_file (the_source_stream, GETL_BATCH, rc); + free (rc); } } + if (optind < argc) + { + int i; - 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, relocate (locale_dir)); - textdomain (PACKAGE); -#endif /* ENABLE_NLS */ + for (i = optind; i < argc; i++) + add_syntax_file (the_source_stream, syntax_mode, argv[i]); + } + else + add_syntax_file (the_source_stream, syntax_mode, "-"); + + /* Parse and execute syntax. */ + 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 if (msg_ui_too_many_errors ()) + getl_abort_noninteractive (the_source_stream); + } + + + destroy_dataset (the_dataset); + + random_done (); + settings_done (); + fh_done (); + lex_destroy (the_lexer); + destroy_source_stream (the_source_stream); + readln_uninitialize (); + output_close (); + msg_ui_done (); + i18n_done (); + + return msg_ui_any_errors (); } static void @@ -170,44 +179,44 @@ fpu_init (void) } /* If a segfault happens, issue a message to that effect and halt */ -void +static void bug_handler(int sig) { + /* Reset SIG to its default handling so that if it happens again we won't + recurse. */ + signal (sig, SIG_DFL); + #if DEBUGGING connect_debugger (); #endif switch (sig) { case SIGABRT: - request_bug_report_and_abort("Assertion Failure/Abort"); + request_bug_report("Assertion Failure/Abort"); + break; case SIGFPE: - request_bug_report_and_abort("Floating Point Exception"); + request_bug_report("Floating Point Exception"); + break; case SIGSEGV: - request_bug_report_and_abort("Segmentation Violation"); + request_bug_report("Segmentation Violation"); + break; default: - request_bug_report_and_abort("Unknown"); + request_bug_report("Unknown"); + break; } + + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); } -/* Clean up PSPP in preparation for termination. */ static void -clean_up (void) +add_syntax_file (struct source_stream *ss, enum syntax_mode syntax_mode, + const char *file_name) { - static bool terminating = false; - if (!terminating) - { - terminating = true; - - destroy_dataset (the_dataset); - - random_done (); - settings_done (); - fh_done (); - lex_destroy (the_lexer); - destroy_source_stream (the_source_stream); - prompt_done (); - readln_uninitialize (); - outp_done (); - msg_ui_done (); - } + struct getl_interface *source; + + source = (!strcmp (file_name, "-") && isatty (STDIN_FILENO) + ? create_readln_source () + : create_syntax_file_source (file_name)); + getl_append_source (ss, source, syntax_mode, ERRMODE_CONTINUE); }