diff options
Diffstat (limited to 'time')
| -rw-r--r-- | time/Makefile | 43 | ||||
| -rw-r--r-- | time/mktime.c | 37 | ||||
| -rw-r--r-- | time/simplebackw | 2 | ||||
| -rw-r--r-- | time/strptime.c | 471 | ||||
| -rw-r--r-- | time/test-tz.c | 5 | ||||
| -rw-r--r-- | time/tzfile.c | 42 | ||||
| -rw-r--r-- | time/tzselect.ksh | 8 | ||||
| -rw-r--r-- | time/tzset.c | 15 |
8 files changed, 517 insertions, 106 deletions
diff --git a/time/Makefile b/time/Makefile index 966d9f2790..af03fa2961 100644 --- a/time/Makefile +++ b/time/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +# Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -12,9 +12,9 @@ # Library General Public License for more details. # You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., 675 Mass Ave, -# Cambridge, MA 02139, USA. +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Makefile for time routines @@ -36,15 +36,21 @@ routines := offtime asctime clock ctime ctime_r difftime \ others := ap zdump zic tests := test_time clocktest test-tz +# Before the test-tz test can be run we need the data to be installed. +tests: install-test-data + + tzfiles := africa antarctica asia australasia europe northamerica \ southamerica etcetera factory systemv backward \ solar87 solar88 solar89 # pacificnew doesn't compile; if it is to be used, it should be included in # northamerica. -distribute := $(distribute) $(tzfiles) leapseconds pacificnew +distribute := $(distribute) $(tzfiles) leapseconds pacificnew simplebackw install-sbin := zic zdump +generated-dirs = testdata + all: # Make this the default target; it will be defined in Rules. include ../Makeconfig # Get objpfx defined so we can use it below. @@ -72,6 +78,11 @@ install-others = $(addprefix $(zonedir)/,$(zonenames) \ $(installed-localtime-file) $(installed-posixrules-file) endif +ifeq ($(have-ksh),yes) +install-others += $(zonedir)/iso3166.tab $(zonedir)/zone.tab +install-bin += tzselect +endif + include ../Rules @@ -146,3 +157,25 @@ CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags) CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID CFLAGS-tzfile.c = $(tz-cflags) + +# We have to make sure the data for testing the tz functions is available. +.PHONY: install-test-data +install-test-data: northamerica $(objpfx)zic $(leapseconds) yearistype \ + etcetera simplebackw + -mkdir $(objpfx)testdata + $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ + -y yearistype northamerica + $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ + -y yearistype etcetera + $(built-program-cmd) -d $(objpfx)testdata -L $(leapseconds) \ + -y yearistype simplebackw +test-tz-ENV = TZDIR=$(objpfx)testdata + + +$(objpfx)tzselect: tzselect.ksh + sed -e 's%@KSH@%$(KSH)%g' \ + -e 's%@TZDIR@%$(zonedir)%g' < $< > $@.new + chmod 555 $@.new + mv -f $@.new $@ + +$(addprefix $(zonedir)/,iso3166.tab zone.tab): $(zonedir)/%: %; $(do-install) diff --git a/time/mktime.c b/time/mktime.c index 7fa5ccb23a..223872f228 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. Contributed by Paul Eggert (eggert@twinsun.com). -This file is part of the GNU C Library. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* Define this to have a standalone program to test this implementation of mktime. */ @@ -86,6 +85,9 @@ Cambridge, MA 02139, USA. */ ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) #endif +/* Prototype for the internal function to get information based on TZ. */ +extern void __tzset_internal __P ((int always)); + /* How many days come before each month (0-12). */ const unsigned short int __mon_yday[2][13] = { @@ -161,6 +163,11 @@ time_t mktime (tp) struct tm *tp; { +#ifdef _LIBC + /* Update internal database according to current TZ setting. */ + __tzset_internal (1); +#endif + return __mktime_internal (tp, localtime_r, &localtime_offset); } diff --git a/time/simplebackw b/time/simplebackw new file mode 100644 index 0000000000..860624a1c3 --- /dev/null +++ b/time/simplebackw @@ -0,0 +1,2 @@ +Link Etc/UTC UTC +Link Etc/Universal Universal diff --git a/time/strptime.c b/time/strptime.c index bd38f9681f..f220313475 100644 --- a/time/strptime.c +++ b/time/strptime.c @@ -1,5 +1,5 @@ -/* strptime - Convert a string representation of time to a time value. - Copyright (C) 1996 Free Software Foundation, Inc. +/* Convert a string representation of time to a time value. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -18,24 +18,71 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* XXX This version of the implementation is not really complete. + Some of the fields cannot add information alone. But if seeing + some of them in the same format (such as year, week and weekday) + this is enough information for determining the date. */ + +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + #include <ctype.h> #include <langinfo.h> #include <limits.h> #include <string.h> #include <time.h> -#include "../locale/localeinfo.h" +#ifdef _LIBC +# include "../locale/localeinfo.h" +#endif + + +#ifndef __P +# if defined (__GNUC__) || (defined (__STDC__) && __STDC__) +# define __P(args) args +# else +# define __P(args) () +# endif /* GCC. */ +#endif /* Not __P. */ + +#if ! HAVE_LOCALTIME_R && ! defined (localtime_r) +#ifdef _LIBC +#define localtime_r __localtime_r +#else +/* Approximate localtime_r as best we can in its absence. */ +#define localtime_r my_localtime_r +static struct tm *localtime_r __P ((const time_t *, struct tm *)); +static struct tm * +localtime_r (t, tp) + const time_t *t; + struct tm *tp; +{ + struct tm *l = localtime (t); + if (! l) + return 0; + *tp = *l; + return tp; +} +#endif /* ! _LIBC */ +#endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */ #define match_char(ch1, ch2) if (ch1 != ch2) return NULL -#define match_string(cs1, s2) \ +#if defined __GNUC__ && __GNUC__ >= 2 +# define match_string(cs1, s2) \ ({ size_t len = strlen (cs1); \ - int result = strncasecmp (cs1, s2, len) == 0; \ - if (result) s2 += len; \ + int result = strncasecmp ((cs1), (s2), len) == 0; \ + if (result) (s2) += len; \ result; }) +#else +/* Oh come on. Get a reasonable compiler. */ +# define match_string(cs1, s2) \ + (strncasecmp ((cs1), (s2), strlen (cs1)) ? 0 : ((s2) += strlen (cs1), 1)) +#endif /* We intentionally do not use isdigit() for testing because this will lead to problems with the wide character version. */ -#define get_number(from, to) \ +#define get_number(from, to) \ do { \ val = 0; \ if (*rp < '0' || *rp > '9') \ @@ -47,33 +94,98 @@ if (val < from || val > to) \ return NULL; \ } while (0) -#define get_alt_number(from, to) \ +#ifdef _NL_CURRENT +# define get_alt_number(from, to) \ do { \ - const char *alts = _NL_CURRENT (LC_TIME, ALT_DIGITS); \ - val = 0; \ - while (*alts != '\0') \ + if (*decided != raw) \ { \ - size_t len = strlen (alts); \ - if (strncasecmp (alts, rp, len) == 0) \ - break; \ - alts = strchr (alts, '\0') + 1; \ - ++val; \ + const char *alts = _NL_CURRENT (LC_TIME, ALT_DIGITS); \ + val = 0; \ + while (*alts != '\0') \ + { \ + size_t len = strlen (alts); \ + if (strncasecmp (alts, rp, len) == 0) \ + break; \ + alts = strchr (alts, '\0') + 1; \ + ++val; \ + } \ + if (*alts == '\0') \ + { \ + if (*decided == loc && val != 0) \ + return NULL; \ + } \ + else \ + { \ + *decided = loc; \ + break; \ + } \ } \ - if (*alts == '\0') \ - return NULL; \ - } while (0) -#define recursive(new_fmt) \ - do { \ - if (*new_fmt == '\0') \ - return NULL; \ - rp = strptime (rp, new_fmt, tm); \ - if (rp == NULL) \ - return NULL; \ + get_number (from, to); \ } while (0) +#else +# define get_alt_number(from, to) \ + /* We don't have the alternate representation. */ \ + get_number(from, to) +#endif +#define recursive(new_fmt) \ + (*(new_fmt) != '\0' \ + || strptime_internal (rp, (new_fmt), tm, decided) != NULL) -char * -strptime (const char *buf, const char *format, struct tm *tm) +#ifdef _LIBC +/* This is defined in locale/C-time.c in the GNU libc. */ +extern const struct locale_data _nl_C_LC_TIME; + +# define weekday_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (DAY_1)].string) +# define ab_weekday_name \ + (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABDAY_1)].string) +# define month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (MON_1)].string) +# define ab_month_name (&_nl_C_LC_TIME.values[_NL_ITEM_INDEX (ABMON_1)].string) +# define HERE_D_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string) +# define HERE_D_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (D_T_FMT)].string) +# define HERE_AM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (AM_STR)].string) +# define HERE_PM_STR (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (PM_STR)].string) +# define HERE_T_FMT_AMPM \ + (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT_AMPM)].string) +# define HERE_T_FMT (_nl_C_LC_TIME.values[_NL_ITEM_INDEX (T_FMT)].string) +#else +static char const weekday_name[][10] = + { + "Sunday", "Monday", "Tuesday", "Wednesday", + "Thursday", "Friday", "Saturday" + }; +static char const ab_weekday_name[][4] = + { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; +static char const month_name[][10] = + { + "January", "February", "March", "April", "May", "June", + "July", "August", "September", "October", "November", "December" + }; +static char const ab_month_name[][4] = + { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + }; +# define HERE_D_T_FMT "%a %b %e %H:%M:%S %Y" +# define HERE_D_FMT "%m/%d/%y" +# define HERE_AM_STR "AM" +# define HERE_PM_STR "PM" +# define HERE_T_FMT_AMPM "%I:%M:%S %p" +# define HERE_T_FMT "%H:%M:%S" +#endif + +/* Status of lookup: do we use the locale data or the raw data? */ +enum locale_status { not, loc, raw }; + + +static char * +strptime_internal (buf, format, tm, decided) + const char *buf; + const char *format; + struct tm *tm; + enum locale_status *decided; { const char *rp; const char *fmt; @@ -106,6 +218,10 @@ strptime (const char *buf, const char *format, struct tm *tm) } ++fmt; +#ifndef _NL_CURRENT + /* We need this for handling the `E' modifier. */ + start_over: +#endif switch (*fmt++) { case '%': @@ -117,10 +233,34 @@ strptime (const char *buf, const char *format, struct tm *tm) /* Match day of week. */ for (cnt = 0; cnt < 7; ++cnt) { - if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp)) - break; - if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp)) - break; +#ifdef _NL_CURRENT + if (*decided !=raw) + { + if (match_string (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, ABDAY_1 + cnt), + ab_weekday_name[cnt])) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, DAY_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, DAY_1 + cnt), + weekday_name[cnt])) + *decided = loc; + break; + } + } +#endif + if (*decided != loc + && (match_string (ab_weekday_name[cnt], rp) + || match_string (weekday_name[cnt], rp))) + { + *decided = raw; + break; + } } if (cnt == 7) /* Does not match a weekday name. */ @@ -133,10 +273,33 @@ strptime (const char *buf, const char *format, struct tm *tm) /* Match month name. */ for (cnt = 0; cnt < 12; ++cnt) { - if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp)) - break; - if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp)) - break; +#ifdef _NL_CURRENT + if (*decided !=raw) + { + if (match_string (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, ABMON_1 + cnt), + ab_month_name[cnt])) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, MON_1 + cnt), rp)) + { + if (*decided == not + && strcmp (_NL_CURRENT (LC_TIME, MON_1 + cnt), + month_name[cnt])) + *decided = loc; + break; + } + } +#endif + if (match_string (ab_month_name[cnt], rp) + || match_string (month_name[cnt], rp)) + { + *decided = raw; + break; + } } if (cnt == 12) /* Does not match a month name. */ @@ -145,7 +308,26 @@ strptime (const char *buf, const char *format, struct tm *tm) break; case 'c': /* Match locale's date and time format. */ - recursive (_NL_CURRENT (LC_TIME, D_T_FMT)); +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, D_T_FMT))) + { + if (*decided == loc) + return NULL; + } + else + { + if (*decided == not && + strcmp (_NL_CURRENT (LC_TIME, D_T_FMT), HERE_D_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + if (!recursive (HERE_D_T_FMT)) + return NULL; break; case 'C': /* Match century number. */ @@ -158,9 +340,30 @@ strptime (const char *buf, const char *format, struct tm *tm) get_number (1, 31); tm->tm_mday = val; break; + case 'x': +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, D_FMT))) + { + if (*decided == loc) + return NULL; + } + else + { + if (decided == not + && strcmp (_NL_CURRENT (LC_TIME, D_FMT), HERE_D_FMT)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + /* Fall through. */ case 'D': /* Match standard day format. */ - recursive ("%m/%d/%y"); + if (!recursive (HERE_D_FMT)) + return NULL; break; case 'H': /* Match hour in 24-hour clock. */ @@ -197,19 +400,57 @@ strptime (const char *buf, const char *format, struct tm *tm) break; case 'p': /* Match locale's equivalent of AM/PM. */ - if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp)) - break; - if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp)) +#ifdef _NL_CURRENT + if (*decided != raw) { - is_pm = 1; - break; + if (match_string (_NL_CURRENT (LC_TIME, AM_STR), rp)) + { + if (strcmp (_NL_CURRENT (LC_TIME, AM_STR), HERE_AM_STR)) + *decided = loc; + break; + } + if (match_string (_NL_CURRENT (LC_TIME, PM_STR), rp)) + { + if (strcmp (_NL_CURRENT (LC_TIME, PM_STR), HERE_PM_STR)) + *decided = loc; + is_pm = 1; + break; + } + *decided = raw; } - return NULL; +#endif + if (!match_string (HERE_AM_STR, rp)) + if (match_string (HERE_PM_STR, rp)) + is_pm = 1; + else + return NULL; + break; case 'r': - recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM)); +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, T_FMT_AMPM))) + { + if (*decided == loc) + return NULL; + } + else + { + if (*decided == not && + strcmp (_NL_CURRENT (LC_TIME, T_FMT_AMPM), + HERE_T_FMT_AMPM)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + if (!recursive (HERE_T_FMT_AMPM)) + return NULL; break; case 'R': - recursive ("%H:%M"); + if (!recursive ("%H:%M")) + return NULL; break; case 's': { @@ -229,7 +470,7 @@ strptime (const char *buf, const char *format, struct tm *tm) } while (*rp >= '0' && *rp <= '9'); - if (__localtime_r (&secs, tm) == NULL) + if (localtime_r (&secs, tm) == NULL) /* Error in function. */ return NULL; } @@ -238,8 +479,28 @@ strptime (const char *buf, const char *format, struct tm *tm) get_number (0, 61); tm->tm_sec = val; break; + case 'X': +#ifdef _NL_CURRENT + if (*decided != raw) + { + if (!recursive (_NL_CURRENT (LC_TIME, T_FMT))) + { + if (*decided == loc) + return NULL; + } + else + { + if (strcmp (_NL_CURRENT (LC_TIME, T_FMT), HERE_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } +#endif + /* Fall through. */ case 'T': - recursive ("%H:%M:%S"); + if (!recursive (HERE_T_FMT)) + return NULL; break; case 'u': get_number (1, 7); @@ -262,19 +523,14 @@ strptime (const char *buf, const char *format, struct tm *tm) case 'V': case 'W': get_number (0, 53); - /* XXX This cannot determine any field in TM. */ + /* XXX This cannot determine any field in TM without some + information. */ break; case 'w': /* Match number of weekday. */ get_number (0, 6); tm->tm_wday = val; break; - case 'x': - recursive (_NL_CURRENT (LC_TIME, D_FMT)); - break; - case 'X': - recursive (_NL_CURRENT (LC_TIME, T_FMT)); - break; case 'y': /* Match year within century. */ get_number (0, 99); @@ -289,11 +545,35 @@ strptime (const char *buf, const char *format, struct tm *tm) /* XXX How to handle this? */ break; case 'E': +#ifdef _NL_CURRENT switch (*fmt++) { case 'c': /* Match locale's alternate date and time format. */ - recursive (_NL_CURRENT (LC_TIME, ERA_D_T_FMT)); + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, D_T_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + } + else + { + if (strcmp (fmt, HERE_D_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } + /* The C locale has no era information, so use the + normal representation. */ + if (!recursive (HERE_D_T_FMT)) + return NULL; break; case 'C': case 'y': @@ -301,20 +581,70 @@ strptime (const char *buf, const char *format, struct tm *tm) /* Match name of base year in locale's alternate representation. */ /* XXX This is currently not implemented. It should - use the value _NL_CURRENT (LC_TIME, ERA) but POSIX - leaves this implementation defined and we haven't - figured out how to do it yet. */ + use the value _NL_CURRENT (LC_TIME, ERA). */ break; case 'x': - recursive (_NL_CURRENT (LC_TIME, ERA_D_FMT)); + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_D_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, D_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + } + else + { + if (strcmp (fmt, HERE_D_FMT)) + *decided = loc; + break; + } + *decided = raw; + } + if (!recursive (HERE_D_FMT)) + return NULL; break; case 'X': - recursive (_NL_CURRENT (LC_TIME, ERA_T_FMT)); + if (*decided != raw) + { + const char *fmt = _NL_CURRENT (LC_TIME, ERA_T_FMT); + + if (*fmt == '\0') + fmt = _NL_CURRENT (LC_TIME, T_FMT); + + if (!recursive (fmt)) + { + if (*decided == loc) + return NULL; + } + else + { + if (strcmp (fmt, HERE_T_FMT)) + *decided = loc; + break; + } + *decided = raw; + } + if (!recursive (HERE_T_FMT)) + return NULL; break; default: return NULL; } break; +#else + /* We have no information about the era format. Just use + the normal format. */ + if (*fmt != 'c' && *fmt != 'C' && *fmt != 'y' && *fmt != 'Y' + && *fmt != 'x' && *fmt != 'X') + /* This is an illegal format. */ + return NULL; + + goto start_over; +#endif case 'O': switch (*fmt++) { @@ -357,7 +687,8 @@ strptime (const char *buf, const char *format, struct tm *tm) case 'V': case 'W': get_alt_number (0, 53); - /* XXX This cannot determine any field in TM. */ + /* XXX This cannot determine any field in TM without + further information. */ break; case 'w': /* Match number of weekday using alternate numeric symbols. */ @@ -382,3 +713,19 @@ strptime (const char *buf, const char *format, struct tm *tm) return (char *) rp; } + + +char * +strptime (buf, format, tm) + const char *buf; + const char *format; + struct tm *tm; +{ + enum locale_status decided; +#ifdef _NL_CURRENT + decided = not; +#else + decided = raw; +#endif + return strptime_internal (buf, format, tm, &decided); +} diff --git a/time/test-tz.c b/time/test-tz.c index 2e1432cf11..528aa6f7ab 100644 --- a/time/test-tz.c +++ b/time/test-tz.c @@ -17,7 +17,7 @@ struct { int -main(int argc, char ** argv) +main (int argc, char ** argv) { int errors = 0; struct tm tm; @@ -36,8 +36,7 @@ main(int argc, char ** argv) for (i = 0; i < sizeof (tests) / sizeof (tests[0]); ++i) { putenv (tests[i].env); - tzset (); - t = mktime(&tm); + t = mktime (&tm); if (t != tests[i].expected) { printf ("%s: flunked test %u (expected %lu, got %lu)\n", diff --git a/time/tzfile.c b/time/tzfile.c index d80789d570..761ddc9539 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 95, 96, 97 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -113,16 +113,28 @@ __tzfile_read (const char *file) if (*file != '/') { - static const char tzdir[] = TZDIR; - register const unsigned int len = strlen (file) + 1; - char *new = (char *) __alloca (sizeof (tzdir) + len); - memcpy (new, tzdir, sizeof(tzdir) - 1); - new[sizeof (tzdir) - 1] = '/'; - memcpy (&new[sizeof (tzdir)], file, len); + static const char default_tzdir[] = TZDIR; + const char *tzdir; + unsigned int len, tzdir_len; + char *new; + + tzdir = __secure_getenv ("TZDIR"); + if (tzdir == NULL || *tzdir == '\0') + { + tzdir = default_tzdir; + tzdir_len = sizeof (default_tzdir) - 1; + } + else + tzdir_len = strlen (tzdir); + len = strlen (file) + 1; + new = (char *) __alloca (tzdir_len + 1 + len); + memcpy (new, tzdir, tzdir_len); + new[tzdir_len] = '/'; + memcpy (&new[tzdir_len + 1], file, len); file = new; } - f = fopen(file, "r"); + f = fopen (file, "r"); if (f == NULL) return; @@ -171,6 +183,12 @@ __tzfile_read (const char *file) fread(type_idxs, 1, num_transitions, f) != num_transitions) goto lose; + /* Check for bogus indices in the data file, so we can hereafter + safely use type_idxs[T] as indices into `types' and never crash. */ + for (i = 0; i < num_transitions; ++i) + if (type_idxs[i] >= num_types) + goto lose; + if (BYTE_ORDER != BIG_ENDIAN || sizeof (time_t) != 4) { /* Decode the transition times, stored as 4-byte integers in @@ -189,6 +207,8 @@ __tzfile_read (const char *file) fread (&types[i].isdst, 1, 1, f) != 1 || fread (&types[i].idx, 1, 1, f) != 1) goto lose; + if (types[i].idx >= chars) /* Bogus index in data file. */ + goto lose; types[i].offset = (long int) decode (x); } @@ -335,6 +355,10 @@ __tzfile_default (char *std, char *dst, long int stdoff, long int dstoff) types[1].offset = dstoff; types[1].isdst = 1; + /* Reset the zone names to point to the user's names. */ + __tzname[0] = &zone_names[0]; + __tzname[1] = &zone_names[stdlen]; + compute_tzname_max (stdlen + dstlen); } @@ -425,7 +449,7 @@ compute_tzname_max (size_t chars) const char *start = p; while (*p != '\0') ++p; - if (p - start > __tzname_cur_max) + if ((size_t) (p - start) > __tzname_cur_max) __tzname_cur_max = p - start; } while (++p < &zone_names[chars]); } diff --git a/time/tzselect.ksh b/time/tzselect.ksh index 0f0a3bb28e..33bdbc7431 100644 --- a/time/tzselect.ksh +++ b/time/tzselect.ksh @@ -1,4 +1,4 @@ -#! /bin/ksh +#! @KSH@ # Ask the user about the time zone, and output the resulting TZ value to stdout. # Interact with the user via stderr and stdin. @@ -11,7 +11,7 @@ # you can use either of the following free programs instead: # # Bourne-Again shell (bash) -# <URL:ftp://prep.ai.mit.edu:/pub/gnu/bash-1.14.7.tar.gz> +# <URL:ftp://prep.ai.mit.edu:/pub/gnu/bash-2.0.tar.gz> # (or any later version) # # Public domain ksh @@ -22,7 +22,7 @@ # you can use either of the following free programs instead: # # GNU awk (gawk) -# <URL:ftp://prep.ai.mit.edu:/pub/gnu/gawk-3.0.0.tar.gz> +# <URL:ftp://prep.ai.mit.edu:/pub/gnu/gawk-3.0.2.tar.gz> # (or any later version) # # mawk @@ -32,7 +32,7 @@ # Specify default values for environment variables if they are unset. : ${AWK=awk} -: ${TZDIR=$(pwd)} +: ${TZDIR=@TZDIR@} # Check for awk Posix compliance. ($AWK -v x=y 'BEGIN { exit 123 }') </dev/null >/dev/null 2>&1 diff --git a/time/tzset.c b/time/tzset.c index 13360b445b..8d8be34405 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -108,16 +108,12 @@ __tzset_internal (always) /* Free old storage. */ if (tz_rules[0].name != NULL && *tz_rules[0].name != '\0') - { - free((void *) tz_rules[0].name); - tz_rules[0].name = NULL; - } + free((void *) tz_rules[0].name); if (tz_rules[1].name != NULL && *tz_rules[1].name != '\0' && tz_rules[1].name != tz_rules[0].name) - { - free((void *) tz_rules[1].name); - tz_rules[1].name = NULL; - } + free((void *) tz_rules[1].name); + tz_rules[0].name = NULL; + tz_rules[1].name = NULL; /* Save the value of `tz'. */ if (old_tz != NULL) @@ -234,6 +230,9 @@ __tzset_internal (always) tz += l; } } + else + /* There is no DST. */ + tz_rules[1].name = tz_rules[0].name; /* Figure out the DST offset from GMT. */ if (*tz == '-' || *tz == '+') |