Sun May 26 15:15:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* stdlib/ldiv.c: Deansideclized.

Sun May 26 19:39:53 1996  Ulrich Drepper  <drepper@cygnus.com>

	* intl/loadmsgcat.c (_nl_load_domain): Test correct variable
	after malloc.

	* string/Makefile (tester-ENV): New variable to suppress message
 	translation in test.

	* string/tester.c: Add tests for strtok_r and strsep.

	* sysdeps/i386/i486/strcat.S: Correct some more 8bit operation
	<-> 32 bit operand conflicts.

	* sysdeps/i386/strsep.S: Wrapper around <sysdeps/i386/strtok.S>
	to produce strsep function.
	* sysdeps/i386/strtok.S: Optimized implementation of strtok
	function.
	* sysdeps/i386/strtok_r.S: Wrapper around <sysdeps/i386/strtok.S>
	to produce strtok_r function.

	* sysdeps/generic/strtok.c: Moved here from string/strtok.c.
	Corrected example in comment.

	* string/Makefile (routines): Add strtok_r.
	* sysdeps/generic/strtok_r.c: New file.  Implement reentrant version
	of strtok_r.
	* string/string.h: Add prototype for strtok_r.
	* wcsmbs/wcstok.c: Handle illegal SAVE_PTR argument the same
	as in strtok_r.

Sun May 26 13:28:23 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* time/tzset.c (__tzset): Ignore leading : in $TZ; always try tzfile
	first and fall back to 1003.1 syntax only if it fails.

	* time/Makefile (install-others): Also install posix/ZONE and
	right/ZONE for each ZONE in $(zonenames).
	(z.% rule): Generate rules for right/ZONE and posix/ZONE targets too,
	the difference begin leapseconds vs /dev/null as 3rd dep.  For
	original ZONE targets use $(leapseconds), to be set in Makeconfig.
	(target-zone-flavor): New variable.
	(tzcompile): Use it to get the right -d for posix/ and right/ flavors.
	* Makeconfig (leapseconds): New variable.

	* mach/Machrules (%.udeps rule): Depend on Machrules.
	Emit deps for .uh and .__h files.
	(%.uh, %.__h rules): Don't depend on %.defs; use #include <$*.defs>
	instead.

Sun May 26 01:06:47 1996  Ulrich Drepper  <drepper@cygnus.com>

	* stdlib/Makefile (routines): Add llabs, lldiv.
	* stdlib/llabs.c: New file.  Implementation of return
	absolute value of long long argument.
	* stdlib/lldiv.c: New file.  Implementation of division with remainder
	of long long argument.
	* stdlib/stdlib.h [__USE_GNU] (lldiv_t): New type for lldiv
	function.
	Define prototypes for lldiv and llabs functions.

	* locale/C-collate.c: Initialize _NL_COLLATE_NRULES element.

	* stdlib/strtod.c: Replace wchar_t with wint_t.  The later is
	really the type for a single wide character.

	* string/strxfrm.c (print_val): Define separate version for
	use as wcsxfrm.  Here we don't need UTF8 encoding.

	* wcsmbs/wchar.h:  gcc-2.7.2-960517 finally introduces wint_t
	in <stddef.h>.  Use this value and only for older gcc version
	define in place.
	(uwchar_t): Remove definition.

	* wcsmbs/wcscmp.c, wcsmbs/wcscoll.c, wcsmbs/wcsncmp.c,
	wcsmbs/wcsxfrm.c, wcsmbs/wmemcmp.c: : Don't use uwchar_t as unsigned
	type.  wint_t is intended for this.

Sat May 25 14:10:19 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>

	* sysdeps/unix/bsd/direntry.h: Use [1] instead of [0] for d_name to
	quiet -ansi -pedantic.
	* sysdeps/unix/common/direntry.h: Likewise.

	* login/Makefile (headers): Add lastlog.h.
	* login/lastlog.h: New file.

	* login/Makefile (CFLAGS): Don't append -D_THREAD_SAFE.
	* login/utmp.h [_REENTRANT || _THREAD_SAFE]: Replace this conditional
	with #ifdef __USE_REENTRANT.

	* features.h (__GNU_LIBRARY__): Set to 6.
	[_GNU_SOURCE] (_POSIX_SOURCE, _POSIX_C_SOURCE, _BSD_SOURCE,
	_SVID_SOURCE): Make sure they are all defined.

	* sysdeps/unix/sysv/linux/gnu/types.h: Instead of including
	<linux/posix_types.h>, define _LINUX_TYPES_DONT_EXPORT and then
	include <linux/types.h>.

	* resource/sys/resource.h: Remove trailing commas from enums.

	* sysdeps/generic/netinet/in.h: Remove trailing commas from enums.
	* sysdeps/unix/sysv/linux/netinet/in.h: Likewise.

7 files changed, 68 insertions, 73 deletions

diff --git a/wcsmbs/wchar.h b/wcsmbs/wchar.h
index 3b15d9f38a..b54170c3f3 100644
--- a/wcsmbs/wchar.h
+++ b/wcsmbs/wchar.h
@@ -27,44 +27,31 @@ Cambridge, MA 02139, USA.  */
 
 __BEGIN_DECLS
 
-/* Get size_t, wchar_t, uwchar_t and NULL from <stddef.h>.  */
+/* Get size_t, wchar_t, wint_t and NULL from <stddef.h>.  */
 #define __need_size_t
 #define __need_wchar_t
-/* #define __need_uwchar_t */
+#define __need_wint_t
 #define __need_NULL
-/* __need_WCHAR_MAX */
-/* __need_WCHAR_MIN */
 #include <stddef.h>
 
-/* FIXME: Should go with this or another name in stddef.h.  */
-typedef unsigned int uwchar_t;
-
 /* Conversion state information.  */
 typedef int mbstate_t; /* FIXME */
 
-/* Should come from <stddef.h> */
-#define WCHAR_MIN ((wchar_t) 0)	/* FIXME */
-#define WCHAR_MAX (~WCHAR_MIN)	/* FIXME */
+#define WCHAR_MIN ((wchar_t) 0)
+#define WCHAR_MAX (~WCHAR_MIN)
 
 #ifndef WEOF
 # define WEOF (0xffffffffu)
 #endif
 
-/* FIXME: should this go into <stddef.h>???  */
-#if 0
-#define __need_wint_t
-#include <stddef.h>
-#else
+#ifndef _WINT_T
 /* Integral type unchanged by default argument promotions that can
    hold any value corresponding to members of the extended character
    set, as well as at least one value that does not correspond to any
    member of the extended character set.  */
-#ifndef __have_wint_t_defined
-#define __have_wint_t_defined 1
-/* This is a hack!!! */
+#define _WINT_T	1
 typedef unsigned int wint_t;
 #endif
-#endif
 
 
 /* Copy SRC to DEST.  */
diff --git a/wcsmbs/wcscmp.c b/wcsmbs/wcscmp.c
index 08da116787..2cc31992d2 100644
--- a/wcsmbs/wcscmp.c
+++ b/wcsmbs/wcscmp.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
 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
@@ -13,9 +13,9 @@ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+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 <wchar.h>
 
@@ -28,12 +28,12 @@ wcscmp (s1, s2)
      const wchar_t *s1;
      const wchar_t *s2;
 {
-  uwchar_t c1, c2;
+  wint_t c1, c2;
 
   do
     {
-      c1 = (uwchar_t) *s1++;
-      c2 = (uwchar_t) *s2++;
+      c1 = (wint_t) *s1++;
+      c2 = (wint_t) *s2++;
       if (c1 == L'\0')
 	return c1 - c2;
     }
diff --git a/wcsmbs/wcscoll.c b/wcsmbs/wcscoll.c
index e033b4a6de..ad4c23244b 100644
--- a/wcsmbs/wcscoll.c
+++ b/wcsmbs/wcscoll.c
@@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA.  */
 #include <wchar.h>
 
 #define STRING_TYPE wchar_t
-#define USTRING_TYPE uwchar_t
+#define USTRING_TYPE wint_t
 #define STRCOLL wcscoll
 #define STRCMP wcscmp
 
diff --git a/wcsmbs/wcsncmp.c b/wcsmbs/wcsncmp.c
index 3df6bfc151..fb554cbfb5 100644
--- a/wcsmbs/wcsncmp.c
+++ b/wcsmbs/wcsncmp.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
 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
@@ -13,9 +13,9 @@ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+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 <wchar.h>
 
@@ -30,28 +30,28 @@ wcsncmp (s1, s2, n)
      const wchar_t *s2;
      size_t n;
 {
-  uwchar_t c1 = L'\0';
-  uwchar_t c2 = L'\0';
+  wint_t c1 = L'\0';
+  wint_t c2 = L'\0';
 
   if (n >= 4)
     {
       size_t n4 = n >> 2;
       do
 	{
-	  c1 = (uwchar_t) *s1++;
-	  c2 = (uwchar_t) *s2++;
+	  c1 = (wint_t) *s1++;
+	  c2 = (wint_t) *s2++;
 	  if (c1 == L'\0' || c1 != c2)
 	    return c1 - c2;
-	  c1 = (uwchar_t) *s1++;
-	  c2 = (uwchar_t) *s2++;
+	  c1 = (wint_t) *s1++;
+	  c2 = (wint_t) *s2++;
 	  if (c1 == L'\0' || c1 != c2)
 	    return c1 - c2;
-	  c1 = (uwchar_t) *s1++;
-	  c2 = (uwchar_t) *s2++;
+	  c1 = (wint_t) *s1++;
+	  c2 = (wint_t) *s2++;
 	  if (c1 == L'\0' || c1 != c2)
 	    return c1 - c2;
-	  c1 = (uwchar_t) *s1++;
-	  c2 = (uwchar_t) *s2++;
+	  c1 = (wint_t) *s1++;
+	  c2 = (wint_t) *s2++;
 	  if (c1 == L'\0' || c1 != c2)
 	    return c1 - c2;
 	} while (--n4 > 0);
@@ -60,8 +60,8 @@ wcsncmp (s1, s2, n)
 
   while (n > 0)
     {
-      c1 = (uwchar_t) *s1++;
-      c2 = (uwchar_t) *s2++;
+      c1 = (wint_t) *s1++;
+      c2 = (wint_t) *s2++;
       if (c1 == L'\0' || c1 != c2)
 	return c1 - c2;
       n--;
diff --git a/wcsmbs/wcstok.c b/wcsmbs/wcstok.c
index 376fe7bfcb..b6baf311a4 100644
--- a/wcsmbs/wcstok.c
+++ b/wcsmbs/wcstok.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 
 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
@@ -13,9 +13,9 @@ 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., 675 Mass Ave,
-Cambridge, MA 02139, USA.  */
+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 <wchar.h>
 #include <errno.h>
@@ -25,20 +25,26 @@ Cambridge, MA 02139, USA.  */
    NULL, the last string wcstok() was called with is used.  */
 wchar_t *
 wcstok (wcs, delim, ptr)
-     register wchar_t *wcs;
-     register const wchar_t *delim;
-     register wchar_t **ptr;
+     wchar_t *wcs;
+     const wchar_t *delim;
+     wchar_t **save_ptr;
 {
   wchar_t *result;
 
   if (wcs == NULL)
-    wcs = *ptr;
+    if (*save_ptr == NULL)
+      {
+	errno = EINVAL;
+	return NULL;
+      }
+    else
+      wcs = *save_ptr;
 
   /* Scan leading delimiters.  */
   wcs += wcsspn (wcs, delim);
   if (*wcs == L'\0')
     {
-      *ptr = NULL;
+      *save_ptr = NULL;
       return NULL;
     }
 
@@ -47,12 +53,12 @@ wcstok (wcs, delim, ptr)
   wcs = wcspbrk (result, delim);
   if (wcs == NULL)
     /* This token finishes the string.	*/
-    *ptr = NULL;
+    *save_ptr = NULL;
   else
     {
-      /* Terminate the token and make OLDS point past it.  */
+      /* Terminate the token and make *SAVE_PTR point past it.  */
       *wcs = L'\0';
-      *ptr = wcs + 1;
+      *save_ptr = wcs + 1;
     }
   return result;
 }
diff --git a/wcsmbs/wcsxfrm.c b/wcsmbs/wcsxfrm.c
index 96a32382e0..0a04fd96f2 100644
--- a/wcsmbs/wcsxfrm.c
+++ b/wcsmbs/wcsxfrm.c
@@ -18,8 +18,10 @@ Boston, MA 02111-1307, USA.  */
 
 #include <wchar.h>
 
+#define WIDE_VERSION 1
 #define STRING_TYPE wchar_t
-#define USTRING_TYPE uwchar_t
+#define USTRING_TYPE wint_t
+#define L_(Ch) L##Ch
 #define STRXFRM wcsxfrm
 #define STRLEN wcslen
 #define STPNCPY __wcpncpy
diff --git a/wcsmbs/wmemcmp.c b/wcsmbs/wmemcmp.c
index f96cad9c0e..8d04148466 100644
--- a/wcsmbs/wmemcmp.c
+++ b/wcsmbs/wmemcmp.c
@@ -1,6 +1,6 @@
 /* Copyright (C) 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
-Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>
+Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 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
@@ -26,25 +26,25 @@ wmemcmp (s1, s2, n)
      const wchar_t *s2;
      size_t n;
 {
-  register uwchar_t c1;
-  register uwchar_t c2;
+  register wint_t c1;
+  register wint_t c2;
 
   while (n >= 4)
     {
-      c1 = (uwchar_t) s1[0];
-      c2 = (uwchar_t) s2[0];
+      c1 = (wint_t) s1[0];
+      c2 = (wint_t) s2[0];
       if (c1 - c2 != 0)
 	return c1 - c2;
-      c1 = (uwchar_t) s1[1];
-      c2 = (uwchar_t) s2[1];
+      c1 = (wint_t) s1[1];
+      c2 = (wint_t) s2[1];
       if (c1 - c2 != 0)
 	return c1 - c2;
-      c1 = (uwchar_t) s1[2];
-      c2 = (uwchar_t) s2[2];
+      c1 = (wint_t) s1[2];
+      c2 = (wint_t) s2[2];
       if (c1 - c2 != 0)
 	return c1 - c2;
-      c1 = (uwchar_t) s1[3];
-      c2 = (uwchar_t) s2[3];
+      c1 = (wint_t) s1[3];
+      c2 = (wint_t) s2[3];
       if (c1 - c2 != 0)
 	return c1 - c2;
       s1 += 4;
@@ -54,8 +54,8 @@ wmemcmp (s1, s2, n)
 
   if (n > 0)
     {
-      c1 = (uwchar_t) s1[0];
-      c2 = (uwchar_t) s2[0];
+      c1 = (wint_t) s1[0];
+      c2 = (wint_t) s2[0];
       if (c1 - c2 != 0)
 	return c1 - c2;
       ++s1;
@@ -64,8 +64,8 @@ wmemcmp (s1, s2, n)
     }
   if (n > 0)
     {
-      c1 = (uwchar_t) s1[0];
-      c2 = (uwchar_t) s2[0];
+      c1 = (wint_t) s1[0];
+      c2 = (wint_t) s2[0];
       if (c1 - c2 != 0)
 	return c1 - c2;
       ++s1;
@@ -74,8 +74,8 @@ wmemcmp (s1, s2, n)
     }
   if (n > 0)
     {
-      c1 = (uwchar_t) s1[0];
-      c2 = (uwchar_t) s2[0];
+      c1 = (wint_t) s1[0];
+      c2 = (wint_t) s2[0];
       if (c1 - c2 != 0)
 	return c1 - c2;
     }