Re-implement MEANS.

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

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index fdbca25a2f61f76fbb407e02cc5cf8bd069b0512..c78756383adbd1d590bd6ffe965e46837eb0820d 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -33,7 +33,6 @@
 #include "data/dataset.h"
 #include "data/dictionary.h"
 #include "data/file-handle-def.h"
-#include "data/file-name.h"
 #include "data/session.h"
 #include "data/settings.h"
 #include "data/variable.h"
@@ -161,13 +160,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 ();
@@ -227,6 +226,8 @@ 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 ());
+
   message_item_submit (message_item_create (&m));
 }