Commit ad638da2 authored by Yang Tse's avatar Yang Tse
Browse files

Library internal only C preprocessor macros FORMAT_OFF_T and FORMAT_OFF_TU 

remain in use as internal curl_off_t print formatting strings for the internal
*printf functions which still cannot handle print formatting string directives
such as "I64d", "I64u", and others available on MSVC, MinGW, Intel's ICC, and
other DOS/Windows compilers.

This reverts previous commit part which did:

FORMAT_OFF_T  -> CURL_FORMAT_CURL_OFF_T
FORMAT_OFF_TU -> CURL_FORMAT_CURL_OFF_TU
parent a923d854

CHANGES

+7 −0
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ 


                                  Changelog



Yang Tse (16 Aug 2008)

- Library internal only C preprocessor macros FORMAT_OFF_T and FORMAT_OFF_TU

  remain in use as internal curl_off_t print formatting strings for the internal

  *printf functions which still cannot handle print formatting string directives

  such as "I64d", "I64u", and others available on MSVC, MinGW, Intel's ICC, and

  other DOS/Windows compilers.



Daniel Fandrich (15 Aug 2008)

- Added test case 1063 to test invalid long file ranges with file: URLs and

  1064 to test multiple http PUTs.

lib/cookie.c

+1 −1
Original line number Diff line number Diff line
@@ -940,7 +940,7 @@ static char *get_netscape_format(const struct Cookie *co) 
    "%s\t"   /* tailmatch */

    "%s\t"   /* path */

    "%s\t"   /* secure */

    "%" CURL_FORMAT_CURL_OFF_T "\t"   /* expires */

    "%" FORMAT_OFF_T "\t"   /* expires */

    "%s\t"   /* name */

    "%s",    /* value */

    co->httponly?"#HttpOnly_":"",

lib/file.c

+7 −8
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ static CURLcode file_range(struct connectdata *conn) 
    if((-1 == to) && (from>=0)) {

      /* X - */

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE %" CURL_FORMAT_CURL_OFF_T " to end of file\n",

      DEBUGF(infof(data, "RANGE %" FORMAT_OFF_T " to end of file\n",

                   from));

    }

    else if(from < 0) {
@@ -157,7 +157,7 @@ static CURLcode file_range(struct connectdata *conn) 
      totalsize = -from;

      data->req.maxdownload = -from;

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE the last %" CURL_FORMAT_CURL_OFF_T " bytes\n",

      DEBUGF(infof(data, "RANGE the last %" FORMAT_OFF_T " bytes\n",

                   totalsize));

    }

    else {
@@ -165,13 +165,12 @@ static CURLcode file_range(struct connectdata *conn) 
      totalsize = to-from;

      data->req.maxdownload = totalsize+1; /* include last byte */

      data->state.resume_from = from;

      DEBUGF(infof(data, "RANGE from %" CURL_FORMAT_CURL_OFF_T

                   " getting %" CURL_FORMAT_CURL_OFF_T " bytes\n",

      DEBUGF(infof(data, "RANGE from %" FORMAT_OFF_T

                   " getting %" FORMAT_OFF_T " bytes\n",

                   from, data->req.maxdownload));

    }

    DEBUGF(infof(data, "range-download from %" CURL_FORMAT_CURL_OFF_T

                 " to %" CURL_FORMAT_CURL_OFF_T

                 ", totally %" CURL_FORMAT_CURL_OFF_T " bytes\n",

    DEBUGF(infof(data, "range-download from %" FORMAT_OFF_T

                 " to %" FORMAT_OFF_T ", totally %" FORMAT_OFF_T " bytes\n",

                 from, to, data->req.maxdownload));

  }

  else
@@ -461,7 +460,7 @@ static CURLcode file_do(struct connectdata *conn, bool *done) 
  if(data->set.opt_no_body && data->set.include_header && fstated) {

    CURLcode result;

    snprintf(buf, sizeof(data->state.buffer),

             "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", expected_size);

             "Content-Length: %" FORMAT_OFF_T "\r\n", expected_size);

    result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0);

    if(result)

      return result;

lib/formdata.c

+1 −1
Original line number Diff line number Diff line
@@ -1674,7 +1674,7 @@ int main(int argc, argv_item_t argv[]) 
  } while(1);



  fprintf(stdout, "size: ");

  fprintf(stdout, "%" CURL_FORMAT_CURL_OFF_T, size);

  fprintf(stdout, "%" FORMAT_OFF_T, size);

  fprintf(stdout, "\n");

  if(errors)

    fprintf(stdout, "\n==> %d Test(s) failed!\n", errors);

lib/ftp.c

+19 −25
Original line number Diff line number Diff line
@@ -2125,8 +2125,8 @@ static CURLcode ftp_state_post_retr_size(struct connectdata *conn, 
      if(data->state.resume_from< 0) {

        /* We're supposed to download the last abs(from) bytes */

        if(filesize < -data->state.resume_from) {

          failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T

                ") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",

          failf(data, "Offset (%" FORMAT_OFF_T

                ") was beyond file size (%" FORMAT_OFF_T ")",

                data->state.resume_from, filesize);

          return CURLE_BAD_DOWNLOAD_RESUME;

        }
@@ -2137,8 +2137,8 @@ static CURLcode ftp_state_post_retr_size(struct connectdata *conn, 
      }

      else {

        if(filesize < data->state.resume_from) {

          failf(data, "Offset (%" CURL_FORMAT_CURL_OFF_T

                ") was beyond file size (%" CURL_FORMAT_CURL_OFF_T ")",

          failf(data, "Offset (%" FORMAT_OFF_T

                ") was beyond file size (%" FORMAT_OFF_T ")",

                data->state.resume_from, filesize);

          return CURLE_BAD_DOWNLOAD_RESUME;

        }
@@ -2160,10 +2160,10 @@ static CURLcode ftp_state_post_retr_size(struct connectdata *conn, 
    }



    /* Set resume file transfer offset */

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

          CURL_FORMAT_CURL_OFF_T "\n", data->state.resume_from);

    infof(data, "Instructs server to resume from offset %" FORMAT_OFF_T

          "\n", data->state.resume_from);



    NBFTPSENDF(conn, "REST %" CURL_FORMAT_CURL_OFF_T, data->state.resume_from);

    NBFTPSENDF(conn, "REST %" FORMAT_OFF_T, data->state.resume_from);



    state(conn, FTP_RETR_REST);
@@ -2193,7 +2193,7 @@ static CURLcode ftp_state_size_resp(struct connectdata *conn, 
#ifdef CURL_FTP_HTTPSTYLE_HEAD

    if(-1 != filesize) {

      snprintf(buf, sizeof(data->state.buffer),

               "Content-Length: %" CURL_FORMAT_CURL_OFF_T "\r\n", filesize);

               "Content-Length: %" FORMAT_OFF_T "\r\n", filesize);

      result = Curl_client_write(conn, CLIENTWRITE_BOTH, buf, 0);

      if(result)

        return result;
@@ -2392,12 +2392,10 @@ static CURLcode ftp_state_get_resp(struct connectdata *conn, 
    if(size > data->req.maxdownload && data->req.maxdownload > 0)

      size = data->req.size = data->req.maxdownload;



    infof(data, "Maxdownload = %" CURL_FORMAT_CURL_OFF_T "\n",

          data->req.maxdownload);

    infof(data, "Maxdownload = %" FORMAT_OFF_T "\n", data->req.maxdownload);



    if(instate != FTP_LIST)

      infof(data, "Getting file with size: %" CURL_FORMAT_CURL_OFF_T "\n",

            size);

      infof(data, "Getting file with size: %" FORMAT_OFF_T "\n", size);



    /* FTP download: */

    result=Curl_setup_transfer(conn, SECONDARYSOCKET, size, FALSE,
@@ -3285,8 +3283,8 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, 
       (data->set.infilesize != *ftp->bytecountp) &&

       !data->set.crlf &&

       (ftp->transfer == FTPTRANSFER_BODY)) {

      failf(data, "Uploaded unaligned file size (%" CURL_FORMAT_CURL_OFF_T

            " out of %" CURL_FORMAT_CURL_OFF_T " bytes)",

      failf(data, "Uploaded unaligned file size (%" FORMAT_OFF_T

            " out of %" FORMAT_OFF_T " bytes)",

            *ftp->bytecountp, data->set.infilesize);

      result = CURLE_PARTIAL_FILE;

    }
@@ -3303,8 +3301,7 @@ static CURLcode ftp_done(struct connectdata *conn, CURLcode status, 
        *ftp->bytecountp) &&

#endif /* CURL_DO_LINEEND_CONV */

       (data->req.maxdownload != *ftp->bytecountp)) {

      failf(data, "Received only partial file: %" CURL_FORMAT_CURL_OFF_T

            " bytes",

      failf(data, "Received only partial file: %" FORMAT_OFF_T " bytes",

            *ftp->bytecountp);

      result = CURLE_PARTIAL_FILE;

    }
@@ -3452,8 +3449,7 @@ static CURLcode ftp_range(struct connectdata *conn) 
    if((-1 == to) && (from>=0)) {

      /* X - */

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE %" CURL_FORMAT_CURL_OFF_T

                   " to end of file\n",

      DEBUGF(infof(conn->data, "FTP RANGE %" FORMAT_OFF_T " to end of file\n",

                   from));

    }

    else if(from < 0) {
@@ -3461,8 +3457,7 @@ static CURLcode ftp_range(struct connectdata *conn) 
      totalsize = -from;

      data->req.maxdownload = -from;

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE the last %" CURL_FORMAT_CURL_OFF_T

                   " bytes\n",

      DEBUGF(infof(conn->data, "FTP RANGE the last %" FORMAT_OFF_T " bytes\n",

                   totalsize));

    }

    else {
@@ -3470,13 +3465,12 @@ static CURLcode ftp_range(struct connectdata *conn) 
      totalsize = to-from;

      data->req.maxdownload = totalsize+1; /* include last byte */

      data->state.resume_from = from;

      DEBUGF(infof(conn->data, "FTP RANGE from %" CURL_FORMAT_CURL_OFF_T

                   " getting %" CURL_FORMAT_CURL_OFF_T " bytes\n",

      DEBUGF(infof(conn->data, "FTP RANGE from %" FORMAT_OFF_T

                   " getting %" FORMAT_OFF_T " bytes\n",

                   from, data->req.maxdownload));

    }

    DEBUGF(infof(conn->data, "range-download from %" CURL_FORMAT_CURL_OFF_T

                 " to %" CURL_FORMAT_CURL_OFF_T

                 ", totally %" CURL_FORMAT_CURL_OFF_T " bytes\n",

    DEBUGF(infof(conn->data, "range-download from %" FORMAT_OFF_T

                 " to %" FORMAT_OFF_T ", totally %" FORMAT_OFF_T " bytes\n",

                 from, to, data->req.maxdownload));

    ftpc->dont_check = TRUE; /* dont check for successful transfer */

  }