X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglob.c;h=5ddb0e698254d5e068deb1aeccf322d92429f59e;hb=4848cff524922cc77ed21662406807471e96a68e;hp=5b35a9f1dbeb02c52f721a1dca431f625ffce373;hpb=cd7b08ad5e6bbec75e778acf008f84e1eb548154;p=pspp

diff --git a/src/glob.c b/src/glob.c
index 5b35a9f1db..5ddb0e6982 100644
--- a/src/glob.c
+++ b/src/glob.c
@@ -69,16 +69,15 @@ extern void stifle_history ();
 #endif
 
 #include "alloc.h"
+#include "calendar.h"
 #include "command.h"
 #include "dictionary.h"
 #include "do-ifP.h"
 #include "error.h"
-#include "expr.h"
 #include "file-handle.h"
 #include "filename.h"
 #include "getline.h"
 #include "hash.h"
-#include "julcal/julcal.h"
 #include "lexer.h"
 #include "magic.h"
 #include "main.h"
@@ -127,6 +126,7 @@ init_glob (int argc UNUSED, char **argv)
 #endif /* ENABLE_NLS */
 
   fn_init ();
+  fh_init ();
   getl_initialize ();
 
   /* PORTME: If your system/OS has the nasty tendency to halt with a
@@ -183,10 +183,13 @@ init_glob (int argc UNUSED, char **argv)
 void
 done_glob(void)
 {
-  dict_destroy(default_dict);
-  free(logfn);
-  /* done_settings(); */
+  cancel_transformations ();
+  dict_destroy (default_dict);
+  free (logfn);
+  done_settings ();
   ds_destroy (&tokstr);
+
+  fh_done();
 }
 
 static void