1996-02-17 00:15:45 +08:00
|
|
|
|
/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc.
|
1995-02-18 09:27:10 +08:00
|
|
|
|
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 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. */
|
|
|
|
|
|
|
|
|
|
#include <ansidecl.h>
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <stddef.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
|
|
/* Defined in mktime.c. */
|
Fri Sep 29 03:43:51 1995 Paul Eggert <eggert@twinsun.com>
Rewrite mktime from scratch for performance, and for correctness
in the presence of leap seconds.
* time/mktime.c (ydhms_tm_diff, not_equal_tm, print_tm, check_result):
New functions.
(LEAP_SECONDS_POSSIBLE, CHAR_BIT, INT_MIN, INT_MAX,
TIME_T_MIN, TIME_T_MAX, TM_YEAR_BASE, EPOCH_YEAR): New macros.
<limits.h>, <stdlib.h>: New #includes.
(main): Support tests with given broken-down value; support benchmarks.
(__mon_lengths, debugging_enabled, printtm, dist_tm, doit,
do_normalization, normalize, BAD_STRUCT_TM, SKIP_VALUE,
<ctype.h>): Remove.
* time/time.h, time/mktime.c (__mktime_internal): New offset arg.
* time/mktime.c (mktime), time/timegm.c (timegm): Use it.
* time/mktime.c (__mon_yday): New variable; replaces `__mon_lengths'.
time/offtime.c (__offtime), time/tzset.c (compute_change): Use it.
* time/offtime.c (__offtime): Remove useless assignment
`tp->tm_isdst = -1'.
* manual/maint.texi: Update credits.
Fri Oct 6 00:28:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/unix/common/readv.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/common/writev.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/sysv/linux/readv.c: File removed.
* sysdeps/unix/sysv/linux/writev.c: File removed.
* sysdeps/unix/configure.in: Check for readv and writev syscalls.
* sysdeps/unix/configure.in: If eval doesn't set $unix_srcname,
set it to $unix_syscall instead of $unix_function.
1995-10-06 12:50:55 +08:00
|
|
|
|
extern CONST unsigned short int __mon_yday[2][13];
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
#define NOID
|
|
|
|
|
#include "tzfile.h"
|
|
|
|
|
|
|
|
|
|
extern int __use_tzfile;
|
|
|
|
|
extern void EXFUN(__tzfile_read, (CONST char *file));
|
|
|
|
|
extern void EXFUN(__tzfile_default, (char *std AND char *dst AND
|
|
|
|
|
long int stdoff AND long int dstoff));
|
|
|
|
|
extern int EXFUN(__tzfile_compute, (time_t, struct tm));
|
|
|
|
|
|
|
|
|
|
char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };
|
|
|
|
|
int __daylight = 0;
|
|
|
|
|
long int __timezone = 0L;
|
|
|
|
|
|
1995-04-20 07:41:29 +08:00
|
|
|
|
weak_alias (__tzname, tzname)
|
|
|
|
|
weak_alias (__daylight, daylight)
|
|
|
|
|
weak_alias (__timezone, timezone)
|
|
|
|
|
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
#define min(a, b) ((a) < (b) ? (a) : (b))
|
|
|
|
|
#define max(a, b) ((a) > (b) ? (a) : (b))
|
|
|
|
|
#define sign(x) ((x) < 0 ? -1 : 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This structure contains all the information about a
|
|
|
|
|
timezone given in the POSIX standard TZ envariable. */
|
|
|
|
|
typedef struct
|
|
|
|
|
{
|
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
|
|
/* When to change. */
|
|
|
|
|
enum { J0, J1, M } type; /* Interpretation of: */
|
|
|
|
|
unsigned short int m, n, d; /* Month, week, day. */
|
|
|
|
|
unsigned int secs; /* Time of day. */
|
|
|
|
|
|
|
|
|
|
long int offset; /* Seconds east of GMT (west if < 0). */
|
|
|
|
|
|
|
|
|
|
/* We cache the computed time of change for a
|
|
|
|
|
given year so we don't have to recompute it. */
|
|
|
|
|
time_t change; /* When to change to this zone. */
|
|
|
|
|
int computed_for; /* Year above is computed for. */
|
|
|
|
|
} tz_rule;
|
|
|
|
|
|
|
|
|
|
/* tz_rules[0] is standard, tz_rules[1] is daylight. */
|
|
|
|
|
static tz_rule tz_rules[2];
|
|
|
|
|
|
|
|
|
|
int __tzset_run = 0;
|
|
|
|
|
|
|
|
|
|
/* Interpret the TZ envariable. */
|
|
|
|
|
void
|
|
|
|
|
DEFUN_VOID(__tzset)
|
|
|
|
|
{
|
|
|
|
|
register CONST char *tz;
|
|
|
|
|
register size_t l;
|
|
|
|
|
unsigned short int hh, mm, ss;
|
|
|
|
|
unsigned short int whichrule;
|
|
|
|
|
|
|
|
|
|
/* Free old storage. */
|
|
|
|
|
if (tz_rules[0].name != NULL && *tz_rules[0].name != '\0')
|
Wed May 29 00:57:37 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/Makefile (tests): Add test-tz.
* time/test-tz.c: New test.
* time/clocktest.c: Rewrite to test more meaningfully.
* sysdeps/unix/sysv/linux/syscalls.list: Add bdflush,
create_module, delete_module, get_kernel_syms, init_module,
klogctl.
* sysdeps/unix/sysv/linux/sys/param.h (MAXSYMLINKS): Define as 5
instead of SYMLOOP_MAX, which is nowhere to be found.
* sysdeps/unix/sysv/linux/sys/msq_buf.h,
sysdeps/unix/sysv/linux/sys/sem_buf.h,
sysdeps/unix/sysv/linux/sys/shm_buf.h [__USE_MISC]: Add more
control ops and datastructures.
* sysdeps/unix/sysv/linux/sys/io.h: New file declaring low-level
I/O related functions.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: New file declaring kernel
daemon related functions/operations.
* sysdeps/unix/sysv/linux/sys/klog.h: New file declaring kernel
logging related functions/operations.
* sysdeps/unix/sysv/linux/sys/module.h: New file declaring kernel
module related functions/operations.
* sysdeps/unix/sysv/linux/speed.c: Only do "mention this twice" hack
for non-Alpha based Linux systems.
* sysdeps/unix/sysv/linux/alpha/speed.c: Remove.
* sysdeps/unix/sysv/linux/Makefile (headers): Add sys/module.h,
sys/io.h, sys/klog.h, and sys/kdaemon.h.
* sysdeps/unix/sysdep.h (END): Define empty END macro for
platforms that don't need some sort of end directive at the
end of functions.
* sysdeps/unix/make-syscalls.sh: Emit END($strong) at end of
syscall wrapper to allow correct generation of debugging
information.
* sysdeps/unix/alpha/sysdep.h (END): Redefine to use .end
directive for both ELF and ECOFF.
(ret): Delete macro. It was a dangerous macro and unnecessary
since the Alpha assemblers recognizes "ret" as a macro themselves.
* sysdeps/gnu/utmpbits.h (struct utmp): Move ut_tv behind
ut_session to guarantee long alignment. This is important for
Linux/Alpha since ut_tv.tv_sec is 32 bits and time_t is 64 bits.
This will all get cleaned up as programs start to use ut_tv
instead ut_time.
* sysdeps/alpha/divrem.h: Include <sysdep.h> instead of <*/regdef.h>.
* sysdeps/alpha/bsd-_setjmp.S (setjmp): Renamed entry point to
_setjmp.
* sysdeps/alpha/_mcount.S, sysdeps/alpha/bb_init_func.S,
sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S,
sysdeps/alpha/copysign.S, sysdeps/alpha/divrem.h,
sysdeps/alpha/fabs.S, sysdeps/alpha/ffs.S, sysdeps/alpha/htonl.S,
sysdeps/alpha/htons.S, sysdeps/alpha/memchr.S,
sysdeps/alpha/setjmp.S, sysdeps/alpha/strlen.S,
sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S,
sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S,
sysdeps/unix/sysv/linux/alpha/llseek.S,
sysdeps/unix/sysv/linux/alpha/pipe.S,
sysdeps/unix/sysv/linux/alpha/sigsuspend.S,
sysdeps/unix/sysv/linux/alpha/sysdep.S: Use END macro instead of
.end directive.
* csu/initfini.c (_fini): Tell gcc that _fini is not a leaf
function by having it contain a dummy function call.
* configure.in (config_machine): Don't make ELF the default for
Linux/Alpha just yet (use --with-elf instead).
(.init/.fini check): Generate .text to ensure function start and
end are in same section.
* sysdeps/unix/bsd/osf/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/brk.S (__curbrk): Store the entire
break value, not just the low 32 bits to accomodate large
memories.
Tue May 28 10:46:04 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/sysv/linux/alpha/brk.S: Rather than attempt to
dynamically resolve _end for initializing __curbrk, support the
brk(0) query idiom.
* sysdeps/alpha/bb_init_func.S: Don't make `init' an external symbol.
* sysdeps/alpha/bsd-_setjmp.S: The function is _setjmp not setjmp.
Sun May 26 22:17:38 1996 Richard Henderson <rth@tamu.edu>
* stdlib/lcong48_r.c, stdlib/seed48_r.c, stdlib/strtod.c,
stdlib/strtol.c: Include <string.h> for mem* and str* fns used.
Thu May 23 02:15:56 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/Makefile (headers): Add sys/io.h,
sys/klog.h, and sys/kdaemon.h.
* sysdeps/unix/sysv/linux/sys/io.h: New file.
* sysdeps/unix/sysv/linux/sys/klog.h: Ditto.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Ditto.
* sysdeps/unix/alpha/sysdep.h (ret): Remove macro. It is
dangerous and unnecessary since both OSF/1 as and gas define "ret"
as a pseudo-instruction.
Sat Jun 1 17:18:21 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/tzset.c (__tzset): Clear tz_rules name pointers after freeing
them. Bug found by David Mosberger-Tang.
* sysdeps/posix/tempname.c (__stdio_gen_tempname): Use __ptr_t instead
of PTR.
* extra-lib.mk (extra-objs): Use patsubst intead of $(A:=B) syntax
to work around Make bug when A contains var ref.
Fri May 31 18:27:52 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* string/string.h [__USE_MISC]: Declare basename; OSF/1 puts it here.
* sysdeps/unix/sysv/linux/syscalls.list (getpgid, setpgid): Define __
strong names and [gs]etpgid as weak aliases.
* math/math_private.h (GET_LDOUBLE_EXP): Add missing backslash.
1996-06-03 02:50:07 +08:00
|
|
|
|
{
|
|
|
|
|
free((PTR) tz_rules[0].name);
|
|
|
|
|
tz_rules[0].name = NULL;
|
|
|
|
|
}
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (tz_rules[1].name != NULL && *tz_rules[1].name != '\0' &&
|
|
|
|
|
tz_rules[1].name != tz_rules[0].name)
|
Wed May 29 00:57:37 1996 David Mosberger-Tang <davidm@azstarnet.com>
* time/Makefile (tests): Add test-tz.
* time/test-tz.c: New test.
* time/clocktest.c: Rewrite to test more meaningfully.
* sysdeps/unix/sysv/linux/syscalls.list: Add bdflush,
create_module, delete_module, get_kernel_syms, init_module,
klogctl.
* sysdeps/unix/sysv/linux/sys/param.h (MAXSYMLINKS): Define as 5
instead of SYMLOOP_MAX, which is nowhere to be found.
* sysdeps/unix/sysv/linux/sys/msq_buf.h,
sysdeps/unix/sysv/linux/sys/sem_buf.h,
sysdeps/unix/sysv/linux/sys/shm_buf.h [__USE_MISC]: Add more
control ops and datastructures.
* sysdeps/unix/sysv/linux/sys/io.h: New file declaring low-level
I/O related functions.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: New file declaring kernel
daemon related functions/operations.
* sysdeps/unix/sysv/linux/sys/klog.h: New file declaring kernel
logging related functions/operations.
* sysdeps/unix/sysv/linux/sys/module.h: New file declaring kernel
module related functions/operations.
* sysdeps/unix/sysv/linux/speed.c: Only do "mention this twice" hack
for non-Alpha based Linux systems.
* sysdeps/unix/sysv/linux/alpha/speed.c: Remove.
* sysdeps/unix/sysv/linux/Makefile (headers): Add sys/module.h,
sys/io.h, sys/klog.h, and sys/kdaemon.h.
* sysdeps/unix/sysdep.h (END): Define empty END macro for
platforms that don't need some sort of end directive at the
end of functions.
* sysdeps/unix/make-syscalls.sh: Emit END($strong) at end of
syscall wrapper to allow correct generation of debugging
information.
* sysdeps/unix/alpha/sysdep.h (END): Redefine to use .end
directive for both ELF and ECOFF.
(ret): Delete macro. It was a dangerous macro and unnecessary
since the Alpha assemblers recognizes "ret" as a macro themselves.
* sysdeps/gnu/utmpbits.h (struct utmp): Move ut_tv behind
ut_session to guarantee long alignment. This is important for
Linux/Alpha since ut_tv.tv_sec is 32 bits and time_t is 64 bits.
This will all get cleaned up as programs start to use ut_tv
instead ut_time.
* sysdeps/alpha/divrem.h: Include <sysdep.h> instead of <*/regdef.h>.
* sysdeps/alpha/bsd-_setjmp.S (setjmp): Renamed entry point to
_setjmp.
* sysdeps/alpha/_mcount.S, sysdeps/alpha/bb_init_func.S,
sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S,
sysdeps/alpha/copysign.S, sysdeps/alpha/divrem.h,
sysdeps/alpha/fabs.S, sysdeps/alpha/ffs.S, sysdeps/alpha/htonl.S,
sysdeps/alpha/htons.S, sysdeps/alpha/memchr.S,
sysdeps/alpha/setjmp.S, sysdeps/alpha/strlen.S,
sysdeps/unix/sysv/linux/alpha/ieee_get_fp_control.S,
sysdeps/unix/sysv/linux/alpha/ieee_set_fp_control.S,
sysdeps/unix/sysv/linux/alpha/llseek.S,
sysdeps/unix/sysv/linux/alpha/pipe.S,
sysdeps/unix/sysv/linux/alpha/sigsuspend.S,
sysdeps/unix/sysv/linux/alpha/sysdep.S: Use END macro instead of
.end directive.
* csu/initfini.c (_fini): Tell gcc that _fini is not a leaf
function by having it contain a dummy function call.
* configure.in (config_machine): Don't make ELF the default for
Linux/Alpha just yet (use --with-elf instead).
(.init/.fini check): Generate .text to ensure function start and
end are in same section.
* sysdeps/unix/bsd/osf/alpha/brk.S,
sysdeps/unix/sysv/linux/alpha/brk.S (__curbrk): Store the entire
break value, not just the low 32 bits to accomodate large
memories.
Tue May 28 10:46:04 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/sysv/linux/alpha/brk.S: Rather than attempt to
dynamically resolve _end for initializing __curbrk, support the
brk(0) query idiom.
* sysdeps/alpha/bb_init_func.S: Don't make `init' an external symbol.
* sysdeps/alpha/bsd-_setjmp.S: The function is _setjmp not setjmp.
Sun May 26 22:17:38 1996 Richard Henderson <rth@tamu.edu>
* stdlib/lcong48_r.c, stdlib/seed48_r.c, stdlib/strtod.c,
stdlib/strtol.c: Include <string.h> for mem* and str* fns used.
Thu May 23 02:15:56 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/Makefile (headers): Add sys/io.h,
sys/klog.h, and sys/kdaemon.h.
* sysdeps/unix/sysv/linux/sys/io.h: New file.
* sysdeps/unix/sysv/linux/sys/klog.h: Ditto.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Ditto.
* sysdeps/unix/alpha/sysdep.h (ret): Remove macro. It is
dangerous and unnecessary since both OSF/1 as and gas define "ret"
as a pseudo-instruction.
Sat Jun 1 17:18:21 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/tzset.c (__tzset): Clear tz_rules name pointers after freeing
them. Bug found by David Mosberger-Tang.
* sysdeps/posix/tempname.c (__stdio_gen_tempname): Use __ptr_t instead
of PTR.
* extra-lib.mk (extra-objs): Use patsubst intead of $(A:=B) syntax
to work around Make bug when A contains var ref.
Fri May 31 18:27:52 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* string/string.h [__USE_MISC]: Declare basename; OSF/1 puts it here.
* sysdeps/unix/sysv/linux/syscalls.list (getpgid, setpgid): Define __
strong names and [gs]etpgid as weak aliases.
* math/math_private.h (GET_LDOUBLE_EXP): Add missing backslash.
1996-06-03 02:50:07 +08:00
|
|
|
|
{
|
|
|
|
|
free((PTR) tz_rules[1].name);
|
|
|
|
|
tz_rules[1].name = NULL;
|
|
|
|
|
}
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_load_domain): Test correct variable
after malloc.
* string/Makefile (tester-ENV): New variable to suppress message
translation in test.
* string/tester.c: Add tests for strtok_r and strsep.
* sysdeps/i386/i486/strcat.S: Correct some more 8bit operation
<-> 32 bit operand conflicts.
* sysdeps/i386/strsep.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strtok_r function.
* sysdeps/generic/strtok.c: Moved here from string/strtok.c.
Corrected example in comment.
* string/Makefile (routines): Add strtok_r.
* sysdeps/generic/strtok_r.c: New file. Implement reentrant version
of strtok_r.
* string/string.h: Add prototype for strtok_r.
* wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same
as in strtok_r.
Sun May 26 13:28:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile
first and fall back to 1003.1 syntax only if it fails.
* time/Makefile (install-others): Also install posix/ZONE and
right/ZONE for each ZONE in $(zonenames).
(z.% rule): Generate rules for right/ZONE and posix/ZONE targets too,
the difference begin leapseconds vs /dev/null as 3rd dep. For
original ZONE targets use $(leapseconds), to be set in Makeconfig.
(target-zone-flavor): New variable.
(tzcompile): Use it to get the right -d for posix/ and right/ flavors.
* Makeconfig (leapseconds): New variable.
* mach/Machrules (%.udeps rule): Depend on Machrules.
Emit deps for .uh and .__h files.
(%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs>
instead.
Sun May 26 01:06:47 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/Makefile (routines): Add llabs, lldiv.
* stdlib/llabs.c: New file. Implementation of return
absolute value of long long argument.
* stdlib/lldiv.c: New file. Implementation of division with remainder
of long long argument.
* stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv
function.
Define prototypes for lldiv and llabs functions.
* locale/C-collate.c: Initialize _NL_COLLATE_NRULES element.
* stdlib/strtod.c: Replace wchar_t with wint_t. The later is
really the type for a single wide character.
* string/strxfrm.c (print_val): Define separate version for
use as wcsxfrm. Here we don't need UTF8 encoding.
* wcsmbs/wchar.h: gcc-2.7.2-960517 finally introduces wint_t
in <stddef.h>. Use this value and only for older gcc version
define in place.
(uwchar_t): Remove definition.
* wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c,
wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned
type. wint_t is intended for this.
Sat May 25 14:10:19 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to
quiet -ansi -pedantic.
* sysdeps/unix/common/direntry.h: Likewise.
* login/Makefile (headers): Add lastlog.h.
* login/lastlog.h: New file.
* login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE.
* login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional
with #ifdef __USE_REENTRANT.
* features.h (__GNU_LIBRARY__): Set to 6.
[_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE,
_SVID_SOURCE): Make sure they are all defined.
* sysdeps/unix/sysv/linux/gnu/types.h: Instead of including
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* resource/sys/resource.h: Remove trailing commas from enums.
* sysdeps/generic/netinet/in.h: Remove trailing commas from enums.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
1996-05-27 03:19:51 +08:00
|
|
|
|
/* Examine the TZ environment variable. */
|
|
|
|
|
tz = getenv ("TZ");
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_load_domain): Test correct variable
after malloc.
* string/Makefile (tester-ENV): New variable to suppress message
translation in test.
* string/tester.c: Add tests for strtok_r and strsep.
* sysdeps/i386/i486/strcat.S: Correct some more 8bit operation
<-> 32 bit operand conflicts.
* sysdeps/i386/strsep.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strtok_r function.
* sysdeps/generic/strtok.c: Moved here from string/strtok.c.
Corrected example in comment.
* string/Makefile (routines): Add strtok_r.
* sysdeps/generic/strtok_r.c: New file. Implement reentrant version
of strtok_r.
* string/string.h: Add prototype for strtok_r.
* wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same
as in strtok_r.
Sun May 26 13:28:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile
first and fall back to 1003.1 syntax only if it fails.
* time/Makefile (install-others): Also install posix/ZONE and
right/ZONE for each ZONE in $(zonenames).
(z.% rule): Generate rules for right/ZONE and posix/ZONE targets too,
the difference begin leapseconds vs /dev/null as 3rd dep. For
original ZONE targets use $(leapseconds), to be set in Makeconfig.
(target-zone-flavor): New variable.
(tzcompile): Use it to get the right -d for posix/ and right/ flavors.
* Makeconfig (leapseconds): New variable.
* mach/Machrules (%.udeps rule): Depend on Machrules.
Emit deps for .uh and .__h files.
(%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs>
instead.
Sun May 26 01:06:47 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/Makefile (routines): Add llabs, lldiv.
* stdlib/llabs.c: New file. Implementation of return
absolute value of long long argument.
* stdlib/lldiv.c: New file. Implementation of division with remainder
of long long argument.
* stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv
function.
Define prototypes for lldiv and llabs functions.
* locale/C-collate.c: Initialize _NL_COLLATE_NRULES element.
* stdlib/strtod.c: Replace wchar_t with wint_t. The later is
really the type for a single wide character.
* string/strxfrm.c (print_val): Define separate version for
use as wcsxfrm. Here we don't need UTF8 encoding.
* wcsmbs/wchar.h: gcc-2.7.2-960517 finally introduces wint_t
in <stddef.h>. Use this value and only for older gcc version
define in place.
(uwchar_t): Remove definition.
* wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c,
wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned
type. wint_t is intended for this.
Sat May 25 14:10:19 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to
quiet -ansi -pedantic.
* sysdeps/unix/common/direntry.h: Likewise.
* login/Makefile (headers): Add lastlog.h.
* login/lastlog.h: New file.
* login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE.
* login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional
with #ifdef __USE_REENTRANT.
* features.h (__GNU_LIBRARY__): Set to 6.
[_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE,
_SVID_SOURCE): Make sure they are all defined.
* sysdeps/unix/sysv/linux/gnu/types.h: Instead of including
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* resource/sys/resource.h: Remove trailing commas from enums.
* sysdeps/generic/netinet/in.h: Remove trailing commas from enums.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
1996-05-27 03:19:51 +08:00
|
|
|
|
if (tz != NULL)
|
1995-02-18 09:27:10 +08:00
|
|
|
|
{
|
Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* stdlib/ldiv.c: Deansideclized.
Sun May 26 19:39:53 1996 Ulrich Drepper <drepper@cygnus.com>
* intl/loadmsgcat.c (_nl_load_domain): Test correct variable
after malloc.
* string/Makefile (tester-ENV): New variable to suppress message
translation in test.
* string/tester.c: Add tests for strtok_r and strsep.
* sysdeps/i386/i486/strcat.S: Correct some more 8bit operation
<-> 32 bit operand conflicts.
* sysdeps/i386/strsep.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strsep function.
* sysdeps/i386/strtok.S: Optimized implementation of strtok
function.
* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
to produce strtok_r function.
* sysdeps/generic/strtok.c: Moved here from string/strtok.c.
Corrected example in comment.
* string/Makefile (routines): Add strtok_r.
* sysdeps/generic/strtok_r.c: New file. Implement reentrant version
of strtok_r.
* string/string.h: Add prototype for strtok_r.
* wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same
as in strtok_r.
Sun May 26 13:28:23 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile
first and fall back to 1003.1 syntax only if it fails.
* time/Makefile (install-others): Also install posix/ZONE and
right/ZONE for each ZONE in $(zonenames).
(z.% rule): Generate rules for right/ZONE and posix/ZONE targets too,
the difference begin leapseconds vs /dev/null as 3rd dep. For
original ZONE targets use $(leapseconds), to be set in Makeconfig.
(target-zone-flavor): New variable.
(tzcompile): Use it to get the right -d for posix/ and right/ flavors.
* Makeconfig (leapseconds): New variable.
* mach/Machrules (%.udeps rule): Depend on Machrules.
Emit deps for .uh and .__h files.
(%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs>
instead.
Sun May 26 01:06:47 1996 Ulrich Drepper <drepper@cygnus.com>
* stdlib/Makefile (routines): Add llabs, lldiv.
* stdlib/llabs.c: New file. Implementation of return
absolute value of long long argument.
* stdlib/lldiv.c: New file. Implementation of division with remainder
of long long argument.
* stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv
function.
Define prototypes for lldiv and llabs functions.
* locale/C-collate.c: Initialize _NL_COLLATE_NRULES element.
* stdlib/strtod.c: Replace wchar_t with wint_t. The later is
really the type for a single wide character.
* string/strxfrm.c (print_val): Define separate version for
use as wcsxfrm. Here we don't need UTF8 encoding.
* wcsmbs/wchar.h: gcc-2.7.2-960517 finally introduces wint_t
in <stddef.h>. Use this value and only for older gcc version
define in place.
(uwchar_t): Remove definition.
* wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c,
wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned
type. wint_t is intended for this.
Sat May 25 14:10:19 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to
quiet -ansi -pedantic.
* sysdeps/unix/common/direntry.h: Likewise.
* login/Makefile (headers): Add lastlog.h.
* login/lastlog.h: New file.
* login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE.
* login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional
with #ifdef __USE_REENTRANT.
* features.h (__GNU_LIBRARY__): Set to 6.
[_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE,
_SVID_SOURCE): Make sure they are all defined.
* sysdeps/unix/sysv/linux/gnu/types.h: Instead of including
<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
include <linux/types.h>.
* resource/sys/resource.h: Remove trailing commas from enums.
* sysdeps/generic/netinet/in.h: Remove trailing commas from enums.
* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.
1996-05-27 03:19:51 +08:00
|
|
|
|
/* A leading colon means "implementation defined syntax".
|
|
|
|
|
We ignore the colon and always use the same algorithm:
|
|
|
|
|
try a data file, and if none exists parse the 1003.1 syntax. */
|
|
|
|
|
if (*tz == ':')
|
|
|
|
|
++tz;
|
|
|
|
|
|
|
|
|
|
__tzfile_read (tz);
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (__use_tzfile)
|
|
|
|
|
{
|
|
|
|
|
__tzset_run = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (tz == NULL || *tz == '\0')
|
|
|
|
|
{
|
|
|
|
|
__tzfile_read((char *) NULL);
|
|
|
|
|
if (!__use_tzfile)
|
|
|
|
|
{
|
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using
locale data files and with <langinfo.h> interface.
* locale/setlocale.c: Rewritten to use locale data files.
* langinfo.h: New file.
* locale/langinfo.h: New file.
* locale/nl_langinfo.c: New file.
* locale/loadlocale.c: New file.
* locale/lc-ctype.c: New file.
* locale/lc-messages.c: New file.
* locale/lc-monetary.c: New file.
* locale/lc-numeric.c: New file.
* locale/lc-time.c: New file.
* locale/categories.def: New file.
* locale/Makefile (headers): Remove localeinfo.h.
(distribute): New variable; put localeinfo.h here, and categories.def.
(routines): Add loadlocale.
(categories): New variable.
(aux): Use that to get C-category and lc-category.
* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
* locale/C-ctype.c, locale/C-messages.c: New files.
* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
Default "C" locale data updated for new locale system.
* locale/C-collate.c: File removed.
* locale/C-ctype_ct.c: File removed.
* locale/C-ctype_mb.c: File removed.
* locale/C-response.c: File removed.
* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
stdlib/strtod.c, time/asctime.c, time/strftime.c:
Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
locale data.
* time/localtime.c: Don't include <localeinfo.h>.
* time/tzset.c: Don't use locale items for default TZ value or
"GMT" string (use "UTC").
* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
WIDTH>0; update DONE.
* malloc/malloc.c (morecore): Fix last change to calculate by
blocks instead of bytes.
1995-03-06 11:00:08 +08:00
|
|
|
|
const char UTC[] = "UTC";
|
|
|
|
|
size_t len = sizeof UTC;
|
1995-02-18 09:27:10 +08:00
|
|
|
|
tz_rules[0].name = (char *) malloc(len);
|
|
|
|
|
if (tz_rules[0].name == NULL)
|
|
|
|
|
return;
|
|
|
|
|
tz_rules[1].name = (char *) malloc(len);
|
|
|
|
|
if (tz_rules[1].name == NULL)
|
|
|
|
|
return;
|
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using
locale data files and with <langinfo.h> interface.
* locale/setlocale.c: Rewritten to use locale data files.
* langinfo.h: New file.
* locale/langinfo.h: New file.
* locale/nl_langinfo.c: New file.
* locale/loadlocale.c: New file.
* locale/lc-ctype.c: New file.
* locale/lc-messages.c: New file.
* locale/lc-monetary.c: New file.
* locale/lc-numeric.c: New file.
* locale/lc-time.c: New file.
* locale/categories.def: New file.
* locale/Makefile (headers): Remove localeinfo.h.
(distribute): New variable; put localeinfo.h here, and categories.def.
(routines): Add loadlocale.
(categories): New variable.
(aux): Use that to get C-category and lc-category.
* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
* locale/C-ctype.c, locale/C-messages.c: New files.
* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
Default "C" locale data updated for new locale system.
* locale/C-collate.c: File removed.
* locale/C-ctype_ct.c: File removed.
* locale/C-ctype_mb.c: File removed.
* locale/C-response.c: File removed.
* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
stdlib/strtod.c, time/asctime.c, time/strftime.c:
Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
locale data.
* time/localtime.c: Don't include <localeinfo.h>.
* time/tzset.c: Don't use locale items for default TZ value or
"GMT" string (use "UTC").
* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
WIDTH>0; update DONE.
* malloc/malloc.c (morecore): Fix last change to calculate by
blocks instead of bytes.
1995-03-06 11:00:08 +08:00
|
|
|
|
memcpy ((PTR) tz_rules[0].name, UTC, len);
|
|
|
|
|
memcpy ((PTR) tz_rules[1].name, UTC, len);
|
1995-02-18 09:27:10 +08:00
|
|
|
|
tz_rules[0].type = tz_rules[1].type = J0;
|
|
|
|
|
tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0;
|
|
|
|
|
tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0;
|
|
|
|
|
tz_rules[0].secs = tz_rules[1].secs = 0;
|
|
|
|
|
tz_rules[0].offset = tz_rules[1].offset = 0L;
|
|
|
|
|
tz_rules[0].change = tz_rules[1].change = (time_t) -1;
|
|
|
|
|
tz_rules[0].computed_for = tz_rules[1].computed_for = 0;
|
|
|
|
|
}
|
|
|
|
|
__tzset_run = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using
locale data files and with <langinfo.h> interface.
* locale/setlocale.c: Rewritten to use locale data files.
* langinfo.h: New file.
* locale/langinfo.h: New file.
* locale/nl_langinfo.c: New file.
* locale/loadlocale.c: New file.
* locale/lc-ctype.c: New file.
* locale/lc-messages.c: New file.
* locale/lc-monetary.c: New file.
* locale/lc-numeric.c: New file.
* locale/lc-time.c: New file.
* locale/categories.def: New file.
* locale/Makefile (headers): Remove localeinfo.h.
(distribute): New variable; put localeinfo.h here, and categories.def.
(routines): Add loadlocale.
(categories): New variable.
(aux): Use that to get C-category and lc-category.
* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
* locale/C-ctype.c, locale/C-messages.c: New files.
* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
Default "C" locale data updated for new locale system.
* locale/C-collate.c: File removed.
* locale/C-ctype_ct.c: File removed.
* locale/C-ctype_mb.c: File removed.
* locale/C-response.c: File removed.
* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
stdlib/strtod.c, time/asctime.c, time/strftime.c:
Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
locale data.
* time/localtime.c: Don't include <localeinfo.h>.
* time/tzset.c: Don't use locale items for default TZ value or
"GMT" string (use "UTC").
* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
WIDTH>0; update DONE.
* malloc/malloc.c (morecore): Fix last change to calculate by
blocks instead of bytes.
1995-03-06 11:00:08 +08:00
|
|
|
|
/* Clear out old state and reset to unnamed UTC. */
|
1995-02-18 09:27:10 +08:00
|
|
|
|
memset (tz_rules, 0, sizeof tz_rules);
|
|
|
|
|
tz_rules[0].name = tz_rules[1].name = (char *) "";
|
|
|
|
|
|
|
|
|
|
/* Get the standard timezone name. */
|
|
|
|
|
tz_rules[0].name = (char *) malloc (strlen (tz) + 1);
|
|
|
|
|
if (tz_rules[0].name == NULL)
|
|
|
|
|
/* Don't set __tzset_run so we will try again. */
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (sscanf(tz, "%[^0-9,+-]", tz_rules[0].name) != 1 ||
|
|
|
|
|
(l = strlen(tz_rules[0].name)) < 3)
|
|
|
|
|
{
|
|
|
|
|
free (tz_rules[0].name);
|
|
|
|
|
tz_rules[0].name = (char *) "";
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
char *n = realloc ((PTR) tz_rules[0].name, l + 1);
|
|
|
|
|
if (n != NULL)
|
|
|
|
|
tz_rules[0].name = n;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tz += l;
|
|
|
|
|
|
Sun Mar 5 19:40:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/localeinfo.h: Rewritten for new locale system, using
locale data files and with <langinfo.h> interface.
* locale/setlocale.c: Rewritten to use locale data files.
* langinfo.h: New file.
* locale/langinfo.h: New file.
* locale/nl_langinfo.c: New file.
* locale/loadlocale.c: New file.
* locale/lc-ctype.c: New file.
* locale/lc-messages.c: New file.
* locale/lc-monetary.c: New file.
* locale/lc-numeric.c: New file.
* locale/lc-time.c: New file.
* locale/categories.def: New file.
* locale/Makefile (headers): Remove localeinfo.h.
(distribute): New variable; put localeinfo.h here, and categories.def.
(routines): Add loadlocale.
(categories): New variable.
(aux): Use that to get C-category and lc-category.
* ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum.
* locale/C-ctype.c, locale/C-messages.c: New files.
* locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c:
Default "C" locale data updated for new locale system.
* locale/C-collate.c: File removed.
* locale/C-ctype_ct.c: File removed.
* locale/C-ctype_mb.c: File removed.
* locale/C-response.c: File removed.
* locale/localeconv.c: Use _NL_CURRENT macro to access locale data.
* stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c,
stdlib/strtod.c, time/asctime.c, time/strftime.c:
Include ../locale/localeinfo.h and use _NL_CURRENT macro to access
locale data.
* time/localtime.c: Don't include <localeinfo.h>.
* time/tzset.c: Don't use locale items for default TZ value or
"GMT" string (use "UTC").
* stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if
WIDTH>0; update DONE.
* malloc/malloc.c (morecore): Fix last change to calculate by
blocks instead of bytes.
1995-03-06 11:00:08 +08:00
|
|
|
|
/* Figure out the standard offset from UTC. */
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (*tz == '\0' || (*tz != '+' && *tz != '-' && !isdigit(*tz)))
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
if (*tz == '-' || *tz == '+')
|
|
|
|
|
tz_rules[0].offset = *tz++ == '-' ? 1L : -1L;
|
|
|
|
|
else
|
|
|
|
|
tz_rules[0].offset = -1L;
|
|
|
|
|
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
case 1:
|
|
|
|
|
mm = 0;
|
|
|
|
|
case 2:
|
|
|
|
|
ss = 0;
|
|
|
|
|
case 3:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
|
1996-02-17 00:15:45 +08:00
|
|
|
|
(min(hh, 23) * 60 * 60));
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
for (l = 0; l < 3; ++l)
|
|
|
|
|
{
|
|
|
|
|
while (isdigit(*tz))
|
|
|
|
|
++tz;
|
|
|
|
|
if (l < 2 && *tz == ':')
|
|
|
|
|
++tz;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Get the DST timezone name (if any). */
|
|
|
|
|
if (*tz != '\0')
|
|
|
|
|
{
|
|
|
|
|
char *n = malloc (strlen(tz) + 1);
|
|
|
|
|
if (n != NULL)
|
|
|
|
|
{
|
|
|
|
|
tz_rules[1].name = n;
|
|
|
|
|
if (sscanf(tz, "%[^0-9,+-]", tz_rules[1].name) != 1 ||
|
|
|
|
|
(l = strlen(tz_rules[1].name)) < 3)
|
|
|
|
|
{
|
|
|
|
|
free (n);
|
|
|
|
|
tz_rules[1].name = (char *) "";
|
|
|
|
|
goto done_names; /* Punt on name, set up the offsets. */
|
|
|
|
|
}
|
|
|
|
|
n = realloc ((PTR) tz_rules[1].name, l + 1);
|
|
|
|
|
if (n != NULL)
|
|
|
|
|
tz_rules[1].name = n;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
tz += l;
|
|
|
|
|
|
|
|
|
|
/* Figure out the DST offset from GMT. */
|
|
|
|
|
if (*tz == '-' || *tz == '+')
|
|
|
|
|
tz_rules[1].offset = *tz++ == '-' ? 1L : -1L;
|
|
|
|
|
else
|
|
|
|
|
tz_rules[1].offset = -1L;
|
|
|
|
|
|
|
|
|
|
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
/* Default to one hour later than standard time. */
|
|
|
|
|
tz_rules[1].offset = tz_rules[0].offset + (60 * 60);
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
|
mm = 0;
|
|
|
|
|
case 2:
|
|
|
|
|
ss = 0;
|
|
|
|
|
case 3:
|
|
|
|
|
tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) +
|
1996-02-17 00:15:45 +08:00
|
|
|
|
(min(hh, 23) * (60 * 60)));
|
1995-02-18 09:27:10 +08:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
for (l = 0; l < 3; ++l)
|
|
|
|
|
{
|
|
|
|
|
while (isdigit (*tz))
|
|
|
|
|
++tz;
|
|
|
|
|
if (l < 2 && *tz == ':')
|
|
|
|
|
++tz;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
done_names:
|
|
|
|
|
|
|
|
|
|
if (*tz == '\0' || (tz[0] == ',' && tz[1] == '\0'))
|
|
|
|
|
{
|
|
|
|
|
/* There is no rule. See if there is a default rule file. */
|
|
|
|
|
__tzfile_default (tz_rules[0].name, tz_rules[1].name,
|
|
|
|
|
tz_rules[0].offset, tz_rules[1].offset);
|
|
|
|
|
if (__use_tzfile)
|
|
|
|
|
{
|
|
|
|
|
__tzset_run = 1;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Figure out the standard <-> DST rules. */
|
|
|
|
|
for (whichrule = 0; whichrule < 2; ++whichrule)
|
|
|
|
|
{
|
|
|
|
|
register tz_rule *tzr = &tz_rules[whichrule];
|
1996-02-17 00:15:45 +08:00
|
|
|
|
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (*tz == ',')
|
|
|
|
|
{
|
|
|
|
|
++tz;
|
|
|
|
|
if (*tz == '\0')
|
|
|
|
|
return;
|
|
|
|
|
}
|
1996-02-17 00:15:45 +08:00
|
|
|
|
|
1995-02-18 09:27:10 +08:00
|
|
|
|
/* Get the date of the change. */
|
|
|
|
|
if (*tz == 'J' || isdigit (*tz))
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
tzr->type = *tz == 'J' ? J1 : J0;
|
|
|
|
|
if (tzr->type == J1 && !isdigit (*++tz))
|
|
|
|
|
return;
|
|
|
|
|
tzr->d = (unsigned short int) strtoul (tz, &end, 10);
|
|
|
|
|
if (end == tz || tzr->d > 365)
|
|
|
|
|
return;
|
|
|
|
|
else if (tzr->type == J1 && tzr->d == 0)
|
|
|
|
|
return;
|
|
|
|
|
tz = end;
|
|
|
|
|
}
|
|
|
|
|
else if (*tz == 'M')
|
|
|
|
|
{
|
|
|
|
|
int n;
|
|
|
|
|
tzr->type = M;
|
|
|
|
|
if (sscanf (tz, "M%hu.%hu.%hu%n",
|
|
|
|
|
&tzr->m, &tzr->n, &tzr->d, &n) != 3 ||
|
|
|
|
|
tzr->m < 1 || tzr->m > 12 ||
|
|
|
|
|
tzr->n < 1 || tzr->n > 5 || tzr->d > 6)
|
|
|
|
|
return;
|
|
|
|
|
tz += n;
|
|
|
|
|
}
|
|
|
|
|
else if (*tz == '\0')
|
|
|
|
|
{
|
|
|
|
|
/* United States Federal Law, the equivalent of "M4.1.0,M10.5.0". */
|
|
|
|
|
tzr->type = M;
|
|
|
|
|
if (tzr == &tz_rules[0])
|
|
|
|
|
{
|
|
|
|
|
tzr->m = 4;
|
|
|
|
|
tzr->n = 1;
|
|
|
|
|
tzr->d = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
tzr->m = 10;
|
|
|
|
|
tzr->n = 5;
|
|
|
|
|
tzr->d = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return;
|
1996-02-17 00:15:45 +08:00
|
|
|
|
|
1995-02-18 09:27:10 +08:00
|
|
|
|
if (*tz != '\0' && *tz != '/' && *tz != ',')
|
|
|
|
|
return;
|
|
|
|
|
else if (*tz == '/')
|
|
|
|
|
{
|
|
|
|
|
/* Get the time of day of the change. */
|
|
|
|
|
++tz;
|
|
|
|
|
if (*tz == '\0')
|
|
|
|
|
return;
|
|
|
|
|
switch (sscanf (tz, "%hu:%hu:%hu", &hh, &mm, &ss))
|
|
|
|
|
{
|
|
|
|
|
default:
|
|
|
|
|
hh = 2; /* Default to 2:00 AM. */
|
|
|
|
|
case 1:
|
|
|
|
|
mm = 0;
|
|
|
|
|
case 2:
|
|
|
|
|
ss = 0;
|
|
|
|
|
case 3:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
for (l = 0; l < 3; ++l)
|
|
|
|
|
{
|
|
|
|
|
while (isdigit(*tz))
|
|
|
|
|
++tz;
|
|
|
|
|
if (l < 2 && *tz == ':')
|
|
|
|
|
++tz;
|
|
|
|
|
}
|
|
|
|
|
tzr->secs = (hh * 60 * 60) + (mm * 60) + ss;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
/* Default to 2:00 AM. */
|
|
|
|
|
tzr->secs = 2 * 60 * 60;
|
|
|
|
|
|
|
|
|
|
tzr->computed_for = -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
__tzset_run = 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Maximum length of a timezone name. __tz_compute keeps this up to date
|
|
|
|
|
(never decreasing it) when ! __use_tzfile.
|
|
|
|
|
tzfile.c keeps it up to date when __use_tzfile. */
|
|
|
|
|
long int __tzname_cur_max;
|
|
|
|
|
|
|
|
|
|
long int
|
|
|
|
|
DEFUN_VOID(__tzname_max)
|
|
|
|
|
{
|
|
|
|
|
if (! __tzset_run)
|
|
|
|
|
__tzset ();
|
|
|
|
|
|
|
|
|
|
return __tzname_cur_max;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Figure out the exact time (as a time_t) in YEAR
|
|
|
|
|
when the change described by RULE will occur and
|
|
|
|
|
put it in RULE->change, saving YEAR in RULE->computed_for.
|
|
|
|
|
Return nonzero if successful, zero on failure. */
|
|
|
|
|
static int
|
|
|
|
|
DEFUN(compute_change, (rule, year), tz_rule *rule AND int year)
|
|
|
|
|
{
|
|
|
|
|
register time_t t;
|
|
|
|
|
int y;
|
|
|
|
|
|
|
|
|
|
if (year != -1 && rule->computed_for == year)
|
|
|
|
|
/* Operations on times in 1969 will be slower. Oh well. */
|
|
|
|
|
return 1;
|
1996-02-17 00:15:45 +08:00
|
|
|
|
|
1995-02-18 09:27:10 +08:00
|
|
|
|
/* First set T to January 1st, 0:00:00 GMT in YEAR. */
|
|
|
|
|
t = 0;
|
|
|
|
|
for (y = 1970; y < year; ++y)
|
|
|
|
|
t += SECSPERDAY * (__isleap (y) ? 366 : 365);
|
|
|
|
|
|
|
|
|
|
switch (rule->type)
|
|
|
|
|
{
|
|
|
|
|
case J1:
|
|
|
|
|
/* Jn - Julian day, 1 == January 1, 60 == March 1 even in leap years.
|
|
|
|
|
In non-leap years, or if the day number is 59 or less, just
|
|
|
|
|
add SECSPERDAY times the day number-1 to the time of
|
|
|
|
|
January 1, midnight, to get the day. */
|
|
|
|
|
t += (rule->d - 1) * SECSPERDAY;
|
|
|
|
|
if (rule->d >= 60 && __isleap (year))
|
|
|
|
|
t += SECSPERDAY;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case J0:
|
|
|
|
|
/* n - Day of year.
|
|
|
|
|
Just add SECSPERDAY times the day number to the time of Jan 1st. */
|
|
|
|
|
t += rule->d * SECSPERDAY;
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
case M:
|
|
|
|
|
/* Mm.n.d - Nth "Dth day" of month M. */
|
|
|
|
|
{
|
|
|
|
|
register int i, d, m1, yy0, yy1, yy2, dow;
|
Fri Sep 29 03:43:51 1995 Paul Eggert <eggert@twinsun.com>
Rewrite mktime from scratch for performance, and for correctness
in the presence of leap seconds.
* time/mktime.c (ydhms_tm_diff, not_equal_tm, print_tm, check_result):
New functions.
(LEAP_SECONDS_POSSIBLE, CHAR_BIT, INT_MIN, INT_MAX,
TIME_T_MIN, TIME_T_MAX, TM_YEAR_BASE, EPOCH_YEAR): New macros.
<limits.h>, <stdlib.h>: New #includes.
(main): Support tests with given broken-down value; support benchmarks.
(__mon_lengths, debugging_enabled, printtm, dist_tm, doit,
do_normalization, normalize, BAD_STRUCT_TM, SKIP_VALUE,
<ctype.h>): Remove.
* time/time.h, time/mktime.c (__mktime_internal): New offset arg.
* time/mktime.c (mktime), time/timegm.c (timegm): Use it.
* time/mktime.c (__mon_yday): New variable; replaces `__mon_lengths'.
time/offtime.c (__offtime), time/tzset.c (compute_change): Use it.
* time/offtime.c (__offtime): Remove useless assignment
`tp->tm_isdst = -1'.
* manual/maint.texi: Update credits.
Fri Oct 6 00:28:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/unix/common/readv.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/common/writev.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/sysv/linux/readv.c: File removed.
* sysdeps/unix/sysv/linux/writev.c: File removed.
* sysdeps/unix/configure.in: Check for readv and writev syscalls.
* sysdeps/unix/configure.in: If eval doesn't set $unix_srcname,
set it to $unix_syscall instead of $unix_function.
1995-10-06 12:50:55 +08:00
|
|
|
|
register CONST unsigned short int *myday =
|
|
|
|
|
&__mon_yday[__isleap (year)][rule->m];
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
/* First add SECSPERDAY for each day in months before M. */
|
Fri Sep 29 03:43:51 1995 Paul Eggert <eggert@twinsun.com>
Rewrite mktime from scratch for performance, and for correctness
in the presence of leap seconds.
* time/mktime.c (ydhms_tm_diff, not_equal_tm, print_tm, check_result):
New functions.
(LEAP_SECONDS_POSSIBLE, CHAR_BIT, INT_MIN, INT_MAX,
TIME_T_MIN, TIME_T_MAX, TM_YEAR_BASE, EPOCH_YEAR): New macros.
<limits.h>, <stdlib.h>: New #includes.
(main): Support tests with given broken-down value; support benchmarks.
(__mon_lengths, debugging_enabled, printtm, dist_tm, doit,
do_normalization, normalize, BAD_STRUCT_TM, SKIP_VALUE,
<ctype.h>): Remove.
* time/time.h, time/mktime.c (__mktime_internal): New offset arg.
* time/mktime.c (mktime), time/timegm.c (timegm): Use it.
* time/mktime.c (__mon_yday): New variable; replaces `__mon_lengths'.
time/offtime.c (__offtime), time/tzset.c (compute_change): Use it.
* time/offtime.c (__offtime): Remove useless assignment
`tp->tm_isdst = -1'.
* manual/maint.texi: Update credits.
Fri Oct 6 00:28:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/unix/common/readv.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/common/writev.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/sysv/linux/readv.c: File removed.
* sysdeps/unix/sysv/linux/writev.c: File removed.
* sysdeps/unix/configure.in: Check for readv and writev syscalls.
* sysdeps/unix/configure.in: If eval doesn't set $unix_srcname,
set it to $unix_syscall instead of $unix_function.
1995-10-06 12:50:55 +08:00
|
|
|
|
t += myday[-1] * SECSPERDAY;
|
1995-02-18 09:27:10 +08:00
|
|
|
|
|
|
|
|
|
/* Use Zeller's Congruence to get day-of-week of first day of month. */
|
|
|
|
|
m1 = (rule->m + 9) % 12 + 1;
|
|
|
|
|
yy0 = (rule->m <= 2) ? (year - 1) : year;
|
|
|
|
|
yy1 = yy0 / 100;
|
|
|
|
|
yy2 = yy0 % 100;
|
|
|
|
|
dow = ((26 * m1 - 2) / 10 + 1 + yy2 + yy2 / 4 + yy1 / 4 - 2 * yy1) % 7;
|
|
|
|
|
if (dow < 0)
|
|
|
|
|
dow += 7;
|
|
|
|
|
|
|
|
|
|
/* DOW is the day-of-week of the first day of the month. Get the
|
|
|
|
|
day-of-month (zero-origin) of the first DOW day of the month. */
|
|
|
|
|
d = rule->d - dow;
|
|
|
|
|
if (d < 0)
|
|
|
|
|
d += 7;
|
|
|
|
|
for (i = 1; i < rule->n; ++i)
|
|
|
|
|
{
|
Fri Sep 29 03:43:51 1995 Paul Eggert <eggert@twinsun.com>
Rewrite mktime from scratch for performance, and for correctness
in the presence of leap seconds.
* time/mktime.c (ydhms_tm_diff, not_equal_tm, print_tm, check_result):
New functions.
(LEAP_SECONDS_POSSIBLE, CHAR_BIT, INT_MIN, INT_MAX,
TIME_T_MIN, TIME_T_MAX, TM_YEAR_BASE, EPOCH_YEAR): New macros.
<limits.h>, <stdlib.h>: New #includes.
(main): Support tests with given broken-down value; support benchmarks.
(__mon_lengths, debugging_enabled, printtm, dist_tm, doit,
do_normalization, normalize, BAD_STRUCT_TM, SKIP_VALUE,
<ctype.h>): Remove.
* time/time.h, time/mktime.c (__mktime_internal): New offset arg.
* time/mktime.c (mktime), time/timegm.c (timegm): Use it.
* time/mktime.c (__mon_yday): New variable; replaces `__mon_lengths'.
time/offtime.c (__offtime), time/tzset.c (compute_change): Use it.
* time/offtime.c (__offtime): Remove useless assignment
`tp->tm_isdst = -1'.
* manual/maint.texi: Update credits.
Fri Oct 6 00:28:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/unix/common/readv.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/common/writev.S: Moved to sysdeps/unix/bsd.
* sysdeps/unix/sysv/linux/readv.c: File removed.
* sysdeps/unix/sysv/linux/writev.c: File removed.
* sysdeps/unix/configure.in: Check for readv and writev syscalls.
* sysdeps/unix/configure.in: If eval doesn't set $unix_srcname,
set it to $unix_syscall instead of $unix_function.
1995-10-06 12:50:55 +08:00
|
|
|
|
if (d + 7 >= myday[0] - myday[-1])
|
1995-02-18 09:27:10 +08:00
|
|
|
|
break;
|
|
|
|
|
d += 7;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* D is the day-of-month (zero-origin) of the day we want. */
|
|
|
|
|
t += d * SECSPERDAY;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* T is now the Epoch-relative time of 0:00:00 GMT on the day we want.
|
|
|
|
|
Just add the time of day and local offset from GMT, and we're done. */
|
|
|
|
|
|
|
|
|
|
rule->change = t + rule->offset + rule->secs;
|
|
|
|
|
rule->computed_for = year;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Figure out the correct timezone for *TIMER and TM (which must be the same)
|
|
|
|
|
and set `__tzname', `__timezone', and `__daylight' accordingly.
|
|
|
|
|
Return nonzero on success, zero on failure. */
|
|
|
|
|
int
|
|
|
|
|
DEFUN(__tz_compute, (timer, tm),
|
|
|
|
|
time_t timer AND const struct tm *tm)
|
|
|
|
|
{
|
|
|
|
|
if (! __tzset_run)
|
|
|
|
|
__tzset ();
|
|
|
|
|
|
|
|
|
|
if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) ||
|
|
|
|
|
! compute_change (&tz_rules[1], 1900 + tm->tm_year))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
__daylight = timer >= tz_rules[0].change && timer < tz_rules[1].change;
|
|
|
|
|
__timezone = tz_rules[__daylight ? 1 : 0].offset;
|
|
|
|
|
__tzname[0] = (char *) tz_rules[0].name;
|
|
|
|
|
__tzname[1] = (char *) tz_rules[1].name;
|
|
|
|
|
|
|
|
|
|
{
|
|
|
|
|
/* Keep __tzname_cur_max up to date. */
|
|
|
|
|
size_t len0 = strlen (__tzname[0]);
|
|
|
|
|
size_t len1 = strlen (__tzname[1]);
|
|
|
|
|
if (len0 > __tzname_cur_max)
|
|
|
|
|
__tzname_cur_max = len0;
|
|
|
|
|
if (len1 > __tzname_cur_max)
|
|
|
|
|
__tzname_cur_max = len1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
weak_alias (__tzset, tzset)
|