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

Don't append to an existing .listing when --continue is used. Fixes bug #22825.

Browse Source
This commit is contained in:
Micah Cowan 2008-04-11 16:28:24 -07:00
parent 8179bb520d
commit 9d5b9daf06
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/ChangeLog
View File

@ -1,3 +1,8 @@
2008-04-11 Micah Cowan <micah@cowan.name>
* wget.texi <Contributors>: Added Julien Buty, Alexander
Dergachev, and Rabin Vincent.
2008-03-24 Micah Cowan <micah@cowan.name> 2008-03-24 Micah Cowan <micah@cowan.name>
* wget.texi <Types of Fields>: Mentioned various caveats in the * wget.texi <Types of Fields>: Mentioned various caveats in the

3
doc/wget.texi
View File

@ -3770,6 +3770,7 @@ Paul Bludov,
Daniel Bodea, Daniel Bodea,
Mark Boyns, Mark Boyns,
John Burden, John Burden,
Julien Buty,
Wanderlei Cavassin, Wanderlei Cavassin,
Gilles Cedoc, Gilles Cedoc,
Tim Charron, Tim Charron,
@ -3785,6 +3786,7 @@ Andreas Damm,
Ahmon Dancy, Ahmon Dancy,
Andrew Davison, Andrew Davison,
Bertrand Demiddelaer, Bertrand Demiddelaer,
Alexander Dergachev,
Andrew Deryabin, Andrew Deryabin,
Ulrich Drepper, Ulrich Drepper,
Marc Duponcheel, Marc Duponcheel,
@ -3938,6 +3940,7 @@ Philipp Thomas,
Mauro Tortonesi, Mauro Tortonesi,
Dave Turner, Dave Turner,
Gisle Vanem, Gisle Vanem,
Rabin Vincent,
Russell Vincent, Russell Vincent,
@iftex @iftex
@v{Z}eljko Vrba, @v{Z}eljko Vrba,

7
src/ChangeLog
View File

@ -4,6 +4,13 @@
"unknown" value for the attempted allocation size. "unknown" value for the attempted allocation size.
* utils.c (aprintf): Now calls memfatal, instead of aborting. * utils.c (aprintf): Now calls memfatal, instead of aborting.
2008-04-11 Micah Cowan <micah@cowan.name>
* ftp.c (getftp, ftp_loop_internal): Don't append to an existing
.listing when --continue is used. Fixes bug #22825. Thanks to
Rabin Vincent <rabin@rab.in> for pointing the way with a
suggested fix!
2008-03-19 Micah Cowan <micah@cowan.name> 2008-03-19 Micah Cowan <micah@cowan.name>
* utils.c (test_dir_matches_p): More tests related for * utils.c (test_dir_matches_p): More tests related for

6
src/ftp.c
View File

@ -918,7 +918,7 @@ Error in server response, closing control connection.\n"));
if (opt.backups) if (opt.backups)
rotate_backups (con->target); rotate_backups (con->target);
if (restval) if (restval && !(con->cmd & DO_LIST))
fp = fopen (con->target, "ab"); fp = fopen (con->target, "ab");
else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct else if (opt.noclobber || opt.always_rest || opt.timestamping || opt.dirstruct
|| opt.output_document) || opt.output_document)
@ -1141,7 +1141,9 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
} }
/* Decide whether or not to restart. */ /* Decide whether or not to restart. */
if (opt.always_rest if (con->cmd & DO_LIST)
restval = 0;
else if (opt.always_rest
&& stat (locf, &st) == 0 && stat (locf, &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