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 symlinks resume via FTP.

Browse Source
This commit is contained in:
Leonid Petrov 2010-07-20 13:09:43 +02:00 committed by Giuseppe Scrivano
parent 57584fe2da
commit 29c0b3cc07
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2010-07-20 Leonid Petrov <nouser@lpetrov.net>
* ftp.c (getftp): Don't attempt to retrieve the file if it is already
completely.
(ftp_loop_internal): Force the length to be zero for symlinks.
2010-07-18 Giuseppe Scrivano <gscrivano@gnu.org> 2010-07-18 Giuseppe Scrivano <gscrivano@gnu.org>
* http.c (gethttp): If -N is used, don't exit immediately if the content * http.c (gethttp): If -N is used, don't exit immediately if the content

12
src/ftp.c
View File

@ -767,6 +767,16 @@ Error in server response, closing control connection.\n"));
number_to_static_string (expected_bytes)); number_to_static_string (expected_bytes));
} }
if (cmd & DO_RETR && restval > 0 && restval == expected_bytes)
{
/* Server confirms that file has length restval. We should stop now.
Some servers (f.e. NcFTPd) return error when receive REST 0 */
logputs (LOG_VERBOSE, _("File has already been retrieved.\n"));
fd_close (csock);
con->csock = -1;
return RETRFINISHED;
}
/* If anything is to be retrieved, PORT (or PASV) must be sent. */ /* If anything is to be retrieved, PORT (or PASV) must be sent. */
if (cmd & (DO_LIST | DO_RETR)) if (cmd & (DO_LIST | DO_RETR))
{ {
@ -1459,7 +1469,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con, char **local_fi
xfree (hurl); xfree (hurl);
} }
/* Send getftp the proper length, if fileinfo was provided. */ /* Send getftp the proper length, if fileinfo was provided. */
if (f) if (f && f->type != FT_SYMLINK)
len = f->size; len = f->size;
else else
len = 0; len = 0;