moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Improve also messages when writing a document retrieved via FTP to stdout (#20520).

Browse Source
This commit is contained in:
Steven Schubiger 2009-02-27 21:22:29 +01:00
parent 38b873e951
commit 57a7ebef93
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
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> 2009-02-21 Steven Schubiger <stsc@member.fsf.org>
* http.c (http_loop): When a document is written to * http.c (http_loop): When a document is written to

13
src/ftp.c
View File

@ -1275,8 +1275,17 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
con->csock = -1; con->csock = -1;
} }
if (!opt.spider) 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) if (!opt.verbose && !opt.quiet)
{ {
/* Need to hide the password from the URL. The `if' is here /* Need to hide the password from the URL. The `if' is here