From fb7916aa1d3a8f22f8db2fe9dafb88c7ef3268d5 Mon Sep 17 00:00:00 2001 From: Steven Schubiger Date: Sat, 21 Feb 2009 17:32:12 +0100 Subject: [PATCH] Improve messages when writing a document to stdout. --- src/ChangeLog | 6 ++++++ src/http.c | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 83fa2a26..59c60980 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2009-02-21 Steven Schubiger + + * http.c (http_loop): When a document is written to + standard output, don't claim it has been saved to a file. + Addresses bug #20520. + 2009-02-18 Steven Schubiger * recur.h: Remove the dangling declaration for recursive_cleanup(). diff --git a/src/http.c b/src/http.c index 090950d2..fa05abd9 100644 --- a/src/http.c +++ b/src/http.c @@ -2756,9 +2756,14 @@ Remote file exists.\n\n")); { if (*dt & RETROKF) { + bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document)); + logprintf (LOG_VERBOSE, - _("%s (%s) - %s saved [%s/%s]\n\n"), - tms, tmrate, quote (hstat.local_file), + write_to_stdout + ? _("%s (%s) - written to stdout %s[%s/%s]\n\n") + : _("%s (%s) - %s saved [%s/%s]\n\n"), + tms, tmrate, + write_to_stdout ? "" : quote (hstat.local_file), number_to_static_string (hstat.len), number_to_static_string (hstat.contlen)); logprintf (LOG_NONVERBOSE, @@ -2787,9 +2792,14 @@ Remote file exists.\n\n")); { if (*dt & RETROKF) { + bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document)); + logprintf (LOG_VERBOSE, - _("%s (%s) - %s saved [%s]\n\n"), - tms, tmrate, quote (hstat.local_file), + 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 (hstat.local_file), number_to_static_string (hstat.len)); logprintf (LOG_NONVERBOSE, "%s URL:%s [%s] -> \"%s\" [%d]\n", -- 2.39.2