diff options
Diffstat (limited to 'time/localtime.c')
| -rw-r--r-- | time/localtime.c | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/time/localtime.c b/time/localtime.c index 5743347641..4c68ab22dc 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 <stddef.h> -#include <ctype.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> +#include <errno.h> #include <time.h> +/* 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) |