Sat Dec 27 16:16:49 2003 Ben Pfaff <blp@gnu.org>

[pspp-builds.git] / src / glob.c

diff --git a/src/glob.c b/src/glob.c
index 235399c0be300779e1cbdafcc5a2f4bc61f8d76f..daa4f97af1ce5d19fcd8452d6fc7bab03349adb4 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -18,7 +18,7 @@
    02111-1307, USA. */
 
 #include <config.h>
-
+#include "glob.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -78,13 +78,14 @@ extern void stifle_history ();
 #endif
 
 #include "alloc.h"
-#include "avl.h"
 #include "command.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"
@@ -96,7 +97,7 @@ extern void stifle_history ();
 #include "vfm.h"
 
 /* var.h */
-struct dictionary default_dict;
+struct dictionary *default_dict;
 struct expression *process_if_expr;
 
 struct ccase *temp_case;
@@ -124,8 +125,8 @@ int logging;
 
 static void get_date (void);
 
-#if HAVE_LIBTERMCAP && !__CHECKER__
-static char *term_buffer;
+#if HAVE_LIBTERMCAP
+static char term_buffer[16384];
 #endif
 
 void
@@ -166,7 +167,7 @@ init_glob (int argc unused, char **argv)
 #endif
 
   /* var.h */
-  default_dict.var_by_name = avl_create (NULL, cmp_variable, NULL);
+  default_dict = dict_create ();
 
   vec_init (&reinit_sysmis);
   vec_init (&reinit_blanks);
@@ -273,20 +274,11 @@ init_glob (int argc unused, char **argv)
     int success;
 
     /* This code stolen from termcap.info, though modified. */
-#if !__CHECKER__
-    term_buffer = xmalloc (2048);
-#endif
-
     termtype = getenv ("TERM");
     if (!termtype)
       msg (FE, _("Specify a terminal type with `setenv TERM <yourtype>'."));
 
-#if __CHECKER__
-    success = tgetent (NULL, termtype);
-#else
     success = tgetent (term_buffer, termtype);
-#endif
-
     if (success <= 0)
       {
        if (success < 0)
@@ -314,11 +306,7 @@ init_glob (int argc unused, char **argv)
   logfile = NULL;
 
   /* file-handle.h */
-  {
-    extern void fh_init_files (void);
-    
-    fh_init_files ();
-  }
+  fh_init_files ();
   
   get_date ();
 }
@@ -364,12 +352,6 @@ get_date ()
   sprintf (curdate, "%2d %s %04d", dy, gettext (months[mn]), yr);
 }
 
-int
-cmp_variable (const void *a, const void *b, void *foo unused)
-{
-  return strcmp (((struct variable *) a)->name, ((struct variable *) b)->name);
-}
-
 #if __BORLANDC__
 int
 _RTLENTRY _EXPFUNC _matherr (struct exception _FAR *__e)