From c22164805d6fed3359e7f606c02974ae53d5e3de Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 18 Sep 1995 19:00:32 +0000 Subject: Mon Sep 18 12:39:22 1995 Paul Eggert * mktime.c (localtime_r): Add substitute if the system doesn't provide one. Mon Sep 18 14:39:20 1995 Roland McGrath * time/gmtime.c (gmtime_r): Define as weak alias. * time/localtime.c (localtime_r): Define as weak alias. * time/time.h [__USE_REENTRANT] (gmtime_r, localtime_r): Declare them. * errno.h: Only define _ERRNO_H #ifndef __need_Emath. #undef __need_Emath after including errnos.h. [_ERRNO_H]: Protect decls with this. Sun Sep 17 08:22:12 1995 Paul Eggert Fix mktime so that it does not write over localtime's returned value. * localtime.c (__localtime_r): New function, with extra arg specifying where to store result. (localtime): Use it. (_tmbuf): New var. * gmtime.c (__gmtime_r, gmtime, _tmbuf): Likewise. * mktime.c (__mktime_internal): Conversion function is now __localtime_r style, not localtime style. (mktime): Pass __localtime_r, not localtime. * timegm.c (timegm): Pass __gmtime_r, not gmtime. * offtime.c (__offtime): New arg specifying where to store result. * time.h (__mktime_internal, __offtime): Adjust decls accordingly. (__gmtime_r, __localtime_r): New decls. * time/localtime.c: , , , , : Remove includes. : Add include. * time/mktime.c, time/time.h, time/timegm.c (__mktime_internal): Renamed from _mktime_internal to avoid namespace pollution. * time/gmtime.c: Clear tm_isdst. * misc/efgcvt_r.c (ecvt_r, fcvt_r): Last arg is size_t, not int. * stdlib/stdlib.h (ecvt_r, fcvt_r): Fix type of last arg: make it size_t. * sysdeps/mach/hurd/fpathconf.c: Call __io_pathconf instead of __file_pathconf. * sysdeps/mach/hurd/pathconf.c: Likewise. --- time/localtime.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'time/localtime.c') diff --git a/time/localtime.c b/time/localtime.c index 5743347..4c68ab2 100644 --- a/time/localtime.c +++ b/time/localtime.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1995 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,24 +16,29 @@ 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 -#include -#include -#include -#include +#include #include +/* The C Standard says that localtime and gmtime return the same pointer. */ +struct tm _tmbuf; /* Return the `struct tm' representation of *TIMER in the local timezone. */ struct tm * localtime (timer) const time_t *timer; { + return __localtime_r (timer, &_tmbuf); +} + +struct tm * +__localtime_r (timer, tp) + const time_t *timer; + struct tm *tp; +{ 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)); - register struct tm *tp; long int leap_correction; int leap_extra_secs; @@ -57,21 +62,22 @@ localtime (timer) } else { - tp = gmtime (timer); - if (tp == NULL) + struct tm *gmtp = __gmtime_r (timer, tp); + if (gmtp == NULL) return NULL; - if (! __tz_compute (*timer, tp)) + if (! __tz_compute (*timer, gmtp)) return NULL; leap_correction = 0L; leap_extra_secs = 0; } - tp = __offtime (timer, __timezone - leap_correction); + __offtime (timer, __timezone - leap_correction, tp); tp->tm_sec += leap_extra_secs; tp->tm_isdst = __daylight; tp->tm_gmtoff = __timezone; tp->tm_zone = __tzname[__daylight]; return tp; } +weak_alias (__localtime_r, localtime_r) -- cgit v1.1