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.

7 files changed, 106 insertions, 33 deletions

diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 1ad5d473be..287f7c566a 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99 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
@@ -49,7 +49,7 @@ tests := tst-printf tstscanf test_rdwr test-popen tstgetln test-fseek \
 	 bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 \
 	 tfformat tiformat tstdiomisc tst-printfsz tst-wc-printf \
 	 scanf1 scanf2 scanf3 scanf4 scanf5 scanf7 scanf8 scanf9 scanf10 \
-	 tst-tmpnam
+	 scanf12 tst-tmpnam
 
 include ../Rules
 
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);
 	    }
diff --git a/stdio-common/printf_fphex.c b/stdio-common/printf_fphex.c
index fb53d24a1f..a959d55553 100644
--- a/stdio-common/printf_fphex.c
+++ b/stdio-common/printf_fphex.c
@@ -1,6 +1,6 @@
 /* Print floating point number in hexadecimal notation according to
    ISO C 9X.
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <wchar.h>
 #include "_itoa.h"
 #include <locale/localeinfo.h>
 
@@ -135,14 +136,22 @@ __printf_fphex (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.  */
diff --git a/stdio-common/scanf12.c b/stdio-common/scanf12.c
new file mode 100644
index 0000000000..b557785377
--- /dev/null
+++ b/stdio-common/scanf12.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main (void)
+{
+  double d;
+  int c;
+
+  if (scanf ("%lg", &d) != EOF)
+    {
+      printf ("scanf didn't failed\n");
+      exit (1);
+    }
+  c = getchar ();
+  if (c != ' ')
+    {
+      printf ("c is `%c', not ` '\n", c);
+      exit (1);
+    }
+
+  return 0;
+}
diff --git a/stdio-common/scanf12.input b/stdio-common/scanf12.input
new file mode 100644
index 0000000000..41aa98aa8b
--- /dev/null
+++ b/stdio-common/scanf12.input
@@ -0,0 +1 @@
++ foo
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index bc005f9f32..d9cd620853 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,93,94,95,96,97,98,99 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
@@ -1121,10 +1121,14 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
       /* XXX Completely wrong.  Use wctob.  */
       if (grouping == (const char *) -1)
 	{
+	  mbstate_t mbstate;
+
 	  /* Figure out the thousands separator character.  */
-	  if (mbtowc (&thousands_sep,
-		      _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
-		      strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
+	  memset (&mbstate, '\0', sizeof (mbstate));
+	  if (__mbrtowc (&thousands_sep,
+			 _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
+			 strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)),
+			 &mbstate) <= 0)
 	    thousands_sep = (wchar_t)
 	      *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
 	  grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
@@ -1284,11 +1288,14 @@ do_positional:
 
     if (grouping == (const char *) -1)
       {
-	/* XXX Use wctob.  But this is incompatible for now.  */
+	mbstate_t mbstate;
+
 	/* Figure out the thousands separator character.  */
-	if (mbtowc (&thousands_sep,
-		    _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
-		    strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP))) <= 0)
+	memset (&mbstate, '\0', sizeof (mbstate));
+	if (__mbrtowc (&thousands_sep,
+		       _NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP),
+		       strlen (_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP)),
+		       &mbstate) <= 0)
 	  thousands_sep = (wchar_t) *_NL_CURRENT (LC_NUMERIC, THOUSANDS_SEP);
 	grouping = _NL_CURRENT (LC_NUMERIC, GROUPING);
 	if (*grouping == '\0' || *grouping == CHAR_MAX
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 ();