diff options
author | Ulrich Drepper <drepper@redhat.com> | 1996-08-07 23:50:59 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1996-08-07 23:50:59 +0000 |
commit | 233963756b2ef272f8876afec2a2bb629b425e0c (patch) | |
tree | 69b27a7182cd444f37d08d08a9f64f957cc64ef9 /time | |
parent | Another correction. (diff) | |
download | glibc-233963756b2ef272f8876afec2a2bb629b425e0c.tar.gz glibc-233963756b2ef272f8876afec2a2bb629b425e0c.tar.bz2 glibc-233963756b2ef272f8876afec2a2bb629b425e0c.zip |
Thu Aug 8 01:41:43 1996 Ulrich Drepper <drepper@cygnus.com>
* elf/Makefile: Undo change of Tue Aug 6 14:27:11 1996.
* elf/dl-support: Add definition of `_dl_sysdep_read_whole_file'.
Thu Aug 8 01:15:59 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/i386/fpu_control.h (_FPU_DEFAULT, _FPU_IEEE): Set
to 0x137f to allow long double operations.
Sun Aug 4 13:12:05 1996 Richard Henderson <rth@tamu.edu>
Bug Fixes:
* nss/nsswitch.c (_res): Remove redundant variable definition.
The real one is in resolve/res_init.c, and having both prevents
using -fno-common when building the shared library.
* sunrpc/rpc_prot.c (_null_auth): Same. Original is in rpc_common.c.
* sysdeps/unix/sysv/linux/alpha/brk.S: When PIC, define __curbrk as
a .bss object not a COMMON symbol.
* sysdeps/alpha/bsd-_setjmp.S, sysdeps/alpha/bsd-setjmp.S: Must load
$gp before referencing __sigsetjmp symbol. Retain LITUSE for same.
Optimizations:
* sysdeps/alpha/strlen.S: Rearrange first-word setup and thense the
main loop for better dual-issue on EV5. Rearrange binary search to
pipeline better and trim one instruction.
Cosmetic Changes:
* time/localtime.c (localtime_r): Move lock declaration back next to
the comment where it was before the 960724 change.
* INSTALL, manual/maint.texi: alpha-gnu-linux -> alpha-ANYTHING-linux.
The second word is supposed to be the hardware manufacturer.
* sysdeps/alpha/_mcount.S: Retain LITUSE for __mcount.
* sysdeps/alpha/setjmp.S: Retain LITUSE for __sigsetjmp_aux.
* sysdeps/alpha/divrem.h: More local labels, retain LITUSE for _mcount.
* sysdeps/alpha/alphaev5/add_n.S, sysdeps/alpha/alphaev5/lshift.S,
sysdeps/alpha/alphaev5/rshift.S, sysdeps/alpha/alphaev5/sub_n.S:
Same cleanups as with EV4 GMP stuff.
Tue Jul 25 03:30:56 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/unix/sysv/linux/Makefile [misc] (sysdep_routines): Add clone.
* sysdeps/unix/sysv/linux/alpha/clone.S: New file.
* sysdeps/unix/sysv/linux/i386/clone.S: New file.
Sun Aug 4 00:12:41 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/gnu/types.h: Declare __fd_mask as
`unsigned long'.
* misc/sys/select.h: Declare fd_mask as alias of __fd_mask.
Sat Aug 3 16:20:02 1996 David Mosberger-Tang <davidm@azstarnet.com>
* sysdeps/unix/sysv/linux/alpha/ioperm.c (platform): Add entry for
Mikasa.
* socket/sys/socket.h (send, __send, sendto): Declare buffer
pointer as __const.
* string/tester.c (main): Test stpncpy.
* sysdeps/generic/stpncpy.c (__stpncpy): Fix so it works without
segfault when called with an N that is not a multiple of four and
src[N-1]=='\0'.
* misc/syslog.c (LogType): New variable.
(openlog): If connect() with SOCK_DGRAM fails with EPROTOTYPE,
try again with SOCK_STREAM (the Linux syslogd uses a socket of the
latter type).
(vsyslog): When LogType==SOCK_STREAM, also send ASCII NUL
terminator as a record-delimiter. If __send(LogFile) fails,
call closelog() so logfile gets re-opened next time.
Wed Aug 7 15:15:14 1996 Ulrich Drepper <drepper@cygnus.com>
* elf/dl-open (_dl_open): Add cast to avoid warning.
* manual/memory.texi: Improve some examples to give readers better
advice: Use `stpcpy' instead of `strcat' if possible.
* manual/string.texi: Document `strtok_r' and `strtok'.
* sunrpc/Makefile: Move `+gccwarn' definition before inclusion
of Makeconfig.
[$(cross-compiling)=no]: Change test before making librpcsvc
to this from $(cross-compile).
Reported by Andreas Schwab.
Tue Aug 6 14:27:11 1996 Ulrich Drepper <drepper@cygnus.com>
* elf/Makefile (routines): Move dl-sysdep to here...
(rtld-routines): ...from here. This should make static linking
work again.
* locale/setlocale.c: Add local variable `lock' and add code to
`setlocale' to avoid simultaneous changing of global data.
* catgets/catgets.c (catopen): Use `__strdup' instead of `strdup'.
* catgets/open_catalog (__open_catalog): Use `__stpcpy', `__open',
`__fstat', `__read', `__mmap', `__munmap' and `__close' instead
of unprotected names.
Diffstat (limited to 'time')
-rw-r--r-- | time/Makefile | 6 | ||||
-rw-r--r-- | time/asctime.c | 23 | ||||
-rw-r--r-- | time/ctime_r.c | 30 | ||||
-rw-r--r-- | time/time.h | 14 |
4 files changed, 61 insertions, 12 deletions
diff --git a/time/Makefile b/time/Makefile index d77c6c5f2d..84e52306d7 100644 --- a/time/Makefile +++ b/time/Makefile @@ -25,9 +25,9 @@ headers := time.h sys/time.h sys/timeb.h timebits.h distribute := tzfile.h private.h scheck.c ialloc.c yearistype extra-objs = scheck.o ialloc.o $(tzfiles:%=z.%) -routines := offtime asctime clock ctime difftime gmtime \ - localtime mktime strftime time tzset tzfile \ - gettimeofday settimeofday adjtime \ +routines := offtime asctime clock ctime ctime_r difftime \ + gmtime localtime mktime strftime time tzset \ + tzfile gettimeofday settimeofday adjtime \ getitimer setitimer \ stime dysize timegm ftime \ strptime diff --git a/time/asctime.c b/time/asctime.c index 644df3277f..bb20a3aedc 100644 --- a/time/asctime.c +++ b/time/asctime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1993, 1995, 1996 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 @@ -16,28 +16,34 @@ 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 "../locale/localeinfo.h" #include <errno.h> #include <stdio.h> #include <time.h> +static const char format[] = "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n"; +static char result[ 3+1+ 3+1+20+1+20+1+20+1+20+1+20+1 + 1]; + /* Returns a string of the form "Day Mon dd hh:mm:ss yyyy\n" which is the representation of TP in that form. */ char * -DEFUN(asctime, (tp), CONST struct tm *tp) +asctime (const struct tm *tp) { - static const char format[] = "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n"; - static char result[ 3+1+ 3+1+20+1+20+1+20+1+20+1+20+1 + 1]; + return __asctime_r (tp, result); +} + +char * +__asctime_r (const struct tm *tp, char *buf) +{ if (tp == NULL) { errno = EINVAL; return NULL; } - - if (sprintf (result, format, + + if (sprintf (buf, format, (tp->tm_wday < 0 || tp->tm_wday >= 7 ? "???" : _NL_CURRENT (LC_TIME, ABDAY_1 + tp->tm_wday)), (tp->tm_mon < 0 || tp->tm_mon >= 12 ? @@ -46,5 +52,6 @@ DEFUN(asctime, (tp), CONST struct tm *tp) tp->tm_sec, 1900 + tp->tm_year) < 0) return NULL; - return result; + return buf; } +weak_alias (__asctime_r, asctime_r) diff --git a/time/ctime_r.c b/time/ctime_r.c new file mode 100644 index 0000000000..e1981892dd --- /dev/null +++ b/time/ctime_r.c @@ -0,0 +1,30 @@ +/* ctime_r - return in BUF representation of time T in form of asctime +Copyright (C) 1996 Free Software Foundation, Inc. +This file is part of the GNU C Library. +Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. + +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., 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#include <time.h> + +/* Return a string as returned by asctime which is the representation + of *T in that form. Reentrant version. */ +char * +ctime_r (const time_t *t, char *buf) +{ + struct tm tm; + return asctime_r (localtime_r (t, &tm), buf); +} diff --git a/time/time.h b/time/time.h index 62e098ee46..6b955f1986 100644 --- a/time/time.h +++ b/time/time.h @@ -177,7 +177,7 @@ extern struct tm *__localtime_r __P ((__const time_t *__timer, struct tm *__tp)); extern struct tm *localtime_r __P ((__const time_t *__timer, struct tm *__tp)); -#endif +#endif /* reentrant */ /* Compute the `struct tm' representation of *T, offset OFFSET seconds east of UTC, @@ -193,6 +193,18 @@ extern char *asctime __P ((__const struct tm *__tp)); /* Equivalent to `asctime(localtime(timer))'. */ extern char *ctime __P ((__const time_t *__timer)); +#ifdef __USE_REENTRANT +/* Reentrant versions of the above functions. */ + +/* Return in BUF a string of the form "Day Mon dd hh:mm:ss yyyy\n" + that is the representation of TP in this format. */ +extern char *__asctime_r __P ((__const struct tm *__tp, char *__buf)); +extern char *asctime_r __P ((__const struct tm *__tp, char *__buf)); + +/* Equivalent to `asctime_r(localtime_r(timer, *TMP*), buf)'. */ +extern char *ctime_r __P ((__const time_t *__timer, char *__buf)); +#endif /* reentrant */ + /* Defined in localtime.c. */ extern char *__tzname[2]; /* Current timezone names. */ |