projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 9cbcc0c6761602a86316f6d538b901b3248e876a..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
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., 5
9 Temple Place - Suite 330
, Boston, MA
- 0211
1-1307
, USA. */
+ Foundation, Inc., 5
1 Franklin Street, Fifth Floor
, Boston, MA
+ 0211
0-1301
, USA. */
#include <config.h>
#include "glob.h"
#include "error.h"
#include <config.h>
#include "glob.h"
#include "error.h"
+#include "progname.h"
#include <stdlib.h>
#include <stdio.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>
#include <time.h>
-#endif
-#endif
#if HAVE_LIBHISTORY
#if HAVE_READLINE_HISTORY_H
#if HAVE_LIBHISTORY
#if HAVE_READLINE_HISTORY_H
@@
-69,40
+60,37
@@
extern void stifle_history ();
#endif
#include "alloc.h"
#endif
#include "alloc.h"
+#include "calendar.h"
#include "command.h"
#include "dictionary.h"
#include "command.h"
#include "dictionary.h"
-#include "do-ifP.h"
#include "error.h"
#include "error.h"
-#include "expr.h"
#include "file-handle.h"
#include "filename.h"
#include "file-handle.h"
#include "filename.h"
-#include "getl
ine
.h"
+#include "getl.h"
#include "hash.h"
#include "hash.h"
-#include "julcal/julcal.h"
#include "lexer.h"
#include "magic.h"
#include "main.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 "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;
/* 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;
int FILTER_before_TEMPORARY;
struct file_handle *default_handle;
-struct ctl_stmt *ctl_stack;
-
/* log.h */
char *logfn;
FILE *logfile;
/* log.h */
char *logfn;
FILE *logfile;
@@
-116,6
+104,8
@@
static void get_date (void);
void
init_glob (int argc UNUSED, char **argv)
{
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
/* FIXME: Allow i18n of other locale items (besides LC_MESSAGES). */
#if ENABLE_NLS
#if HAVE_LC_MESSAGES
@@
-171,7
+161,8
@@
init_glob (int argc UNUSED, char **argv)
}
}
- init_settings();
+ init_settings ();
+ random_init ();
/* log.h */
logging = 1;
/* log.h */
logging = 1;
@@
-187,6
+178,7
@@
done_glob(void)
cancel_transformations ();
dict_destroy (default_dict);
free (logfn);
cancel_transformations ();
dict_destroy (default_dict);
free (logfn);
+ random_done ();
done_settings ();
ds_destroy (&tokstr);
done_settings ();
ds_destroy (&tokstr);