diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-01-24 02:23:54 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-01-24 02:23:54 +0000 |
| commit | 9d187dd4ad11f857386881db032d7e71ad26f47c (patch) | |
| tree | dacaae8468e5cf69ffda0ef4b299472f429add8a /time/mktime.c | |
| parent | 8d57beeab10d2afd72e2e3bc6b1ad4695b791955 (diff) | |
| download | glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.gz glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.tar.bz2 glibc-9d187dd4ad11f857386881db032d7e71ad26f47c.zip | |
update from main archive 970122cvs/libc-970124
1997-01-23 Paul Eggert <eggert@twinsun.com>
* mktime.c (mktime): Invoke __tzset, not __tzset_internal, to set tz,
so that tzname is set as POSIX requires.
Fri Jan 24 02:49:18 1997 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Declare readdir_r also when __USE_POSIX.
* grp/grp.h: Declare *_r functions also when __USE_POSIX.
* pwd/pwd.h: Likewise.
* time/time.h: Likewise.
* posix/unistd.h: Declare ttyname_r also when __USE_POSIX.
* string/string.h: Declare strtok_r also when __USE_POSIX.
* stdio-common/bug7.c: Use tmpnam to generate names for test files.
* stdio-common/tmpnam.c: Update copyright.
* stdio-common/tmpnam_r.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/sys/kernel_termios.h: Protect
against multiple inclusion. Include <termbits.h>.
* sysdeps/unix/sysv/linux/sys/kernel_termios.h: Likewise.
* sysdeps/unix/sysv/linux/net/if.h: Update according to recent
kernel headers. Patch by Philip Blundell <pjb27@cam.ac.uk>.
Thu Jan 23 17:42:00 1997 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/sparc/clone.S: Correct author attribution.
* sysdeps/unix/sysv/linux/net/if_arp (MAX_ADDR_LEN): Add definition.
Thu Jan 23 14:20:34 1997 Ulrich Drepper <drepper@cygnus.com>
* time/tzfile.c (__tzfile_read): Don't allow arbitrary files to be
read when running a setuid program.
Diffstat (limited to 'time/mktime.c')
| -rw-r--r-- | time/mktime.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/time/mktime.c b/time/mktime.c index 223872f228..fd242b1545 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -85,9 +85,6 @@ ((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] = { @@ -164,8 +161,10 @@ mktime (tp) struct tm *tp; { #ifdef _LIBC - /* Update internal database according to current TZ setting. */ - __tzset_internal (1); + /* POSIX.1 8.1.1 requires that whenever mktime() is called, the + time zone names contained in the external variable `tzname' shall + be set as if the tzset() function had been called. */ + __tzset (); #endif return __mktime_internal (tp, localtime_r, &localtime_offset); |