Commit 60aa9756 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Frederic Lepied's ftp download resume fix

parent 28a91082

include/curl/curl.h

+2 −1
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ typedef enum { 
  CURLE_TOO_MANY_REDIRECTS ,     /* 47 - catch endless re-direct loops */

  CURLE_UNKNOWN_TELNET_OPTION,   /* 48 - User specified an unknown option */

  CURLE_TELNET_OPTION_SYNTAX ,   /* 49 - Malformed telnet option */

  CURLE_ALREADY_COMPLETE,	 /* 50 - file to dowload is already complete */

  

  CURL_LAST /* never use! */

} CURLcode;

lib/ftp.c

+6 −1
Original line number Diff line number Diff line
@@ -1504,7 +1504,7 @@ again:; 
            data->resume_from = foundsize - downloadsize;

          }

          else {

            if(foundsize <= data->resume_from) {

            if(foundsize < data->resume_from) {

              failf(data, "Offset (%d) was beyond file size (%d)",

                    data->resume_from, foundsize);

              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 */

        infof(data, "Instructs server to resume from offset %d\n",

              data->resume_from);