projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented the FREQUENCIES dialog.
[pspp]
/
src
/
ui
/
terminal
/
main.c
diff --git
a/src/ui/terminal/main.c
b/src/ui/terminal/main.c
index 66fedf04fd900d9c97427f023b7583ab334b1035..2f80cb57a3b06e5ad32e3071c0748895c87f9480 100644
(file)
--- a/
src/ui/terminal/main.c
+++ b/
src/ui/terminal/main.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006
, 2007
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
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,14
+16,19
@@
#include <config.h>
#include <config.h>
+#include <locale.h>
#include <signal.h>
#include <stdio.h>
#include <signal.h>
#include <stdio.h>
-
-#include <ui/debugger.h>
-#include "command-line.h"
-#include "msg-ui.h"
-#include "progname.h"
-#include "read-line.h"
+#include <stdlib.h>
+#if HAVE_FPU_CONTROL_H
+#include <fpu_control.h>
+#endif
+#if HAVE_FENV_H
+#include <fenv.h>
+#endif
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
#include <data/dictionary.h>
#include <data/file-handle-def.h>
#include <data/dictionary.h>
#include <data/file-handle-def.h>
@@
-42,31
+47,22
@@
#include <libpspp/version.h>
#include <math/random.h>
#include <output/output.h>
#include <libpspp/version.h>
#include <math/random.h>
#include <output/output.h>
+#include <ui/debugger.h>
+#include <ui/terminal/command-line.h>
+#include <ui/terminal/msg-ui.h>
+#include <ui/terminal/read-line.h>
+#include <ui/terminal/terminal.h>
-#if HAVE_FPU_CONTROL_H
-#include <fpu_control.h>
-#endif
-
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#if HAVE_FENV_H
-#include <fenv.h>
-#endif
-
-#if HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
+#include "fatal-signal.h"
+#include "progname.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#include <stdlib.h>
static void i18n_init (void);
static void fpu_init (void);
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);
/* If a segfault happens, issue a message to that effect and halt */
void bug_handler(int sig);
@@
-78,17
+74,18
@@
static struct dataset * the_dataset = NULL;
static struct lexer *the_lexer;
static struct source_stream *the_source_stream ;
static struct lexer *the_lexer;
static struct source_stream *the_source_stream ;
-
/* Program entry point. */
int
main (int argc, char **argv)
{
/* 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 (SIGABRT, bug_handler);
signal (SIGSEGV, bug_handler);
signal (SIGFPE, bug_handler);
- signal (SIGINT, interrupt_handler);
-
- set_program_name (argv[0]);
+ at_fatal_signal (clean_up);
i18n_init ();
fpu_init ();
i18n_init ();
fpu_init ();
@@
-104,7
+101,8
@@
main (int argc, char **argv)
);
prompt_init ();
readln_initialize ();
);
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 ();
random_init ();
the_dataset = create_dataset ();
@@
-140,7
+138,8
@@
main (int argc, char **argv)
}
}
}
}
- terminate (!any_errors ());
+ clean_up ();
+ return any_errors ();
}
\f
static void
}
\f
static void
@@
-150,7
+149,9
@@
i18n_init (void)
#if HAVE_LC_MESSAGES
setlocale (LC_MESSAGES, "");
#endif
#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 */
bindtextdomain (PACKAGE, locale_dir);
textdomain (PACKAGE);
#endif /* ENABLE_NLS */
@@
-189,17
+190,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
static void
-
terminate (bool success
)
+
clean_up (void
)
{
static bool terminating = false;
if (!terminating)
{
static bool terminating = false;
if (!terminating)
@@
-215,10
+208,8
@@
terminate (bool success)
destroy_source_stream (the_source_stream);
prompt_done ();
readln_uninitialize ();
destroy_source_stream (the_source_stream);
prompt_done ();
readln_uninitialize ();
-
outp_done ();
msg_ui_done ();
fmt_done ();
}
outp_done ();
msg_ui_done ();
fmt_done ();
}
- exit (success ? EXIT_SUCCESS : EXIT_FAILURE);
}
}