projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(render_strip) Fix bug that sometimes caused joined text in joined
[pspp-builds.git]
/
src
/
glob.c
diff --git
a/src/glob.c
b/src/glob.c
index 235399c0be300779e1cbdafcc5a2f4bc61f8d76f..ca71e9e8063265a7842825bb2842eb5095d4e265 100644
(file)
--- a/
src/glob.c
+++ b/
src/glob.c
@@
-18,7
+18,7
@@
02111-1307, USA. */
#include <config.h>
02111-1307, USA. */
#include <config.h>
-
+#include "glob.h"
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
#include <assert.h>
#include <stdlib.h>
#include <stdio.h>
@@
-78,13
+78,14
@@
extern void stifle_history ();
#endif
#include "alloc.h"
#endif
#include "alloc.h"
-#include "avl.h"
#include "command.h"
#include "do-ifP.h"
#include "error.h"
#include "expr.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 "filename.h"
#include "getline.h"
+#include "hash.h"
#include "julcal/julcal.h"
#include "lexer.h"
#include "magic.h"
#include "julcal/julcal.h"
#include "lexer.h"
#include "magic.h"
@@
-96,7
+97,7
@@
extern void stifle_history ();
#include "vfm.h"
/* var.h */
#include "vfm.h"
/* var.h */
-struct dictionary default_dict;
+struct dictionary
*
default_dict;
struct expression *process_if_expr;
struct ccase *temp_case;
struct expression *process_if_expr;
struct ccase *temp_case;
@@
-124,8
+125,8
@@
int logging;
static void get_date (void);
static void get_date (void);
-#if HAVE_LIBTERMCAP
&& !__CHECKER__
-static char
*term_buffer
;
+#if HAVE_LIBTERMCAP
+static char
term_buffer[16384]
;
#endif
void
#endif
void
@@
-166,7
+167,7
@@
init_glob (int argc unused, char **argv)
#endif
/* var.h */
#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);
vec_init (&reinit_sysmis);
vec_init (&reinit_blanks);
@@
-257,7
+258,7
@@
init_glob (int argc unused, char **argv)
set_nullline = 1;
set_more = 1;
set_prompt = xstrdup ("PSPP> ");
set_nullline = 1;
set_more = 1;
set_prompt = xstrdup ("PSPP> ");
- set_seed =
2000000
;
+ set_seed =
NOT_LONG
;
#if __DJGPP__ || __BORLANDC__
{
#if __DJGPP__ || __BORLANDC__
{
@@
-273,20
+274,11
@@
init_glob (int argc unused, char **argv)
int success;
/* This code stolen from termcap.info, though modified. */
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>'."));
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);
success = tgetent (term_buffer, termtype);
-#endif
-
if (success <= 0)
{
if (success < 0)
if (success <= 0)
{
if (success < 0)
@@
-314,60
+306,26
@@
init_glob (int argc unused, char **argv)
logfile = NULL;
/* file-handle.h */
logfile = NULL;
/* file-handle.h */
- {
- extern void fh_init_files (void);
-
- fh_init_files ();
- }
+ fh_init_files ();
get_date ();
}
static void
get_date ();
}
static void
-get_date ()
+get_date (
void
)
{
{
- static const char *months[12] =
- {
- N_("Jan"), N_("Feb"), N_("Mar"), N_("Apr"), N_("May"), N_("Jun"),
- N_("Jul"), N_("Aug"), N_("Sep"), N_("Oct"), N_("Nov"), N_("Dec"),
- };
time_t t;
time_t t;
- int mn, dy, yr;
struct tm *tmp;
if ((time_t) -1 == time (&t))
{
struct tm *tmp;
if ((time_t) -1 == time (&t))
{
- strcpy (curdate, "
1 Jan 1970
");
+ strcpy (curdate, "
?? ??? 2???
");
return;
}
tmp = localtime (&t);
return;
}
tmp = localtime (&t);
- mn = tmp->tm_mon;
- if (mn < 0)
- mn = 0;
- if (mn > 11)
- mn = 11;
-
- dy = tmp->tm_mday;
- if (dy < 0)
- dy = 0;
- if (dy > 99)
- dy = 99;
-
- yr = tmp->tm_year + 1900;
- if (yr < 0)
- yr = 0;
- if (yr > 9999)
- yr = 9999;
-
- 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);
+ strftime (curdate, 12, "%d %b %Y",tmp);
}
#if __BORLANDC__
}
#if __BORLANDC__