X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=1366bd7aad307090b7118c1473771b37a5905f7c;hb=dfd1972f7bcb550a4fc3b05dbe7e71d12334b0a7;hp=7ad162fca6d40b746a0155d891d8e08784e2e4df;hpb=c9a3c45e44c1c03d13d4eb186e3817bc836f75f8;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 7ad162fc..1366bd7a 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -46,7 +46,7 @@
 #include <libpspp/message.h>
 #include <libpspp/version.h>
 #include <math/random.h>
-#include <output/output.h>
+#include <output/driver.h>
 #include <ui/debugger.h>
 #include <ui/terminal/msg-ui.h>
 #include <ui/terminal/read-line.h>
@@ -96,7 +96,6 @@ main (int argc, char **argv)
   fpu_init ();
   gsl_set_error_handler_off ();
 
-  outp_init ();
   fn_init ();
   fh_init ();
   the_source_stream =
@@ -129,20 +128,6 @@ main (int argc, char **argv)
 
   msg_ui_init (the_source_stream);
 
-  if (!settings_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 (;;)
@@ -219,7 +204,7 @@ clean_up (void)
       destroy_source_stream (the_source_stream);
       prompt_done ();
       readln_uninitialize ();
-      outp_done ();
+      output_close ();
       msg_ui_done ();
       i18n_done ();
     }