Merge.

diff --git a/src/ChangeLog b/src/ChangeLog
index 854f75dbd168370fd1dc4ff578797572f1aee23d..82531a83d17e981266a164d1ab71e0a93652bb8e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,7 +3,13 @@
        * main.c (main): "freopen (NULL,.." causes an assertion in MSVC
        debug-mode.  I.e. NULL isn't legal. But the "CONOUT$" device works
        fine.
-       
+
+2009-02-27  Steven Schubiger  <stsc@member.fsf.org>
+
+       * ftp.c (ftp_loop_internal): Don't claim for FTP retrievals
+       when writing to standard output either that the document
+       has been saved. Addresses bug #20520 again.
+
 2009-02-21  Steven Schubiger  <stsc@member.fsf.org>
 
        * http.c (http_loop): When a document is written to 

diff --git a/src/ftp.c b/src/ftp.c
index e4b901899507b1da36b2663c0c89d57973f78b83..8015a3e898ac3cabc3939a3cc6662999dd5cf4fb 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1275,8 +1275,17 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
           con->csock = -1;
         }
       if (!opt.spider)
-        logprintf (LOG_VERBOSE, _("%s (%s) - %s saved [%s]\n\n"),
-                   tms, tmrate, quote (locf), number_to_static_string (len));
+        {
+          bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document));
+
+          logprintf (LOG_VERBOSE,
+                     write_to_stdout
+                     ? _("%s (%s) - written to stdout %s[%s]\n\n")
+                     : _("%s (%s) - %s saved [%s]\n\n"),
+                     tms, tmrate,
+                     write_to_stdout ? "" : quote (locf),
+                     number_to_static_string (len));
+        }
       if (!opt.verbose && !opt.quiet)
         {
           /* Need to hide the password from the URL.  The `if' is here