Update.

1999-02-06  Ulrich Drepper  <drepper@cygnus.com>

	* Versions.def: Add versions for ld.so.
	* csu/Versions: Remove __libc_stack_end here.
	* elf/Versions: Split libc definitions in libc and ld.so definitions.
	* elf/Makefile (ld-map): Change to ld.so.map.
	* scripts/versions.awk: Recognize dot in library names.

	* ctype/ctype.h: Remove definitions of __tolower and __toupper.
	Don't use __tolower and __toupper in inline functions.
	Add optimizing macros for tolower and toupper.
	* ctype/ctype-extn.c (_tolower): Don't use __tolower.
	(_toupper): Don't use __toupper.
	* ctype/ctype.c (tolower): Don't use __tolower.
	(toupper): Don't use toupper.

	* nscd/cache.c (prune_cache): Correct printing of debugging messages.

	* resolv/Versions (libresolv): Export __ns_name_unpack and
	__ns_name_ntop.
	* resolv/res_comp.c: Rename ns_name_unpack to __ns_name_unpack and
	make it global.  Change all users.  Similar for ns_name_ntop.
	* resolv/nss_dns/dns-host.c: Don't use dn_expand when extracting in
	user-provided buffer.  Use __ns_name_unpack and __ns_name_ntop
	directly to detect too small buffer.
	* stdio-common/Makefile (tests): Add scanf12.
	* stdio-common/scanf12.c: New file.
	* stdio-common/scanf12.input: New file.
	* stdio-common/vfscanf.c (__vfscanf): Handle +/- at beginning of
	floating-point correctly if the number is invalid.
	* stdio-common/vfscanf.c: Don't use non-reentrant multibyte conversion
	* stdio-common/printf_fphex.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
See ChangeLog.9 for earlier changes.

1 files changed, 28 insertions, 12 deletions

diff --git a/stdio-common/printf_fp.c b/stdio-common/printf_fp.c
index bcd8a2d56e..a179e0dbf6 100644
--- a/stdio-common/printf_fp.c
+++ b/stdio-common/printf_fp.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <wchar.h>
 
 #ifndef NDEBUG
 # define NDEBUG			/* Undefine this for debugging assertions.  */
@@ -233,14 +234,22 @@ __printf_fp (FILE *fp,
   /* Figure out the decimal point character.  */
   if (info->extra == 0)
     {
-      if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
-		  strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0)
+      mbstate_t state;
+
+      memset (&state, '\0', sizeof (state));
+      if (__mbrtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
+		     strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT)),
+		     &state) <= 0)
 	decimal = (wchar_t) *_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT);
     }
   else
     {
-      if (mbtowc (&decimal, _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT),
-		  strlen (_NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT))) <= 0)
+      mbstate_t state;
+
+      memset (&state, '\0', sizeof (state));
+      if (__mbrtowc (&decimal, _NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT),
+		     strlen (_NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT)),
+		     &state) <= 0)
 	decimal = (wchar_t) *_NL_CURRENT (LC_MONETARY, MON_DECIMAL_POINT);
     }
   /* Give default value.  */
@@ -262,19 +271,26 @@ __printf_fp (FILE *fp,
 	  /* Figure out the thousands separator character.  */
 	  if (info->extra == 0)
 	    {
-	      if (mbtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC,
-						       THOUSANDS_SEP),
-			  strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)))
-		  <= 0)
+	      mbstate_t state;
+
+	      memset (&state, '\0', sizeof (state));
+	      if (__mbrtowc (&thousands_sep, _NL_CURRENT (LC_NUMERIC,
+							  THOUSANDS_SEP),
+			     strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)),
+			     &state) <= 0)
 		thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC,
 							THOUSANDS_SEP);
 	    }
 	  else
 	    {
-	      if (mbtowc (&thousands_sep, _NL_CURRENT (LC_MONETARY,
-						       MON_THOUSANDS_SEP),
-			  strlen (_NL_CURRENT (LC_MONETARY,
-					       MON_THOUSANDS_SEP))) <= 0)
+	      mbstate_t state;
+
+	      memset (&state, '\0', sizeof (state));
+	      if (__mbrtowc (&thousands_sep, _NL_CURRENT (LC_MONETARY,
+							  MON_THOUSANDS_SEP),
+			     strlen (_NL_CURRENT (LC_MONETARY,
+						  MON_THOUSANDS_SEP)),
+			     &state) <= 0)
 		thousands_sep = (wchar_t) *_NL_CURRENT (LC_MONETARY,
 							MON_THOUSANDS_SEP);
 	    }