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.

1 files changed, 40 insertions, 15 deletions

diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index 2bafbc3..bb8502f 100644
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -23,6 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/syslog.h>
+#ifdef USE_IN_LIBIO
+# include <wchar.h>
+#endif
 
 
 /* We have global data, protect the modification.  */
@@ -143,20 +146,42 @@ fmtmsg (long int classification, const char *label, int severity,
       int do_action = (print & action_mask) && action != MM_NULLACT;
       int do_tag = (print & tag_mask) && tag != MM_NULLTAG;
 
-      if (fprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
-		   do_label ? label : "",
-		   do_label && (do_severity | do_text | do_action | do_tag)
-		   ? ": " : "",
-		   do_severity ? severity_rec->string : "",
-		   do_severity && (do_text | do_action | do_tag) ? ": " : "",
-		   do_text ? text : "",
-		   do_text && (do_action | do_tag) ? "\n" : "",
-		   do_action ? "TO FIX: " : "",
-		   do_action ? action : "",
-		   do_action && do_tag ? "  " : "",
-		   do_tag ? tag : "") == EOF)
-	/* Oh, oh.  An error occurred during the output.  */
-	result = MM_NOMSG;
+#ifdef USE_IN_LIBIO
+      if (_IO_fwide (stderr, 0) > 0)
+	{
+	  if (__fwprintf (stderr, L"%s%s%s%s%s%s%s%s%s%s\n",
+			  do_label ? label : "",
+			  do_label
+			  && (do_severity | do_text | do_action | do_tag)
+			  ? ": " : "",
+			  do_severity ? severity_rec->string : "",
+			  do_severity && (do_text | do_action | do_tag)
+			  ? ": " : "",
+			  do_text ? text : "",
+			  do_text && (do_action | do_tag) ? "\n" : "",
+			  do_action ? "TO FIX: " : "",
+			  do_action ? action : "",
+			  do_action && do_tag ? "  " : "",
+			  do_tag ? tag : "") == WEOF)
+	    /* Oh, oh.  An error occurred during the output.  */
+	    result = MM_NOMSG;
+	}
+      else
+#endif
+	if (fprintf (stderr, "%s%s%s%s%s%s%s%s%s%s\n",
+		     do_label ? label : "",
+		     do_label && (do_severity | do_text | do_action | do_tag)
+		     ? ": " : "",
+		     do_severity ? severity_rec->string : "",
+		     do_severity && (do_text | do_action | do_tag) ? ": " : "",
+		     do_text ? text : "",
+		     do_text && (do_action | do_tag) ? "\n" : "",
+		     do_action ? "TO FIX: " : "",
+		     do_action ? action : "",
+		     do_action && do_tag ? "  " : "",
+		     do_tag ? tag : "") == EOF)
+	  /* Oh, oh.  An error occurred during the output.  */
+	  result = MM_NOMSG;
     }
 
   if (classification & MM_CONSOLE)