about summary refs log tree commit diff
path: root/time
diff options
context:
space:
mode:
Diffstat (limited to 'time')
-rw-r--r--time/Makefile6
-rw-r--r--time/asctime.c23
-rw-r--r--time/ctime_r.c30
-rw-r--r--time/time.h14
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.  */