Update UD main archive 960805

diff --git a/time/Makefile b/time/Makefile
index d77c6c5..84e5230 100644 (file)
--- 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 644df32..bb20a3a 100644 (file)
--- 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 (file)
index 0000000..e198189
--- /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 62e098e..6b955f1 100644 (file)
--- 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.  */

diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c
index 07fb0c4..056f7be 100644 (file)
--- a/wcsmbs/mbrtowc.c
+++ b/wcsmbs/mbrtowc.c
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
 static mbstate_t internal;
 
 size_t
-mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
+__mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 {
   size_t used = 0;
 
@@ -128,3 +128,4 @@ mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps)
 
   return (size_t) -2;
 }
+weak_alias (__mbrtowc, mbrtowc)

diff --git a/wcsmbs/mbsrtowcs.c b/wcsmbs/mbsrtowcs.c
index 712b199..d7305d6 100644 (file)
--- a/wcsmbs/mbsrtowcs.c
+++ b/wcsmbs/mbsrtowcs.c
@@ -30,7 +30,7 @@ Boston, MA 02111-1307, USA.  */
 static mbstate_t internal;
 
 size_t
-mbsrtowcs (dst, src, len, ps)
+__mbsrtowcs (dst, src, len, ps)
      wchar_t *dst;
      const char **src;
      size_t len;
@@ -135,3 +135,4 @@ mbsrtowcs (dst, src, len, ps)
 
   return written;
 }
+weak_alias (__mbsrtowcs, mbsrtowcs)

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 0346364..db3c08d 100644 (file)
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -151,10 +151,13 @@ extern int mbsinit __P ((__const mbstate_t *__ps));
 
 /* Write wide character representation of multibyte character pointed
    to by S to PWC.  */
+extern size_t __mbrtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n,
+                             mbstate_t *__p));
 extern size_t mbrtowc __P ((wchar_t *__pwc, __const char *__s, size_t __n,
                            mbstate_t *__p));
 
 /* Write multibyte representation of wide character WC to S.  */
+extern size_t __wcrtomb __P ((char *__s, wchar_t __wc, mbstate_t *__ps));
 extern size_t wcrtomb __P ((char *__s, wchar_t __wc, mbstate_t *__ps));
 
 /* Return number of bytes in multibyte character pointed to by S.  */
@@ -165,16 +168,20 @@ extern size_t mbrlen __P ((__const char *__s, size_t __n, mbstate_t *__ps));
     && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7))
 /* Define inline function as optimization.  */
 extern __inline size_t mbrlen (__const char *s, size_t n, mbstate_t *ps)
-{ return ps != NULL ? mbrtowc (NULL, s, n, ps) : __mbrlen (s, n, NULL); }
+{ return ps != NULL ? __mbrtowc (NULL, s, n, ps) : __mbrlen (s, n, NULL); }
 #endif
 
 /* Write wide character representation of multibyte character string
    SRC to DST.  */
+extern size_t __mbsrtowcs __P ((wchar_t *__dst, __const char **__src,
+                               size_t __len, mbstate_t *__ps));
 extern size_t mbsrtowcs __P ((wchar_t *__dst, __const char **__src,
                              size_t __len, mbstate_t *__ps));
 
 /* Write multibyte character representation of wide character string
    SRC to DST.  */
+extern size_t __wcsrtombs __P ((char *__dst, __const wchar_t **__src,
+                               size_t __len, mbstate_t *__ps));
 extern size_t wcsrtombs __P ((char *__dst, __const wchar_t **__src,
                              size_t __len, mbstate_t *__ps));
 

diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c
index eb007a6..052a5b9 100644 (file)
--- a/wcsmbs/wcrtomb.c
+++ b/wcsmbs/wcrtomb.c
@@ -38,7 +38,7 @@ static const unsigned char encoding_byte[] =
 static mbstate_t internal;
 
 size_t
-wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
+__wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 {
   char fake[1];
   size_t written = 0;
@@ -89,3 +89,4 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 
   return written;
 }
+weak_alias (__wcrtomb, wcrtomb)

diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
index 99ca6ac..999e291 100644 (file)
--- a/wcsmbs/wcsrtombs.c
+++ b/wcsmbs/wcsrtombs.c
@@ -40,7 +40,7 @@ static const unsigned char encoding_byte[] =
 static mbstate_t internal;
 
 size_t
-wcsrtombs (dst, src, len, ps)
+__wcsrtombs (dst, src, len, ps)
      char *dst;
      const wchar_t **src;
      size_t len;
@@ -122,3 +122,4 @@ wcsrtombs (dst, src, len, ps)
 
   return written;
 }
+weak_alias (__wcsrtombs, wcsrtombs)