aboutsummaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1996-12-18 03:23:47 +0000
committerUlrich Drepper <drepper@redhat.com>1996-12-18 03:23:47 +0000
commit10dc2a90b7f86d9bc1be9d1b9305a781882f7ac5 (patch)
tree3ce13e279554e92072a44b5d786b9959b26c11e2 /time
parentcc2af7ea0373947a018e40e74f6f0e712ed555ee (diff)
downloadglibc-10dc2a90b7f86d9bc1be9d1b9305a781882f7ac5.zip
glibc-10dc2a90b7f86d9bc1be9d1b9305a781882f7ac5.tar.gz
glibc-10dc2a90b7f86d9bc1be9d1b9305a781882f7ac5.tar.bz2
update from main archive 961217cvs/libc-961219cvs/libc-961218
Wed Dec 18 03:31:58 1996 Ulrich Drepper <drepper@cygnus.com> * dirent/scandir.c: Undo change from Mon Dec 2 15:32:15 1996. The stream is private and usages outside glibc don't care about reentrancy. * io/fts.c: Likewise. * io/ftw.c: Likewise. * sysdeps/posix/getcwd.c: Likewise. * sysdeps/posix/ttyname.c: Likewise. * sysdeps/posix/ttyname_r.c: Likewise. * sysdeps/posix/glob.c: Likewise. * libio/iovsprintf.c: Add cast to prevent warning. * libio/iovsscanf.c: Likewise. * libio/libioP.h: Define mmap to __mmap and munmap to __munmap to keep namespace clean. * new-malloc/malloc.c: Update to last version from Wolfram Gloger. Add hooks and check functions from old GNU malloc. * new-malloc/malloc.h: Likewise. * nis/ypclnt.c: Remove prototype for xdr_free. * snrpc/rpc/xdr.h: Add prototype for xdr_free. * manual/nss.texi: Correct description of default values and don't meantion NSS as an add-on. * nss/grp-lookup.c: Provide default value as "compat [NOTFOUND=return] files". * nss/pwd-lookup.c: Likewise. * nss/spwd-lookup.c: Likewise. * nss/network-lookup.c: Correct default to "dns [!UNAVAIL=return] files". * nss/nsswitch.c: Change default-default value to "nis [NOTFOUND=return] files" since compat is only available for group, passwd, and shadow. * stdlib/on_exit.c (on_exit): Rename to __on_exit and make old name a weak alias. * stdlib/stdlib.h: Add prototype for __on_exit. * sysdeps/unix/sysv/linux/schedbits.h: Add prototype for __clone. * time/Makefile: Undo change from Sun Dec 8 06:56:49 1996. The new malloc now has mcheck. * time/ap.c: Likewise. * time/tzset.c (__tzset): Rename to __tzset_internal. (tzset): Rename to __tzset. Make tzset a weak alias for __tzset. * time/localtime.c: Use __tzset_internal not __tzset. * time/strftime.c [_LIBC]: Define tzname as __tzname and tzset as __tzset to prevent namespace pollution. * wctype/iswctype.h (icwctype): Rename to __iswctype. Make iswctype a weak alias of __iswctype. * wctype/wctype.h: Add prototype for __iswctype. (iswalnum, iswalpha, iswcntrl, iswdigit, iswlower, iswgraph, iswprint, iswpunct, iswspace, iswupper, iswxdigit, iswblank): Use __iswctype for the test, not iswctype. 1996-12-16 Paul Eggert <eggert@twinsun.com> * hurd/hurd/sigpreempt.h (struct hurd_signal_preemptor.preemptor, _hurdsig_preemptors), hurd/hurd/signal.h (struct hurd_sigstate.preemptors), hurd/hurdfault.c, hurd/hurdfault.h (_hurdsig_fault_preemptor), hurd/hurdsig.c (_hurdsig_preempters): Renamed to fix spelling from `preempter' to `preemptor'. All uses changed. 1996-12-15 Paul Eggert <eggert@twinsun.com> * ctime.c (ctime): Return asctime (localtime (t)), as the C standard requires. Tue Dec 17 02:05:48 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * sysdeps/mach/libc-lock.h (__libc_lock_trylock): Invert return value because Mach/cthreads uses the opposite convention from Posix/glibc. Mon Dec 16 22:41:01 1996 Ulrich Drepper <drepper@cygnus.com> * stdio-common/fcloseall.c: Correct test of already_called. Reported by Thomas Bushnell, n/BSG. Mon Dec 16 14:52:07 1996 Thomas Bushnell, n/BSG <thomas@gnu.ai.mit.edu> * mach/lock-intern.h (__mutex_try_lock): New function. Sun Dec 15 16:33:44 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * termios/sys/ttydefaults.h (TTYDEF_OFLAG): Only use OXTABS if defined, else XTABS. (CEOL, CSTATUS): Use _POSIX_VDISABLE if defined. Sun Dec 15 11:56:19 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysv/linux/m68k/mremap.S: New file. * sysdeps/unix/sysv/linux/m68k/Dist: Distribute it. * sysdeps/unix/sysv/linux/m68k/Makefile (sysdep_routines): Add mremap.
Diffstat (limited to 'time')
-rw-r--r--time/Makefile4
-rw-r--r--time/ap.c2
-rw-r--r--time/ctime.c9
-rw-r--r--time/localtime.c34
-rw-r--r--time/strftime.c2
-rw-r--r--time/tzset.c14
6 files changed, 30 insertions, 35 deletions
diff --git a/time/Makefile b/time/Makefile
index e55b664..966d9f2 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -146,7 +146,3 @@ CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags)
CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID
CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID
CFLAGS-tzfile.c = $(tz-cflags)
-
-ifeq ($(malloc),new-malloc)
-CFLAGS-ap.c = -DNO_MCHECK
-endif
diff --git a/time/ap.c b/time/ap.c
index 9c1c0b3..5319763 100644
--- a/time/ap.c
+++ b/time/ap.c
@@ -29,9 +29,7 @@ main (int argc, char **argv)
char buf[20];
time_t t;
-#ifndef NO_MCHECK
mcheck (NULL);
-#endif
if (argc != 1)
fprintf(stderr, "Usage: %s\n", argv[0]);
diff --git a/time/ctime.c b/time/ctime.c
index f13d00e..4f06f1e 100644
--- a/time/ctime.c
+++ b/time/ctime.c
@@ -27,10 +27,7 @@
char *
ctime (const time_t *t)
{
- static char buf[64]; /* POSIX.1 suggests at least 26 bytes. */
- struct tm tm;
- struct tm *tp = __localtime_r (t, &tm);
- if (tp == NULL)
- return NULL;
- return __asctime_r (tp, buf);
+ /* The C Standard says ctime (t) is equivalent to asctime (localtime (t)).
+ In particular, ctime and asctime must yield the same pointer. */
+ return asctime (localtime (t));
}
diff --git a/time/localtime.c b/time/localtime.c
index 833d708..5e1dd0a 100644
--- a/time/localtime.c
+++ b/time/localtime.c
@@ -1,21 +1,21 @@
/* localtime -- convert `time_t' to `struct tm' in local time zone
-Copyright (C) 1991, 92, 93, 95, 96 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+ Copyright (C) 1991, 92, 93, 95, 96 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
-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 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.
+ 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. */
+ 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 <errno.h>
#include <time.h>
@@ -24,6 +24,10 @@ Cambridge, MA 02139, USA. */
/* The C Standard says that localtime and gmtime return the same pointer. */
struct tm _tmbuf;
+/* Prototype for the internal function to get information based on TZ. */
+extern void __tzset_internal __P ((void));
+
+
/* Return the `struct tm' representation of *TIMER in the local timezone. */
struct tm *
localtime (timer)
@@ -57,7 +61,7 @@ __localtime_r (timer, tp)
__libc_lock_lock (__tzset_lock);
/* Make sure the database is initialized. */
- __tzset ();
+ __tzset_internal ();
if (__use_tzfile)
{
diff --git a/time/strftime.c b/time/strftime.c
index ddea024..fea545c 100644
--- a/time/strftime.c
+++ b/time/strftime.c
@@ -128,6 +128,8 @@ extern char *tzname[];
# define gmtime_r __gmtime_r
# define localtime_r __localtime_r
extern int __tz_compute __P ((time_t timer, const struct tm *tm));
+# define tzname __tzname
+# define tzset __tzset
#else
# if ! HAVE_LOCALTIME_R
# if ! HAVE_TM_GMTOFF
diff --git a/time/tzset.c b/time/tzset.c
index bbd562d..085dfca 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -78,7 +78,7 @@ static char *old_tz = NULL;
/* Interpret the TZ envariable. */
void
-__tzset ()
+__tzset_internal ()
{
register const char *tz;
register size_t l;
@@ -374,7 +374,7 @@ size_t __tzname_cur_max;
long int
__tzname_max ()
{
- __tzset ();
+ __tzset_internal ();
return __tzname_cur_max;
}
@@ -472,7 +472,7 @@ __tz_compute (timer, tm)
time_t timer;
const struct tm *tm;
{
- __tzset ();
+ __tzset_internal ();
if (! compute_change (&tz_rules[0], 1900 + tm->tm_year) ||
! compute_change (&tz_rules[1], 1900 + tm->tm_year))
@@ -505,14 +505,11 @@ __libc_lock_define (, __tzset_lock)
#undef tzset
void
-#ifdef weak_function
-weak_function
-#endif
-tzset (void)
+__tzset (void)
{
__libc_lock_lock (__tzset_lock);
- __tzset ();
+ __tzset_internal ();
if (!__use_tzfile)
{
@@ -523,3 +520,4 @@ tzset (void)
__libc_lock_unlock (__tzset_lock);
}
+weak_alias (__tzset, tzset)