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

Recieve ftp listing even when .listing file exist and --no-clobber option is given.

Browse Source
This commit is contained in:
Nikolay Merinov 2012-10-03 21:31:25 +06:00 committed by Giuseppe Scrivano
parent 22bd8011e8
commit 13c6e7832a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2012-10-03 Merinov Nikolay <kim.roader@gmail.com>
* ftp.c (ftp_loop_internal): Ignore --no-clobber option when
receiving directory listing.
2012-10-07 Tim Ruehsen <tim.ruehsen@gmx.de> 2012-10-07 Tim Ruehsen <tim.ruehsen@gmx.de>
Giuseppe Scrivano <gscrivano@gnu.org> Giuseppe Scrivano <gscrivano@gnu.org>

7
src/ftp.c
View File

@ -1424,7 +1424,12 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con, char **local_fi
/* If the output_document was given, then this check was already done and /* If the output_document was given, then this check was already done and
the file didn't exist. Hence the !opt.output_document */ the file didn't exist. Hence the !opt.output_document */
if (opt.noclobber && !opt.output_document && file_exists_p (con->target))
/* If we receive .listing file it is necessary to determine system type of the ftp
server even if opn.noclobber is given. Thus we must ignore opt.noclobber in
order to establish connection with the server and get system type. */
if (opt.noclobber && !opt.output_document && file_exists_p (con->target)
&& !((con->cmd & DO_LIST) && !(con->cmd & DO_RETR)))
{ {
logprintf (LOG_VERBOSE, logprintf (LOG_VERBOSE,
_("File %s already there; not retrieving.\n"), quote (con->target)); _("File %s already there; not retrieving.\n"), quote (con->target));