Separate random numbers from other settings because of GSL dependency.

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

diff --git a/src/glob.c b/src/glob.c
index 5b35a9f1dbeb02c52f721a1dca431f625ffce373..38dd32373801a0be277d9137fefb81778979d0a5 100644 (file)
--- a/src/glob.c
+++ b/src/glob.c
@@ -14,25 +14,16 @@
 
    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"
 #include "error.h"
+#include "progname.h"
 #include <stdlib.h>
 #include <stdio.h>
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
 #include <time.h>
-#endif
-#endif
 
 #if HAVE_LIBHISTORY
 #if HAVE_READLINE_HISTORY_H
@@ -69,40 +60,37 @@ 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 "getl.h"
 #include "hash.h"
-#include "julcal/julcal.h"
 #include "lexer.h"
 #include "magic.h"
 #include "main.h"
+#include "random.h"
 #include "settings.h"
 #include "str.h"
 #include "var.h"
 #include "version.h"
 #include "vfm.h"
 
+#include "gettext.h"
+
 /* var.h */
 struct dictionary *default_dict;
 struct expression *process_if_expr;
 
-struct trns_header **t_trns;
-int n_trns;
-int m_trns;
-int f_trns;
+struct transformation *t_trns;
+size_t n_trns, m_trns, f_trns;
 
 int FILTER_before_TEMPORARY;
 
 struct file_handle *default_handle;
 
-struct ctl_stmt *ctl_stack;
-
 /* log.h */
 char *logfn;
 FILE *logfile;
@@ -116,6 +104,8 @@ static void get_date (void);
 void
 init_glob (int argc UNUSED, char **argv)
 {
+  set_program_name (argv[0]);
+
   /* FIXME: Allow i18n of other locale items (besides LC_MESSAGES). */
 #if ENABLE_NLS
 #if HAVE_LC_MESSAGES
@@ -127,6 +117,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
@@ -170,7 +161,8 @@ init_glob (int argc UNUSED, char **argv)
   }
 
 
-  init_settings();
+  init_settings ();
+  random_init ();
 
   /* log.h */
   logging = 1;
@@ -183,10 +175,14 @@ 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);
+  random_done ();
+  done_settings ();
   ds_destroy (&tokstr);
+
+  fh_done();
 }
 
 static void