projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle case of a lookup table as the active file.
[pspp]
/
src
/
glob.c
diff --git
a/src/glob.c
b/src/glob.c
index 5b35a9f1dbeb02c52f721a1dca431f625ffce373..3ea676707c269b94841ee430bcf1108ab890669c 100644
(file)
--- 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
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 <config.h>
#include "glob.h"
@@
-69,16
+69,15
@@
extern void stifle_history ();
#endif
#include "alloc.h"
#endif
#include "alloc.h"
+#include "calendar.h"
#include "command.h"
#include "dictionary.h"
#include "do-ifP.h"
#include "error.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 "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"
#include "lexer.h"
#include "magic.h"
#include "main.h"
@@
-97,6
+96,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;
@@
-127,6
+128,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
@@
-183,10
+185,13
@@
init_glob (int argc UNUSED, char **argv)
void
done_glob(void)
{
void
done_glob(void)
{
- dict_destroy(default_dict);
- free(logfn);
- /* done_settings(); */
+ cancel_transformations ();
+ dict_destroy (default_dict);
+ free (logfn);
+ done_settings ();
ds_destroy (&tokstr);
ds_destroy (&tokstr);
+
+ fh_done();
}
static void
}
static void