Update.

	* libio/tst-ungetwc2.c (main): Define str const.

	* include/wchar.h: Add prototypes for __fwprintf and __vfwprintf.
	* libio/fwprintf.c: Also define __fwprintf.
	* stdio-common/vfprintf.c [COMPILE_WPRINTF]: Also define __vfwprintf.
	* argp/argp-fmtstream.c: Handle wide oriented stderr stream.
	* assert/assert-perr.c: Likewise.
	* assert/assert.c: Likewise.
	* gmon/gmon.c: Likewise.
	* inet/rcmd.c: Likewise.
	* malloc/obstack.c: Likewise.
	* misc/err.c: Likewise.
	* misc/error.c: Likewise.
	* misc/getpass.c: Likewise.
	* posix/getopt.c: Likewise.
	* resolv/res_hconf.c: Likewise.
	* stdio-common/perror.c: Likewise.
	* stdio-common/psignal.c: Likewise.
	* stdlib/fmtmsg.c: Likewise.
	* sunrpc/auth_unix.c: Likewise.
	* sunrpc/clnt_perr.c: Likewise.
	* sunrpc/clnt_tcp.c: Likewise.
	* sunrpc/clnt_udp.c: Likewise.
	* sunrpc/clnt_unix.c: Likewise.
	* sunrpc/svc_simple.c: Likewise.
	* sunrpc/svc_tcp.c: Likewise.
	* sunrpc/svc_udp.c: Likewise.
	* sunrpc/svc_unix.c: Likewise.
	* sunrpc/xdr.c: Likewise.
	* sunrpc/xdr_array.c: Likewise.
	* sunrpc/xdr_rec.c: Likewise.
	* sunrpc/xdr_ref.c: Likewise.
	* sysdeps/generic/wordexp.c: Likewise.

	* misc/err.c: Handle wide oriented stderr stream.

3 files changed, 30 insertions, 5 deletions

diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index dfdd69a..a2865dc 100644
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -42,7 +42,7 @@ perror_internal (FILE *fp, const char *s)
 
 #ifdef USE_IN_LIBIO
   if (_IO_fwide (fp, 0) > 0)
-    (void) fwprintf (fp, L"%s%s%s\n", s, colon, errstring);
+    (void) __fwprintf (fp, L"%s%s%s\n", s, colon, errstring);
   else
 #endif
     (void) fprintf (fp, "%s%s%s\n", s, colon, errstring);
diff --git a/stdio-common/psignal.c b/stdio-common/psignal.c
index 019e15d..c524bf3 100644
--- a/stdio-common/psignal.c
+++ b/stdio-common/psignal.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1995,1996,1997,2001 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
@@ -18,7 +18,11 @@
 
 #include <stdio.h>
 #include <signal.h>
+#include <stdlib.h>
 #include <libintl.h>
+#ifdef USE_IN_LIBIO
+# include <wchar.h>
+#endif
 
 
 #ifndef	HAVE_GNU_LD
@@ -43,7 +47,27 @@ psignal (int sig, const char *s)
     colon = ": ";
 
   if (sig >= 0 && sig < NSIG && (desc = _sys_siglist[sig]) != NULL)
-    (void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc));
+    {
+#ifdef USE_IN_LIBIO
+      if (_IO_fwide (stderr, 0) > 0)
+	(void) __fwprintf (stderr, L"%s%s%s\n", s, colon, _(desc));
+      else
+#endif
+	(void) fprintf (stderr, "%s%s%s\n", s, colon, _(desc));
+    }
   else
-    (void) fprintf (stderr, _("%s%sUnknown signal %d\n"), s, colon, sig);
+    {
+      char *buf;
+
+      (void) __asprintf (&buf, _("%s%sUnknown signal %d\n"), s, colon, sig);
+
+#ifdef USE_IN_LIBIO
+      if (_IO_fwide (stderr, 0) > 0)
+	(void) __fwprintf (stderr, L"%s",  buf);
+      else
+#endif
+	(void) fputs (buf, stderr);
+
+      free (buf);
+    }
 }
diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
index 9973e5e..68631fe 100644
--- a/stdio-common/vfprintf.c
+++ b/stdio-common/vfprintf.c
@@ -2182,7 +2182,8 @@ __wprintf_pad (FILE *s, wchar_t pad, size_t count)
 # ifdef strong_alias
 /* This is for glibc.  */
 #  ifdef COMPILE_WPRINTF
-strong_alias (_IO_vfwprintf, vfwprintf);
+strong_alias (_IO_vfwprintf, __vfwprintf);
+weak_alias (_IO_vfwprintf, vfwprintf);
 #  else
 strong_alias (_IO_vfprintf, vfprintf);
 #  endif