Mon Sep 18 12:39:22 1995 Paul Eggert <eggert@twinsun.com>

	* mktime.c (localtime_r): Add substitute if the system doesn't
	provide one.

Mon Sep 18 14:39:20 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>

	* 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  <eggert@twinsun.com>

	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: <stddef.h>, <ctype.h>, <stdio.h>,
	<stdlib.h>, <string.h>: Remove includes.
	<errno.h>: 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.

1 files changed, 17 insertions, 21 deletions

diff --git a/time/offtime.c b/time/offtime.c
index a392a47e89..e588c4c66b 100644
--- a/time/offtime.c
+++ b/time/offtime.c
@@ -26,19 +26,17 @@ extern CONST unsigned short int __mon_lengths[2][12];
 #define	SECS_PER_HOUR	(60 * 60)
 #define	SECS_PER_DAY	(SECS_PER_HOUR * 24)
 
-/* Returns the `struct tm' representation of *T,
-   offset OFFSET seconds east of UCT.	*/
-struct tm *
-DEFUN(__offtime, (t, offset), CONST time_t *t AND long int offset)
+/* Compute the `struct tm' representation of *T,
+   offset OFFSET seconds east of UTC,
+   and store year, yday, mon, mday, wday, hour, min, sec into *TP.  */
+void
+DEFUN(__offtime, (t, offset, tp),
+      CONST time_t *t AND long int offset AND struct tm *tp)
 {
-  static struct tm tbuf;
   register long int days, rem;
   register int y;
   register CONST unsigned short int *ip;
 
-  if (t == NULL)
-    return NULL;
-
   days = *t / SECS_PER_DAY;
   rem = *t % SECS_PER_DAY;
   rem += offset;
@@ -52,14 +50,14 @@ DEFUN(__offtime, (t, offset), CONST time_t *t AND long int offset)
       rem -= SECS_PER_DAY;
       ++days;
     }
-  tbuf.tm_hour = rem / SECS_PER_HOUR;
+  tp->tm_hour = rem / SECS_PER_HOUR;
   rem %= SECS_PER_HOUR;
-  tbuf.tm_min = rem / 60;
-  tbuf.tm_sec = rem % 60;
+  tp->tm_min = rem / 60;
+  tp->tm_sec = rem % 60;
   /* January 1, 1970 was a Thursday.  */
-  tbuf.tm_wday = (4 + days) % 7;
-  if (tbuf.tm_wday < 0)
-    tbuf.tm_wday += 7;
+  tp->tm_wday = (4 + days) % 7;
+  if (tp->tm_wday < 0)
+    tp->tm_wday += 7;
   y = 1970;
   while (days >= (rem = __isleap(y) ? 366 : 365))
     {
@@ -71,14 +69,12 @@ DEFUN(__offtime, (t, offset), CONST time_t *t AND long int offset)
       --y;
       days += __isleap(y) ? 366 : 365;
     }
-  tbuf.tm_year = y - 1900;
-  tbuf.tm_yday = days;
+  tp->tm_year = y - 1900;
+  tp->tm_yday = days;
   ip = __mon_lengths[__isleap(y)];
   for (y = 0; days >= ip[y]; ++y)
     days -= ip[y];
-  tbuf.tm_mon = y;
-  tbuf.tm_mday = days + 1;
-  tbuf.tm_isdst = -1;
-
-  return &tbuf;
+  tp->tm_mon = y;
+  tp->tm_mday = days + 1;
+  tp->tm_isdst = -1;
 }