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, 24 insertions, 12 deletions

diff --git a/misc/err.c b/misc/err.c
index dc7025c670..24b615b750 100644
--- a/misc/err.c
+++ b/misc/err.c
@@ -83,7 +83,7 @@ convert_and_print (const char *format, __gnuc_va_list ap)
     /* The string cannot be converted.  */
     wformat = (wchar_t *) L"???";
 
-  vfwprintf (stderr, wformat, ap);
+  __vfwprintf (stderr, wformat, ap);
 }
 #endif
 
@@ -94,7 +94,7 @@ vwarnx (const char *format, __gnuc_va_list ap)
 #ifdef USE_IN_LIBIO
   if (_IO_fwide (stderr, 0) > 0)
     {
-      fwprintf (stderr, L"%s: ", __progname);
+      __fwprintf (stderr, L"%s: ", __progname);
       convert_and_print (format, ap);
       putwc_unlocked (L'\n', stderr);
     }
@@ -118,14 +118,14 @@ vwarn (const char *format, __gnuc_va_list ap)
 #ifdef USE_IN_LIBIO
   if (_IO_fwide (stderr, 0) > 0)
     {
-      fwprintf (stderr, L"%s: ", __progname);
+      __fwprintf (stderr, L"%s: ", __progname);
       if (format)
 	{
 	  convert_and_print (format, ap);
 	  fputws_unlocked (L": ", stderr);
 	}
       __set_errno (error);
-      fwprintf (stderr, L"%m\n");
+      __fwprintf (stderr, L"%m\n");
     }
   else
 #endif
diff --git a/misc/error.c b/misc/error.c
index 40b949879c..86d49a52a6 100644
--- a/misc/error.c
+++ b/misc/error.c
@@ -164,7 +164,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
 	/* The string cannot be converted.  */
 	wmessage = (wchar_t *) L"???";
 
-      vfwprintf (stderr, wmessage, args);
+      __vfwprintf (stderr, wmessage, args);
     }
   else
 #  endif
@@ -182,7 +182,7 @@ error_tail (int status, int errnum, const char *message, va_list args)
       char *s = __strerror_r (errnum, errbuf, sizeof errbuf);
 # ifdef _LIBC
       if (_IO_fwide (stderr, 0) > 0)
-	fwprintf (stderr, L": %s", s);
+	__fwprintf (stderr, L": %s", s);
       else
 # endif
 	fprintf (stderr, ": %s", s);
@@ -233,7 +233,7 @@ error (status, errnum, message, va_alist)
     {
 #ifdef _LIBC
       if (_IO_fwide (stderr, 0) > 0)
-	fwprintf (stderr, L"%s: ", program_name);
+	__fwprintf (stderr, L"%s: ", program_name);
       else
 #endif
 	fprintf (stderr, "%s: ", program_name);
@@ -305,7 +305,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
     {
 #ifdef _LIBC
       if (_IO_fwide (stderr, 0) > 0)
-	fwprintf (stderr, L"%s: ", program_name);
+	__fwprintf (stderr, L"%s: ", program_name);
       else
 #endif
 	fprintf (stderr, "%s:", program_name);
@@ -315,7 +315,7 @@ error_at_line (status, errnum, file_name, line_number, message, va_alist)
     {
 #ifdef _LIBC
       if (_IO_fwide (stderr, 0) > 0)
-	fwprintf (stderr, L"%s:%d: ", file_name, line_number);
+	__fwprintf (stderr, L"%s:%d: ", file_name, line_number);
       else
 #endif
 	fprintf (stderr, "%s:%d: ", file_name, line_number);
diff --git a/misc/getpass.c b/misc/getpass.c
index 04ac12a76d..c392221f67 100644
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -79,7 +79,12 @@ getpass (prompt)
     tty_changed = 0;
 
   /* Write the prompt.  */
-  fputs_unlocked (prompt, out);
+#ifdef USE_IN_LIBIO
+  if (_IO_fwide (out, 0) > 0)
+    __fwprintf (out, L"%s", prompt);
+  else
+#endif
+    fputs_unlocked (prompt, out);
   fflush_unlocked (out);
 
   /* Read the password.  */
@@ -93,8 +98,15 @@ getpass (prompt)
 	  /* Remove the newline.  */
 	  buf[nread - 1] = '\0';
 	  if (tty_changed)
-	    /* Write the newline that was not echoed.  */
-	    putc_unlocked ('\n', out);
+	    {
+	      /* Write the newline that was not echoed.  */
+#ifdef USE_IN_LIBIO
+	      if (_IO_fwide (out, 0) > 0)
+		putwc_unlocked (L'\n', out);
+	      else
+#endif
+		putc_unlocked ('\n', out);
+	    }
 	}
     }