output-item: Collapse the inheritance hierarchy into a single struct.

[pspp] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 4609e4eded20f39fc93e74e4d432b4de25ee4772..be1d035f21d8097570e5589e777555749d651ff9 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -47,11 +47,10 @@
 #include "libpspp/version.h"
 #include "math/random.h"
 #include "output/driver.h"
-#include "output/message-item.h"
+#include "output/output-item.h"
 #include "ui/source-init-opts.h"
 #include "ui/terminal/terminal-opts.h"
 #include "ui/terminal/terminal-reader.h"
-#include "ui/terminal/terminal.h"
 
 #include "gl/fatal-signal.h"
 #include "gl/progname.h"
@@ -81,6 +80,9 @@ main (int argc, char **argv)
 
   set_program_name (argv[0]);
 
+  prepare_fatal_error_message ();
+  prepare_diagnostic_information ();
+
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
@@ -92,7 +94,6 @@ main (int argc, char **argv)
   output_engine_push ();
   fh_init ();
   settings_init ();
-  terminal_check_size ();
   random_init ();
 
   lexer = lex_create ();
@@ -160,13 +161,13 @@ main (int argc, char **argv)
     }
 
 
+  output_engine_pop ();
   session_destroy (the_session);
 
   random_done ();
   settings_done ();
   fh_done ();
   lex_destroy (lexer);
-  output_engine_pop ();
   i18n_done ();
 
   return msg_ui_any_errors ();
@@ -226,9 +227,11 @@ output_msg (const struct msg *m_, void *lexer_)
       m.last_line = lex_get_last_line_number (lexer, 0);
     }
 
-  m.command_name = CONST_CAST (char *, output_get_command_name ());
+  m.command_name = output_get_uppercase_command_name ();
+
+  output_item_submit (message_item_create (&m));
 
-  message_item_submit (message_item_create (&m));
+  free (m.command_name);
 }
 
 static void