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

Fix --content-on-error option handling.

Browse Source 
* src/http.c: Log --content-on-error downloads.
* src/retr.c (retrieve_url): Register the download of an error page
when --content-on-error is specified.
This commit is contained in:
Yousong Zhou 2014-10-16 15:16:53 +08:00 committed by Giuseppe Scrivano
parent 4a214bc9a3
commit 91e9a20752
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http.c
View File

@ -3513,7 +3513,7 @@ Remote file exists.\n\n"));
if (hstat.len == hstat.contlen) if (hstat.len == hstat.contlen)
{ {
if (*dt & RETROKF) if (*dt & RETROKF || opt.content_on_error)
{ {
bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document)); bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document));
@ -3549,7 +3549,7 @@ Remote file exists.\n\n"));
if (hstat.contlen == -1) /* We don't know how much we were supposed if (hstat.contlen == -1) /* We don't know how much we were supposed
to get, so assume we succeeded. */ to get, so assume we succeeded. */
{ {
if (*dt & RETROKF) if (*dt & RETROKF || opt.content_on_error)
{ {
bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document)); bool write_to_stdout = (opt.output_document && HYPHENP (opt.output_document));
@ -3627,7 +3627,7 @@ Remote file exists.\n\n"));
while (!opt.ntry || (count < opt.ntry)); while (!opt.ntry || (count < opt.ntry));
exit: exit:
if (ret == RETROK && local_file) if ((ret == RETROK || opt.content_on_error) && local_file)
{ {
xfree (*local_file); xfree (*local_file);
*local_file = xstrdup (hstat.local_file); *local_file = xstrdup (hstat.local_file);

2
src/retr.c
View File

@ -941,7 +941,7 @@ retrieve_url (struct url * orig_parsed, const char *origurl, char **file,
DEBUGP (("[Couldn't fallback to non-utf8 for %s\n", quote (url))); DEBUGP (("[Couldn't fallback to non-utf8 for %s\n", quote (url)));
} }
if (local_file && u && *dt & RETROKF) if (local_file && u && (*dt & RETROKF || opt.content_on_error))
{ {
register_download (u->url, local_file); register_download (u->url, local_file);