Update.

	* locale/programs/ld-ctype.c (ctype_finish): Take all characters from
	the input charset into account when generating the hash table.
	(allocate_arrays): Correct setting default width.  Not all empty slots
	in the table are filled, only those not covert explicitly by the
	locale description and in the charset.

	* stdio-common/vfscanf.c: Make sure to always return WEOF and EOF for
	wide character version.
	For %C handling, test correct pointer variable for NULL.

	* wcsmbs/wctob.c: Handle WEOF special.

	* wcsmbs/wcwidth.h: 0xff in width array means invalid character.

	* wctype/wctype.h: Protect gcc-isms with __extension__.  Avoid
	always-true test to avoid warning.

2 files changed, 7 insertions, 2 deletions

diff --git a/wcsmbs/wctob.c b/wcsmbs/wctob.c
index 0ee17ce443..68ab6614f7 100644
--- a/wcsmbs/wctob.c
+++ b/wcsmbs/wctob.c
@@ -36,6 +36,9 @@ wctob (c)
   size_t dummy;
   int status;
 
+  if (c == WEOF)
+    return EOF;
+
   /* Tell where we want the result.  */
   data.__outbuf = buf;
   data.__outbufend = buf + MB_LEN_MAX;
diff --git a/wcsmbs/wcwidth.h b/wcsmbs/wcwidth.h
index a9f8a26d49..ffc74be26c 100644
--- a/wcsmbs/wcwidth.h
+++ b/wcsmbs/wcwidth.h
@@ -1,5 +1,5 @@
 /* Internal header containing implementation of wcwidth() function.
-   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1996.
 
@@ -33,6 +33,7 @@ static __inline int
 internal_wcwidth (wint_t ch)
 {
   size_t idx;
+  unsigned char res;
 
   if (ch == L'\0')
     return 0;
@@ -41,5 +42,6 @@ internal_wcwidth (wint_t ch)
   if (idx == ~((size_t) 0) || (__ctype32_b[idx] & _ISwprint) == 0)
     return -1;
 
-  return (int) __ctype_width[idx];
+  res = __ctype_width[idx];
+  return res == (unsigned char) '\xff' ? -1 : (int) res;
 }