diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-12-15 02:15:29 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-15 02:15:29 +0000 |
commit | 68dbb3a69e78e24a778c6602c8cc91d715839d08 (patch) | |
tree | 2201a2cfe38cf2817b6dfd37415dac21c7a41b2f /time | |
parent | f8b87ef0d47ea0db7304a9c59d5479aebdaea347 (diff) | |
download | glibc-68dbb3a69e78e24a778c6602c8cc91d715839d08.zip glibc-68dbb3a69e78e24a778c6602c8cc91d715839d08.tar.gz glibc-68dbb3a69e78e24a778c6602c8cc91d715839d08.tar.bz2 |
update from main archive 961214cvs/libc-961215
Sun Dec 15 01:53:20 1996 Ulrich Drepper <drepper@cygnus.com>
* Makefile (subdirs): Change crypt to md5-crypt.
* crypt/Makefile, crypt/md5-crypt.c, crypt/md5.c, crypt/md5.h,
crypt/md5c-test.c, crypt/md5test.c: Move to new directory
md5-crypt.
* sysdeps/unix/sysv/linux/configure.in: Refer to linuxthreads and
crypt instead of LinuxThreads and des-crypt.
* Makefile (subdirs): Add nss back.
* sysdeps/unix/inet/Subdirs: Move nis to end of file to fulfill
dependencies.
* libio/iofclose.c: Implement fclose(NULL) as closing all streams.
* stdio-common/Makefile (routines): Add fcloseall.
* stdio-common/fcloseall.c: New file.
* sysdeps/generic/abort.c: Make implementation POSIX.1 compatible.
* sysdeps/mach/libc-lock.h: Add definition of __libc_lock_trylock.
* sysdeps/stub/libc-lock.h: Define __libc_lock_trylock to always
return 0.
* stdio-common/printf.h: Define MIN and MAX only if not already
defined.
* stdio-common/vfprintf.c: Set errno to EBADF if stream does not
allow writing. Required by POSIX.1.
* libio/libioP.h (CHECK_FILE): Use MAYBE_SET_EINVAL instead of
assignment.
* interp.c: Update copyright.
* libio/clearerr.c: Likewise.
* libio/ioseekoff.c: Likewise.
* libio/ioseekpos.c: Likewise.
* stdio/fclose.c: Likewise.
* stdio/fflus.c: Likewise.
* libio/libio.h [!_IO_MTSAFE_IO]: Define _IO_cleanup_region_start
and _IO_cleanup_region_end as empty.
* libio/fgetc.c: Use _IO_cleanup_region_start and
_IO_cleanup_region_end instead of __libc_cleanup_region_start and
__libc_cleanup_region_end.
* libio/fputc.c: Likewise.
* libio/freopen.c: Likewise.
* libio/fseek.c: Likewise.
* libio/getc.c: Likewise.
* libio/getchar.c: Likewise.
* libio/iofclose.c: Likewise.
* libio/iofflush.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgets.c: Likewise.
* libio/iofputs.c: Likewise.
* libio/iofread.c: Likewise.
* libio/iofsetpos.c: Likewise.
* libio/ioftell.c: Likewise.
* libio/iofwrite.c: Likewise.
* libio/iogetdelim.c: Likewise.
* libio/iogets.c: Likewise.
* libio/ioputs.c: Likewise.
* libio/iosetbuffer.c: Likewise.
* libio/iosetvbuf.c: Likewise.
* libio/ioungetc.c: Likewise.
* libio/iovspintf.c: Use cleanup handler to make sure no dangling
locks can stay over.
* libio/iovsscanf.c: Likewise.
* libio/genops.c: Use _IO_lock_init_recursive and _IO_lock_fini
instead of __libc_lock_init_recursive and __libc_lock_fini.
* libio/filedoalloc.c: Only use __isatty when compiling GNU libc.
Otherwise use isatty.
* libio/fileops.c: Likewise for __open and open.
* login/utmp_file.c (getutent_r_file): Use fcntl instead of
flock.
* nis/ypclnt.h: Add more casts to prevent warnings.
* nss/Makefile (services): Remove dns.
(libnss_dns, libnss_dns-inhibit-o): Remove definition.
($(objpfx)libnss_dns.so): Removed.
* nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Moved to...
* resolv/nss_dns: ...here.
* resolv/Makefile (extra-libs): Add libnss_dns.
(libnss_dns-routines, libnss_dns-inhibit-o): Define as in
nss/Makefile.
* nss/XXX-lookup.c: Call __nss_database_lookup with new argument
specifying alternate name for entry in /etc/nsswitch.conf
* nss/nsswitch.c: If no entry with primary name is found in
/etc/nsswitch.conf try alternate name if given.
* nss/nsswitch.h: Add new parameter in prototype for
__nss_database_lookup.
* nss/spwd-lookup.c: Provide alternative entry name to look for.
This makes our NSS compatible with Solaris' nsswitch.conf files.
* string/tst-strlen.c: Change all counting variables to type size_t
to prevent warnings.
* sysdeps/posix/fpathconf.c: Update copyright.
* sysdeps/posix/pathconf.c: Don't call fpathconf to do the work.
Opening the file at this path may fail if it is a FIFO or pipe.
These changes make the time implementation POSIX.1 compliant.
* time/localtime.c (__localtime_r): Always call __tzset not only
if __tzset_run is zero.
* time/strftime.c: Add definition of memset_space to help to
reduce for systems which have memset.
(strftime): Don't use tm_zone member of argument for zone name.
Instead always use tzname[].
Call tzset() as required by POSIX.1 before any action.
* time/tzset.c (tzset): Set tzname[] as required by POSIX.1.
Remove global variable __tzset_run. __tzset is now called always
when a dependent function is used.
(__tzset): Caching happens based on the contents of the
environment variable TZ.
Fri Dec 13 01:06:52 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/paths.h: Add _PATH_KLOG.
Thu Dec 12 09:16:35 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* rellns-sh: Correctly handle a relative source file name.
Wed Dec 11 19:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* login/utmp_file.c (setutent_file): Seek back to beginning of the
file if resetting.
Thu Dec 12 16:39:12 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu>
* hurd/hurdinit.c (map0): Delete function. Don't do this on
_hurd_preinit_hook.
* hurd/hurdstartup.c (_hurd_startup): Map page zero redzone here.
Diffstat (limited to 'time')
-rw-r--r-- | time/localtime.c | 5 | ||||
-rw-r--r-- | time/strftime.c | 54 | ||||
-rw-r--r-- | time/tzset.c | 65 |
3 files changed, 85 insertions, 39 deletions
diff --git a/time/localtime.c b/time/localtime.c index ce243e6..833d708 100644 --- a/time/localtime.c +++ b/time/localtime.c @@ -41,7 +41,7 @@ __localtime_r (timer, tp) and in tzfile.c; the internal functions do no locking themselves. This lock is only taken here and in `tzset'. */ __libc_lock_define (extern, __tzset_lock) - extern int __tzset_run, __use_tzfile; + extern int __use_tzfile; extern int __tz_compute __P ((time_t timer, struct tm *tp)); extern int __tzfile_compute __P ((time_t timer, long int *leap_correct, int *leap_hit)); @@ -57,8 +57,7 @@ __localtime_r (timer, tp) __libc_lock_lock (__tzset_lock); /* Make sure the database is initialized. */ - if (! __tzset_run) - __tzset (); + __tzset (); if (__use_tzfile) { diff --git a/time/strftime.c b/time/strftime.c index 092739d..ddea024 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -27,6 +27,8 @@ # define HAVE_STRUCT_ERA_ENTRY 1 # define HAVE_TM_GMTOFF 1 # define HAVE_TM_ZONE 1 +# define HAVE_TZNAME 1 +# define HAVE_TZSET 1 # define MULTIBYTE_IS_FORMAT_SAFE 1 # define STDC_HEADERS 1 # include <ansidecl.h> @@ -79,7 +81,7 @@ extern char *tzname[]; # include <stdlib.h> # include <string.h> #else -# define memcpy(d, s, n) bcopy (s, d, n) +# define memcpy(d, s, n) bcopy ((s), (d), (n)) #endif #ifndef __P @@ -125,6 +127,7 @@ extern char *tzname[]; #ifdef _LIBC # define gmtime_r __gmtime_r # define localtime_r __localtime_r +extern int __tz_compute __P ((time_t timer, const struct tm *tm)); #else # if ! HAVE_LOCALTIME_R # if ! HAVE_TM_GMTOFF @@ -162,7 +165,28 @@ localtime_r (t, tp) #endif /* ! defined (_LIBC) */ +#if !defined (memset) && !defined (HAVE_MEMSET) && !defined (_LIBC) +/* Some systems lack the `memset' function and we don't want to + introduce additional dependencies. */ static const char spaces[16] = " "; + +# define memset_space(P, Len) \ + do { \ + int _len = (Len); \ + \ + do \ + { \ + int _this = _len > 16 ? 16 : _len; \ + memcpy ((P), spaces, _this); \ + (P) += _this; \ + _len -= _this; \ + } \ + while (_len > 0); \ + } while (0) +#else +# define memset_space(P, Len) memset ((P), ' ', (Len)) +#endif + #define add(n, f) \ do \ { \ @@ -174,13 +198,8 @@ static const char spaces[16] = " "; else \ if (p) \ { \ - while (_delta > 0) \ - { \ - int _this = _delta > 16 ? 16 : _delta; \ - memcpy (p, spaces, _this); \ - p += _this; \ - _delta -= _this; \ - } \ + if (_delta > 0) \ + memset_space (p, _delta); \ f; \ p += _n; \ } \ @@ -325,11 +344,26 @@ strftime (s, maxsize, format, tp) char *p = s; const char *f; - zone = 0; -#if HAVE_TM_ZONE + zone = NULL; +#if !defined _LIBC && HAVE_TM_ZONE + /* XXX We have some problems here. First, the string pointed to by + tm_zone is dynamically allocated while loading the zone data. But + when another zone is loaded since the information in TP were + computed this would be a stale pointer. + The second problem is the POSIX test suite which assumes setting + the environment variable TZ to a new value before calling strftime() + will influence the result (the %Z format) even if the information in + TP is computed with a totally different time zone. --drepper@gnu */ zone = (const char *) tp->tm_zone; #endif #if HAVE_TZNAME + /* POSIX.1 8.1.1 requires that whenever strftime() is called, the + time zone names contained in the external variable `tzname' shall + be set as if the tzset() function had been called. */ +# if HAVE_TZSET + tzset (); +# endif + if (!(zone && *zone) && tp->tm_isdst >= 0) zone = tzname[tp->tm_isdst]; #endif diff --git a/time/tzset.c b/time/tzset.c index 954cec2..6a9ebe1 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -74,7 +74,7 @@ static tz_rule tz_rules[2]; static int compute_change __P ((tz_rule *rule, int year)); -int __tzset_run = 0; +static char *old_tz = NULL; /* Interpret the TZ envariable. */ void @@ -85,6 +85,20 @@ __tzset () unsigned short int hh, mm, ss; unsigned short int whichrule; + /* Examine the TZ environment variable. */ + tz = getenv ("TZ"); + + /* 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 == ':') + ++tz; + + /* Check whether the value changes since the last run. */ + if (old_tz != NULL && tz != NULL && strcmp (tz, old_tz) == 0) + /* No change, simply return. */ + return; + /* Free old storage. */ if (tz_rules[0].name != NULL && *tz_rules[0].name != '\0') { @@ -98,22 +112,15 @@ __tzset () tz_rules[1].name = NULL; } - /* Examine the TZ environment variable. */ - tz = getenv ("TZ"); - - /* 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 == ':') - ++tz; + /* Save the value of `tz'. */ + if (old_tz != NULL) + free (old_tz); + old_tz = tz ? __strdup (tz) : NULL; /* Try to read a data file. */ __tzfile_read (tz); if (__use_tzfile) - { - __tzset_run = 1; - return; - } + return; /* No data file found. Default to UTC if nothing specified. */ @@ -121,10 +128,10 @@ __tzset () { static const char UTC[] = "UTC"; size_t len = sizeof UTC; - tz_rules[0].name = (char *) malloc(len); + tz_rules[0].name = (char *) malloc (len); if (tz_rules[0].name == NULL) return; - tz_rules[1].name = (char *) malloc(len); + tz_rules[1].name = (char *) malloc (len); if (tz_rules[1].name == NULL) return; memcpy ((void *) tz_rules[0].name, UTC, len); @@ -136,7 +143,6 @@ __tzset () 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; } @@ -147,8 +153,12 @@ __tzset () /* 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; + { + /* Clear the old tz name so we will try again. */ + free (old_tz); + old_tz = NULL; + return; + } if (sscanf(tz, "%[^0-9,+-]", tz_rules[0].name) != 1 || (l = strlen(tz_rules[0].name)) < 3) @@ -257,7 +267,8 @@ __tzset () tz_rules[0].offset, tz_rules[1].offset); if (__use_tzfile) { - __tzset_run = 1; + free (old_tz); + old_tz = NULL; return; } } @@ -353,8 +364,6 @@ __tzset () tzr->computed_for = -1; } - - __tzset_run = 1; } /* Maximum length of a timezone name. __tz_compute keeps this up to date @@ -365,8 +374,7 @@ size_t __tzname_cur_max; long int __tzname_max () { - if (! __tzset_run) - __tzset (); + __tzset (); return __tzname_cur_max; } @@ -450,7 +458,7 @@ compute_change (rule, year) /* 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->change = t - rule->offset + rule->secs; rule->computed_for = year; return 1; } @@ -464,8 +472,7 @@ __tz_compute (timer, tm) time_t timer; const struct tm *tm; { - if (! __tzset_run) - __tzset (); + __tzset (); if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) || ! compute_change (&tz_rules[1], 1900 + tm->tm_year)) @@ -504,6 +511,12 @@ weak_function tzset (void) { __libc_lock_lock (__tzset_lock); + __tzset (); + + /* Set `tzname'. */ + __tzname[0] = (char *) tz_rules[0].name; + __tzname[1] = (char *) tz_rules[1].name; + __libc_lock_unlock (__tzset_lock); } |