generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Frederic Lepied's ftp download resume fix

Browse Source
This commit is contained in:
Daniel Stenberg
2001-04-17 13:21:13 +00:00
parent 28a9108257
commit 60aa975610
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/curl/curl.h
View File

@@ -146,6 +146,7 @@ typedef enum {
CURLE_TOO_MANY_REDIRECTS , /* 47 - catch endless re-direct loops */ CURLE_TOO_MANY_REDIRECTS , /* 47 - catch endless re-direct loops */
CURLE_UNKNOWN_TELNET_OPTION, /* 48 - User specified an unknown option */ CURLE_UNKNOWN_TELNET_OPTION, /* 48 - User specified an unknown option */
CURLE_TELNET_OPTION_SYNTAX , /* 49 - Malformed telnet option */ CURLE_TELNET_OPTION_SYNTAX , /* 49 - Malformed telnet option */
CURLE_ALREADY_COMPLETE, /* 50 - file to dowload is already complete */
CURL_LAST /* never use! */ CURL_LAST /* never use! */
} CURLcode; } CURLcode;

7
lib/ftp.c
View File

@@ -1504,7 +1504,7 @@ again:;
data->resume_from = foundsize - downloadsize; data->resume_from = foundsize - downloadsize;
} }
else { else {
if(foundsize <= data->resume_from) { if(foundsize < data->resume_from) {
failf(data, "Offset (%d) was beyond file size (%d)", failf(data, "Offset (%d) was beyond file size (%d)",
data->resume_from, foundsize); data->resume_from, foundsize);
return CURLE_FTP_BAD_DOWNLOAD_RESUME; return CURLE_FTP_BAD_DOWNLOAD_RESUME;
@@ -1514,6 +1514,11 @@ again:;
} }
} }
if (downloadsize == 0) {
failf(data, "File already complete");
return CURLE_ALREADY_COMPLETE;
}
/* Set resume file transfer offset */ /* Set resume file transfer offset */
infof(data, "Instructs server to resume from offset %d\n", infof(data, "Instructs server to resume from offset %d\n",
data->resume_from); data->resume_from);