X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=5fa1604143fe7a7ba136988d85401cafaf0d2b26;hb=df291f0446ae11b5a3c788a06ee73eb9ac877ca5;hp=b25350b94c4f07c6c6b21f8183697ba9a21d5a88;hpb=70c7494a0b0a9e6ce90c271f65095bc474b775ee;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index b25350b9..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 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 @@ -18,151 +18,151 @@ #include #include - -#include -#include "command-line.h" -#include "msg-ui.h" -#include "progname.h" -#include "read-line.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#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 "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) -#include - -static void i18n_init (void); -static void fpu_init (void); -static void terminate (bool success) NO_RETURN; - -/* 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 int view_length = -1; -static int view_width = -1; - -static void get_termcap_viewport (int); - +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) { + 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); - signal (SIGINT, interrupt_handler); - signal (SIGWINCH, get_termcap_viewport); - - set_program_name (argv[0]); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - fmt_init (); - 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 (); - get_termcap_viewport (0); - settings_init (&view_width, &view_length); + 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 (!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; - terminate (!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 */ + 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 @@ -179,123 +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; } -} - -void -interrupt_handler(int sig UNUSED) -{ - terminate (false); -} - - -/* Terminate PSPP. SUCCESS should be true to exit successfully, - false to exit as a failure. */ -static void -terminate (bool success) -{ - 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 (); - fmt_done (); - } - exit (success ? EXIT_SUCCESS : EXIT_FAILURE); + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); } - - -#include "error.h" - -#include "gettext.h" -#define _(msgid) gettext (msgid) - static void -set_fallback_viewport (void) +add_syntax_file (struct source_stream *ss, enum syntax_mode syntax_mode, + const char *file_name) { - if (view_width < 0 && getenv ("COLUMNS") != NULL) - view_width = atoi (getenv ("COLUMNS")); - - if (view_length < 0 && getenv ("LINES") != NULL) - view_length = atoi (getenv ("LINES")); + struct getl_interface *source; - if (view_width < 0) - view_width = 79; - - if (view_length < 0) - view_length = 24; + 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); } - -/* Code that interfaces to ncurses. This must be at the very end - of this file because curses.h redefines "bool" on some systems - (e.g. OpenBSD), causing declaration mismatches with functions - that have parameters or return values of type "bool". */ -#if HAVE_LIBNCURSES -#include -#include - -static void -get_termcap_viewport (int sig UNUSED) -{ - char term_buffer [16384]; - - if (getenv ("TERM") == NULL) - goto fallback; - - else if (tgetent (term_buffer, getenv ("TERM")) <= 0) - { - error (0,0, _("could not access definition for terminal `%s'"), - getenv ("TERM")); - goto fallback; - } - - if (tgetnum ("li") > 0) - view_length = tgetnum ("li"); - - if (tgetnum ("co") > 1) - view_width = tgetnum ("co") - 1; - - fallback: - set_fallback_viewport (); -} - -#else /* !HAVE_LIBNCURSES */ - -static void -get_termcap_viewport (int sig UNUSED) -{ - set_fallback_viewport (); -} - -#endif /* !HAVE_LIBNCURSES */ - -