X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fterminal%2Fmain.c;h=5fa1604143fe7a7ba136988d85401cafaf0d2b26;hb=cef9c4febe441542613998a1510ef09490730399;hp=478c2fd515c6c1f9c2f6901460cb0e05d751ab2a;hpb=a69031154612651d1fd7d9267b0bc47cc48dde73;p=pspp-builds.git

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 478c2fd5..5fa16041 100644
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -39,7 +39,6 @@
 #include "gsl/gsl_errno.h"
 #include "language/command.h"
 #include "language/lexer/lexer.h"
-#include "language/prompt.h"
 #include "language/syntax-file.h"
 #include "libpspp/argv-parser.h"
 #include "libpspp/compiler.h"
@@ -72,7 +71,6 @@ static void add_syntax_file (struct source_stream *, enum syntax_mode,
                              const char *file_name);
 static void bug_handler(int sig);
 static void fpu_init (void);
-static void clean_up (void);
 
 /* Program entry point. */
 int
@@ -95,7 +93,6 @@ main (int argc, char **argv)
 
   fh_init ();
   the_source_stream = create_source_stream ();
-  prompt_init ();
   readln_initialize ();
   settings_init ();
   terminal_check_size ();
@@ -153,7 +150,18 @@ main (int argc, char **argv)
     }
 
 
-  clean_up ();
+  destroy_dataset (the_dataset);
+
+  random_done ();
+  settings_done ();
+  fh_done ();
+  lex_destroy (the_lexer);
+  destroy_source_stream (the_source_stream);
+  readln_uninitialize ();
+  output_close ();
+  msg_ui_done ();
+  i18n_done ();
+
   return msg_ui_any_errors ();
 }
 
@@ -201,30 +209,6 @@ bug_handler(int sig)
   raise (sig);
 }
 
-/* Clean up PSPP in preparation for termination.  */
-static void
-clean_up (void)
-{
-  static bool terminating = false;
-  if (!terminating)
-    {
-      terminating = true;
-
-      destroy_dataset (the_dataset);
-
-      random_done ();
-      settings_done ();
-      fh_done ();
-      lex_destroy (the_lexer);
-      destroy_source_stream (the_source_stream);
-      prompt_done ();
-      readln_uninitialize ();
-      output_close ();
-      msg_ui_done ();
-      i18n_done ();
-    }
-}
-
 static void
 add_syntax_file (struct source_stream *ss, enum syntax_mode syntax_mode,
                  const char *file_name)