X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglob.c;h=3ea676707c269b94841ee430bcf1108ab890669c;hb=05a2c3f6e9560a57e87206ac3358946bf6d43b42;hp=457be8ace071b856fff5cd17d5fc5dd94d14bd16;hpb=f62199cac6213ed1c03ffe48450a583da0fadc68;p=pspp-builds.git

diff --git a/src/glob.c b/src/glob.c
index 457be8ac..3ea67670 100644
--- a/src/glob.c
+++ b/src/glob.c
@@ -14,8 +14,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA. */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA. */
 
 #include <config.h>
 #include "glob.h"
@@ -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"
@@ -97,6 +96,8 @@ int n_trns;
 int m_trns;
 int f_trns;
 
+short test_mode=0;
+
 int FILTER_before_TEMPORARY;
 
 struct file_handle *default_handle;
@@ -127,6 +128,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 +185,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