X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fglob.c;h=3ea676707c269b94841ee430bcf1108ab890669c;hb=5a33cc6d78fe87ff5e9bd32ea4af3f895e4ad2fc;hp=e1d5bba0b303214cac0a2e224c5c505e9b605569;hpb=205ac3afa4c2b19c85819d8695abf3975bb11807;p=pspp-builds.git

diff --git a/src/glob.c b/src/glob.c
index e1d5bba0..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,15 +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"
@@ -96,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;
@@ -126,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
@@ -151,7 +154,7 @@ init_glob (int argc UNUSED, char **argv)
   last_vfm_invocation = time (NULL);
 
   /* lexer.h */
-  ds_init (NULL, &tokstr, 64);
+  ds_init (&tokstr, 64);
 
   /* common.h */
   {
@@ -176,12 +179,21 @@ init_glob (int argc UNUSED, char **argv)
   logfn = xstrdup ("pspp.log");
   logfile = NULL;
 
-  /* file-handle.h */
-  fh_init_files ();
-  
   get_date ();
 }
 
+void
+done_glob(void)
+{
+  cancel_transformations ();
+  dict_destroy (default_dict);
+  free (logfn);
+  done_settings ();
+  ds_destroy (&tokstr);
+
+  fh_done();
+}
+
 static void
 get_date (void)
 {