Use stderr instead of stdout to prompt password.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7f79edb8b47115ab5890d1cd49b07e456b3759c1..b421f2645720d33892ba1078632d720c56d533cc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-22  Gilles Carry  <gilles dot carry at st dot com>
+
+       * main.c (prompt_for_password): Use stderr instead of stdout
+       to prompt password. This allows to use --output-document=- and
+       --ask-password simultaneously. Without this, redirecting stdout
+       makes password prompt invisible and mucks up payload such as in
+       this example:
+       wget --output-document=- --ask-password -user=foo \
+               http://foo.com/tarball.tgz | tar zxf -
+
 2011-02-22  Steven Schubiger  <stsc@member.fsf.org>
 
        * http.c (gethttp, http_loop): Move duplicated code which is run

diff --git a/src/main.c b/src/main.c
index 81277c35742b63c474937b00e43f528f68d814db..5941fefad78810f230ba9e3d07ea9446e11cdff8 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -740,9 +740,9 @@ static char *
 prompt_for_password (void)
 {
   if (opt.user)
-    printf (_("Password for user %s: "), quote (opt.user));
+    fprintf (stderr, _("Password for user %s: "), quote (opt.user));
   else
-    printf (_("Password: "));
+    fprintf (stderr, _("Password: "));
   return getpass("");
 }