Remove callbacks from struct dataset. Closes patch #6075

[pspp-builds.git] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 1a1c436e967253a6c188337b38e4644c22cf59b8..66fedf04fd900d9c97427f023b7583ab334b1035 100644 (file)
--- 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 <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
@@ -109,12 +107,19 @@ main (int argc, char **argv)
   settings_init ();
   random_init ();
 
-  the_dataset = create_dataset (NULL, NULL);
+  the_dataset = create_dataset ();
 
   if (parse_command_line (argc, argv, the_source_stream))
     {
       msg_ui_init (the_source_stream);
-      outp_read_devices ();
+      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 (;;)
@@ -128,7 +133,7 @@ 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);
@@ -139,7 +144,7 @@ main (int argc, char **argv)
 }
 \f
 static void
-i18n_init (void) 
+i18n_init (void)
 {
 #if ENABLE_NLS
 #if HAVE_LC_MESSAGES
@@ -152,7 +157,7 @@ i18n_init (void)
 }
 
 static void
-fpu_init (void) 
+fpu_init (void)
 {
 #if HAVE_FEHOLDEXCEPT
   fenv_t foo;
@@ -165,13 +170,13 @@ fpu_init (void)
 }
 
 /* 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");
@@ -184,7 +189,7 @@ bug_handler(int sig)
     }
 }
 
-void 
+void
 interrupt_handler(int sig UNUSED)
 {
   terminate (false);
@@ -197,7 +202,7 @@ static void
 terminate (bool success)
 {
   static bool terminating = false;
-  if (!terminating) 
+  if (!terminating)
     {
       terminating = true;