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, 23 insertions, 6 deletions

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index f05fc700dc..2e8cf9f5f5 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
 #include <wctype.h>
 #include <bits/libc-lock.h>
 #include <locale/localeinfo.h>
@@ -199,6 +200,8 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
   wchar_t decimal;
   /* The thousands character of the current locale.  */
   wchar_t thousands;
+  /* State for the conversions.  */
+  mbstate_t state;
   /* Integral holding variables.  */
   union
     {
@@ -247,17 +250,25 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
   ARGCHECK (s, format);
 
   /* Figure out the decimal point character.  */
-  if (mbtowc (&decimal, _NL_CURRENT (LC_NUMERIC, DECIMAL_POINT),
-	      strlen (_NL_CURRENT (LC_NUMERIC, DECIMAL_POINT))) <= 0)
+  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);
   /* Figure out the thousands separator character.  */
-  if (mbtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
-	      strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
+  memset (&state, '\0', sizeof (state));
+  if (__mbrtowc (&thousands, _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
+		 strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)),
+		 &state) <= 0)
     thousands = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
 
   /* Lock the stream.  */
   LOCK_STREAM (s);
 
+
+  /* From now on we use `state' to convert the format string.  */
+  memset (&state, '\0', sizeof (state));
+
   /* Run through the format string.  */
   while (*f != '\0')
     {
@@ -298,7 +309,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
       if (!isascii (*f))
 	{
 	  /* Non-ASCII, may be a multibyte.  */
-	  int len = mblen (f, strlen (f));
+	  int len = __mbrlen (f, strlen (f), &state);
 	  if (len > 0)
 	    {
 	      do
@@ -973,6 +984,12 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 	      if (inchar () == EOF)
 		/* EOF is only an input error before we read any chars.  */
 		conv_error ();
+	      if (! isdigit (c) && c != decimal)
+		{
+		  /* This is no valid number.  */
+		  ungetc (c, s);
+		  input_error ();
+		}
 	      if (width > 0)
 		--width;
 	    }
@@ -1008,7 +1025,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 		{
 		  if (_tolower (c) == 'i')
 		    {
-		      /* No we have to read the rest as well.  */
+		      /* Now we have to read the rest as well.  */
 		      ADDW (c);
 		      if (inchar () == EOF || _tolower (c) != 'n')
 			input_error ();