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

[svn] Fix broken -c in new HTTP code.

Browse Source
This commit is contained in:
mtortonesi 2006-08-17 03:49:29 -07:00
parent 54fffb4dc4
commit a9c3209a9b
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2006-08-16 Mauro Tortonesi <mauro@ferrara.linux.it>
* http.c: Fixed bug which broke --continue feature. Now if -c is
given, http_loop sends a HEAD request to find out the destination
filename before resuming download.
2006-08-08 Hrvoje Niksic <hniksic@xemacs.org> 2006-08-08 Hrvoje Niksic <hniksic@xemacs.org>
* utils.c (datetime_str): Avoid code repetition with time_str. * utils.c (datetime_str): Avoid code repetition with time_str.

17
src/http.c
View File

@ -1762,7 +1762,7 @@ File `%s' already there; not retrieving.\n\n"), hs->local_file);
return RETROK; return RETROK;
} }
else else if (!ALLOW_CLOBBER)
{ {
char *unique = unique_name (hs->local_file, true); char *unique = unique_name (hs->local_file, true);
if (unique != hs->local_file) if (unique != hs->local_file)
@ -2231,6 +2231,7 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
{ {
int count; int count;
bool got_head = false; /* used for time-stamping */ bool got_head = false; /* used for time-stamping */
bool got_name = false;
char *tms; char *tms;
const char *tmrate; const char *tmrate;
uerr_t err, ret = TRYLIMEXC; uerr_t err, ret = TRYLIMEXC;
@ -2264,7 +2265,10 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
hstat.referer = referer; hstat.referer = referer;
if (opt.output_document) if (opt.output_document)
{
hstat.local_file = xstrdup (opt.output_document); hstat.local_file = xstrdup (opt.output_document);
got_name = true;
}
/* Reset the counter. */ /* Reset the counter. */
count = 0; count = 0;
@ -2309,13 +2313,16 @@ http_loop (struct url *u, char **newloc, char **local_file, const char *referer,
/* Default document type is empty. However, if spider mode is /* Default document type is empty. However, if spider mode is
on or time-stamping is employed, HEAD_ONLY commands is on or time-stamping is employed, HEAD_ONLY commands is
encoded within *dt. */ encoded within *dt. */
if ((opt.spider && !opt.recursive) || (opt.timestamping && !got_head)) if ((opt.spider && !opt.recursive)
|| (opt.timestamping && !got_head)
|| (opt.always_rest && !got_name))
*dt |= HEAD_ONLY; *dt |= HEAD_ONLY;
else else
*dt &= ~HEAD_ONLY; *dt &= ~HEAD_ONLY;
/* Decide whether or not to restart. */ /* Decide whether or not to restart. */
if (opt.always_rest if (opt.always_rest
&& got_name
&& stat (hstat.local_file, &st) == 0 && stat (hstat.local_file, &st) == 0
&& S_ISREG (st.st_mode)) && S_ISREG (st.st_mode))
/* When -c is used, continue from on-disk size. (Can't use /* When -c is used, continue from on-disk size. (Can't use
@ -2484,6 +2491,12 @@ The sizes do not match (local %s) -- retrieving.\n"),
continue; continue;
} }
if (opt.always_rest && !got_name)
{
got_name = true;
continue;
}
if ((tmr != (time_t) (-1)) if ((tmr != (time_t) (-1))
&& (!opt.spider || opt.recursive) && (!opt.spider || opt.recursive)
&& ((hstat.len == hstat.contlen) || && ((hstat.len == hstat.contlen) ||