diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-07-04 10:39:13 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-07-04 10:39:13 +0000 |
commit | ba9234d947af45f15b1e4dece1a9cd447cecc038 (patch) | |
tree | fb6ec34cfaf4d1cef1a689164024fc99f2649206 /time | |
parent | 6ef9f70bdbe3fdb7b16d7c9726e624700d774136 (diff) | |
download | glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.zip glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.gz glibc-ba9234d947af45f15b1e4dece1a9cd447cecc038.tar.bz2 |
Update.
1998-07-04 10:14 Ulrich Drepper <drepper@cygnus.com>
* libio/Makefile (routines): Add iofread_u and iofwrite_u.
* libio/Versions: Add fread_unlocked and fwrite_unlocked.
* Makerules (lib%.so): Adjust ignore pattern for last makefile change.
* time/tzfile.c (decode): Optimize by using bswap_32.
(__tzfile_read): Use _unlocked stream functions. Correct setting of
__tzname array values.
(__tzfile_compute): Correct setting of __tzname array values.
* time/tzset.c (__tzstring): Clean up a bit.
1998-06-29 19:01 Jim Wilson <wilson@cygnus.com>
* posix/regex.c (re_comp): Add cast to char * before gettext calls.
1998-06-30 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* sysdeps/unix/bsd/poll.c (__poll): Allocate fd_set dynamically so
that fd can be bigger than FD_SETSIZE.
1998-07-01 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* nscd/grpcache.c: Include <unistd.h>.
* nscd/pwdcache.c: Likewise.
* nis/nis_modify.c: Include <string.h>.
* nis/nis_add.c: Likewise.
* nis/nis_checkpoint.c: Likewise.
* posix/runptests.c: Likewise.
* sysdeps/generic/statvfs64.c: Likewise.
* sysdeps/generic/fstatvfs64.c: Likewise.
1998-07-03 13:16 Ulrich Drepper <drepper@cygnus.com>
* localedata/charmaps/ISO-8859-9: Change mapping for 0xea, 0xec, 0xef
to match data from Unicode.
Reported by Michael Deutschmann <michael@talamasca.wkpowerlink.com>.
1998-07-03 11:45 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/printf.h: Define printf_function and
printf_arginfo_function types using __PMT not __P.
Reported by Marc Lehmann.
1998-07-02 14:07 -0400 Zack Weinberg <zack@rabi.phys.columbia.edu>
* assert/test-assert.c: New test.
* assert/test-assert-perr.c: New test.
* assert/Makefile (tests): Add test-assert and test-assert-perr.
1998-07-02 13:45 Zack Weinberg <zack@rabi.phys.columbia.edu>
BSD-style SCM_CREDS support.
* sysdeps/unix/sysv/linux/socket.h: Define struct cmsgcred and
SCM_CREDS.
* sysdeps/unix/sysv/linux/sendmsg.c: New file. Convert user
visible SCM_CREDS packet to what the kernel wants.
* sysdeps/unix/sysv/linux/recvmsg.c: New file. Convert
SCM_CREDS packet output by kernel to what users want.
* sysdeps/unix/sysv/linux/sendmsg.S: Moved to...
* sysdeps/unix/sysv/linux/__sendmsg.S: here.
* sysdeps/unix/sysv/linux/recvmsg.S: Moved to...
* sysdeps/unix/sysv/linux/__recvmsg.S: here.
* sysdeps/unix/sysv/linux/Makefile [subdir=socket]: Add
__sendmsg and __recvmsg to sysdep_routines.
* sysdeps/unix/sysv/linux/Dist: Add __sendmsg.S and __recvmsg.S.
1998-07-02 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nscd/grpcache.c: Fix gid pointer handling and debug messages.
* nscd/pwdcache.c: Fix uid pointer handling and debug messages.
* nscd/nscd.c: Check, if pthread_create fails.
1998-07-02 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* stdio-common/test_rdwr.c (main): Use %Zu for size_t in printf
format strings.
* stdio-common/bug1.c (main): Likewise.
* stdio-common/bug5.c (main): Likewise.
* stdio-common/tstgetln.c (main): Likewise.
* elf/sprof.c (generate_call_graph): Likewise.
(load_shobj): Likewise.
* posix/runptests.c (main): Likewise.
* string/tst-strlen.c (main): Likewise.
* sysdeps/libm-ieee754/e_acos.c (__ieee754_acos): Remove unused
variable q3.
* sysdeps/libm-ieee754/e_asin.c (__ieee754_asin): Likewise
1998-07-03 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* wctype/Versions: Add __towctrans.
Noticed by Alex Buell <alex.buell@tahallah.demon.co.uk>.
1998-07-02 Mark Kettenis <kettenis@phys.uva.nl>
* grp/initgroups.c (compat_call): Only call dynamically loaded
functions if they are really present.
1998-07-02 Mark Kettenis <kettenis@phys.uva.nl>
* sysdeps/unix/sysv/linux/bits/sched.h: Move __END_DECLS within
#ifdef that contains __BEGIN_DECLS.
1998-07-02 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* libio/iofwrite.c: Fix return value when size == 0.
1998-07-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* posix/Makefile (distribute): Add annexc.c.
(generated): Add $(objpfx)annexc and $(objpfx)annexc.out.
1998-07-01 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add
bits/pthreadtypes.h here, and do not clobber headers.
* sysdeps/unix/sysv/linux/Dist: Add bits/pthreadtypes.h.
1998-07-03 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* timezone/tst-timezone.c: Add tests for tzname variable.
1998-07-03 12:17 Zack Weinberg <zack@rabi.phys.columbia.edu>
* Makefile [versioning=yes]: Build the mapfiles with a pattern
rule that lists all of them as targets.
(sysd-versions): Depend only on Versions.def. Write a Makefile
fragment that defines $(vers-libs) based on contents of that file;
then include it.
(lib-noranlib): Depend on lib-mapfiles not sysd-versions.
(lib-mapfiles): New target, depends on sysd-versions and $(vers-libs).
Predicate all this on avoid-generated unset as well as versioning.
1998-07-03 14:35 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
Diffstat (limited to 'time')
-rw-r--r-- | time/tzfile.c | 47 | ||||
-rw-r--r-- | time/tzset.c | 5 |
2 files changed, 27 insertions, 25 deletions
diff --git a/time/tzfile.c b/time/tzfile.c index 1d51a69..eca09e2 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -60,6 +60,7 @@ static size_t num_leaps; static struct leap *leaps = NULL; #include <endian.h> +#include <byteswap.h> /* Decode the four bytes at PTR as a signed integer in network byte order. */ static inline int @@ -67,6 +68,8 @@ decode (const void *ptr) { if ((BYTE_ORDER == BIG_ENDIAN) && sizeof (int) == 4) return *(const int *) ptr; + else if (BYTE_ORDER == LITTLE_ENDIAN && sizeof (int) == 4) + return bswap_32 (*(const int *) ptr); else { const unsigned char *p = ptr; @@ -157,7 +160,7 @@ __tzfile_read (const char *file) if (f == NULL) return; - if (fread ((void *) &tzhead, sizeof (tzhead), 1, f) != 1) + if (fread_unlocked ((void *) &tzhead, sizeof (tzhead), 1, f) != 1) goto lose; num_transitions = (size_t) decode (tzhead.tzh_timecnt); @@ -198,8 +201,8 @@ __tzfile_read (const char *file) if (sizeof (time_t) < 4) abort (); - if (fread(transitions, 4, num_transitions, f) != num_transitions || - fread(type_idxs, 1, num_transitions, f) != num_transitions) + if (fread_unlocked (transitions, 4, num_transitions, f) != num_transitions + || fread_unlocked (type_idxs, 1, num_transitions, f) != num_transitions) goto lose; /* Check for bogus indices in the data file, so we can hereafter @@ -222,32 +225,32 @@ __tzfile_read (const char *file) for (i = 0; i < num_types; ++i) { unsigned char x[4]; - if (fread (x, 1, 4, f) != 4 || - fread (&types[i].isdst, 1, 1, f) != 1 || - fread (&types[i].idx, 1, 1, f) != 1) + if (fread_unlocked (x, 1, 4, f) != 4 + || fread_unlocked (&types[i].isdst, 1, 1, f) != 1 + || fread_unlocked (&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); } - if (fread (zone_names, 1, chars, f) != chars) + if (fread_unlocked (zone_names, 1, chars, f) != chars) goto lose; for (i = 0; i < num_leaps; ++i) { unsigned char x[4]; - if (fread (x, 1, sizeof (x), f) != sizeof (x)) + if (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x)) goto lose; leaps[i].transition = (time_t) decode (x); - if (fread (x, 1, sizeof (x), f) != sizeof (x)) + if (fread_unlocked (x, 1, sizeof (x), f) != sizeof (x)) goto lose; leaps[i].change = (long int) decode (x); } for (i = 0; i < num_isstd; ++i) { - int c = getc (f); + int c = getc_unlocked (f); if (c == EOF) goto lose; types[i].isstd = c != 0; @@ -257,7 +260,7 @@ __tzfile_read (const char *file) for (i = 0; i < num_isgmt; ++i) { - int c = getc (f); + int c = getc_unlocked (f); if (c == EOF) goto lose; types[i].isgmt = c != 0; @@ -271,8 +274,7 @@ __tzfile_read (const char *file) We choose the offsets in the types of each flavor that are transitioned to earliest in time. */ __tzname[1] = NULL; - for (i = 0; i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]); - ++i) + for (i = 0; i < num_types; ++i) __tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]); if (__tzname[1] == NULL) __tzname[1] = __tzname[0]; @@ -296,8 +298,8 @@ __tzfile_read (const char *file) __use_tzfile = 1; return; - lose:; - fclose(f); + lose: + fclose (f); } /* The user specified a hand-made timezone, but not its DST rules. @@ -425,10 +427,8 @@ __tzfile_compute (time_t timer, int use_localtime, __daylight = rule_stdoff != rule_dstoff; __timezone = -rule_stdoff; __tzname[1] = NULL; - for (i = 0; - i < num_types && i < sizeof (__tzname) / sizeof (__tzname[0]); - ++i) - __tzname[types[i].isdst] = &zone_names[types[i].idx]; + for (i = 0; i < num_types; ++i) + __tzname[types[i].isdst] = __tzstring (&zone_names[types[i].idx]); if (__tzname[1] == NULL) /* There is no daylight saving time. */ __tzname[1] = __tzname[0]; @@ -455,9 +455,9 @@ __tzfile_compute (time_t timer, int use_localtime, leaps[i].change > leaps[i - 1].change)) { *leap_hit = 1; - while (i > 0 && - leaps[i].transition == leaps[i - 1].transition + 1 && - leaps[i].change == leaps[i - 1].change + 1) + while (i > 0 + && leaps[i].transition == leaps[i - 1].transition + 1 + && leaps[i].change == leaps[i - 1].change + 1) { ++*leap_hit; --i; @@ -483,5 +483,6 @@ compute_tzname_max (size_t chars) ++p; if ((size_t) (p - start) > __tzname_cur_max) __tzname_cur_max = p - start; - } while (++p < &zone_names[chars]); + } + while (++p < &zone_names[chars]); } diff --git a/time/tzset.c b/time/tzset.c index 4b8fa41..9c8e5d7 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -115,7 +115,7 @@ char * __tzstring (string) const char *string; { - struct tzstring_head *h = &tzstring_list.head; + struct tzstring_head *h; size_t needed; char *p; @@ -139,7 +139,8 @@ __tzstring (string) size_t buffer_size = tzstring_last_buffer_size; while ((buffer_size *= 2) < needed) continue; - if (! (h = h->next = malloc (sizeof *h + buffer_size))) + h = malloc (sizeof *h + buffer_size); + if (h == NULL) return NULL; h->next = NULL; tzstring_last_buffer_size = buffer_size; |