X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=9143220d3147accd05b935481909c22b1d6b1faa;hb=87b30887d6b08f4bfe92e0474f5f38cc4bf1acfa;hp=0ece812b920b6c1b00e5dc9f5caacc094acbfe21;hpb=480a0746507ce73d26f528b56dc3ed80195096e0;p=pspp
diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 0ece812b92..9143220d31 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 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
@@ -27,7 +25,6 @@
#include "progname.h"
#include "read-line.h"
-
#include
#include
#include
@@ -58,6 +55,10 @@
#include
#endif
+#if HAVE_IEEEFP_H
+#include
+#endif
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -87,7 +88,8 @@ main (int argc, char **argv)
signal (SIGFPE, bug_handler);
signal (SIGINT, interrupt_handler);
- set_program_name ("pspp");
+ set_program_name (argv[0]);
+
i18n_init ();
fpu_init ();
gsl_set_error_handler_off ();
@@ -104,7 +106,8 @@ main (int argc, char **argv)
readln_initialize ();
settings_init ();
random_init ();
- the_dataset = create_dataset ();
+
+ the_dataset = create_dataset (NULL, NULL);
if (parse_command_line (argc, argv, the_source_stream))
{
@@ -114,9 +117,8 @@ main (int argc, char **argv)
for (;;)
{
- int result = cmd_parse (the_lexer, the_dataset,
- proc_has_source (the_dataset)
- ? CMD_STATE_DATA : CMD_STATE_INITIAL);
+ int result = cmd_parse (the_lexer, the_dataset);
+
if (result == CMD_EOF || result == CMD_FINISH)
break;
if (result == CMD_CASCADING_FAILURE &&
@@ -124,18 +126,18 @@ main (int argc, char **argv)
{
msg (SE, _("Stopping syntax file processing here to avoid "
"a cascade of dependent command failures."));
- getl_abort_noninteractive (the_source_stream);
+ getl_abort_noninteractive (the_source_stream);
}
else
check_msg_count (the_source_stream);
}
}
-
+
terminate (!any_errors ());
}
static void
-i18n_init (void)
+i18n_init (void)
{
#if ENABLE_NLS
#if HAVE_LC_MESSAGES
@@ -148,24 +150,26 @@ i18n_init (void)
}
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");
@@ -178,7 +182,7 @@ bug_handler(int sig)
}
}
-void
+void
interrupt_handler(int sig UNUSED)
{
terminate (false);
@@ -191,7 +195,7 @@ static void
terminate (bool success)
{
static bool terminating = false;
- if (!terminating)
+ if (!terminating)
{
terminating = true;