projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
miscellaneous compiler warnings
[pspp]
/
src
/
glob.c
diff --git
a/src/glob.c
b/src/glob.c
index e1d5bba0b303214cac0a2e224c5c505e9b605569..1b5de09955e0bc4ee2611c4fda74e2d1c5cbe5f0 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,15
+60,15
@@
extern void stifle_history ();
#endif
#include "alloc.h"
#endif
#include "alloc.h"
+#include "calendar.h"
#include "command.h"
#include "command.h"
+#include "dictionary.h"
#include "do-ifP.h"
#include "error.h"
#include "do-ifP.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"
@@
-87,6
+78,8
@@
extern void stifle_history ();
#include "version.h"
#include "vfm.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;
@@
-96,6
+89,8
@@
int n_trns;
int m_trns;
int f_trns;
int m_trns;
int f_trns;
+short test_mode=0;
+
int FILTER_before_TEMPORARY;
struct file_handle *default_handle;
int FILTER_before_TEMPORARY;
struct file_handle *default_handle;
@@
-115,6
+110,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
@@
-126,6
+123,7
@@
init_glob (int argc UNUSED, char **argv)
#endif /* ENABLE_NLS */
fn_init ();
#endif /* ENABLE_NLS */
fn_init ();
+ fh_init ();
getl_initialize ();
/* PORTME: If your system/OS has the nasty tendency to halt with a
getl_initialize ();
/* PORTME: If your system/OS has the nasty tendency to halt with a
@@
-151,7
+149,7
@@
init_glob (int argc UNUSED, char **argv)
last_vfm_invocation = time (NULL);
/* lexer.h */
last_vfm_invocation = time (NULL);
/* lexer.h */
- ds_init (
NULL,
&tokstr, 64);
+ ds_init (&tokstr, 64);
/* common.h */
{
/* common.h */
{
@@
-176,12
+174,21
@@
init_glob (int argc UNUSED, char **argv)
logfn = xstrdup ("pspp.log");
logfile = NULL;
logfn = xstrdup ("pspp.log");
logfile = NULL;
- /* file-handle.h */
- fh_init_files ();
-
get_date ();
}
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)
{
static void
get_date (void)
{