X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fterminal%2Fmain.c;h=26a6a316e0757c1947e44172702b3c304fb11630;hb=3b03678858485b01277d7488323613fb28691834;hp=c78756383adbd1d590bd6ffe965e46837eb0820d;hpb=456b47421c16fdbbfe7f1e74e661d7c7876ff6df;p=pspp

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index c78756383a..26a6a316e0 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -51,7 +51,6 @@
 #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 ();
@@ -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_command_name ();
 
   message_item_submit (message_item_create (&m));
+
+  free (m.command_name);
 }
 
 static void