X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=8acbdc2dde79d7bd1a8a97be24da76523bf0f928;hb=24164446e00e6449ccece6cbf0b0e2b1f5a383d2;hp=ad76cb1a43e361d467b4379d293076ddc97bdb54;hpb=54058c1e5c66b976ec7ddab606fd7740f0c61a6e;p=pspp-builds.git diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c index ad76cb1a..8acbdc2d 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 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,23 @@ #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 "fatal-signal.h" +#include "progname.h" +#include "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; +static void clean_up (void); /* If a segfault happens, issue a message to that effect and halt */ void bug_handler(int sig); @@ -78,29 +74,23 @@ 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); - - /* Program entry point. */ int main (int argc, char **argv) { + int *view_width_p, *view_length_p; + + 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]); + at_fatal_signal (clean_up); i18n_init (); fpu_init (); gsl_set_error_handler_off (); - fmt_init (); outp_init (); fn_init (); fh_init (); @@ -110,8 +100,8 @@ main (int argc, char **argv) ); prompt_init (); readln_initialize (); - get_termcap_viewport (0); - settings_init (&view_width, &view_length); + terminal_init (&view_width_p, &view_length_p); + settings_init (view_width_p, view_length_p); random_init (); the_dataset = create_dataset (); @@ -119,7 +109,7 @@ main (int argc, char **argv) if (parse_command_line (argc, argv, the_source_stream)) { msg_ui_init (the_source_stream); - if (!get_testing_mode ()) + if (!settings_get_testing_mode ()) outp_read_devices (); else outp_configure_driver_line ( @@ -147,7 +137,8 @@ main (int argc, char **argv) } } - terminate (!any_errors ()); + clean_up (); + return any_errors (); } static void @@ -160,7 +151,7 @@ i18n_init (void) #if HAVE_LC_PAPER setlocale (LC_PAPER, ""); #endif - bindtextdomain (PACKAGE, locale_dir); + bindtextdomain (PACKAGE, relocate (locale_dir)); textdomain (PACKAGE); #endif /* ENABLE_NLS */ } @@ -198,17 +189,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) @@ -224,80 +207,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); -} - - -#include "error.h" - -#include "gettext.h" -#define _(msgid) gettext (msgid) - -/* If view_width or view_length has not yet been set to a - reasonable value, takes a guess. */ -static void -set_fallback_viewport (void) -{ - if (view_width <= 0) - { - if (getenv ("COLUMNS") != NULL) - view_width = atoi (getenv ("COLUMNS")); - if (view_width <= 0) - view_width = 79; - } - - if (view_length <= 0) - { - if (getenv ("LINES") != NULL) - view_length = atoi (getenv ("LINES")); - if (view_length <= 0) - view_length = 24; } } - -/* 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) - { - if (tgetent (term_buffer, getenv ("TERM")) > 0) - { - if (tgetnum ("li") > 0) - view_length = tgetnum ("li"); - if (tgetnum ("co") > 1) - view_width = tgetnum ("co") - 1; - } - else - error (0, 0, _("could not access definition for terminal `%s'"), - getenv ("TERM")); - } - - set_fallback_viewport (); -} - -#else /* !HAVE_LIBNCURSES */ - -static void -get_termcap_viewport (int sig UNUSED) -{ - set_fallback_viewport (); -} - -#endif /* !HAVE_LIBNCURSES */ - -