curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-10 06:02:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

curl: add my_setopt_long() and _offt()

Browse Source 
Two new dedicated functions for setting long and curl_off_t options with
curl_easy_setopt(). These make it easier to make sure we pass on the
right option (types) so that the --libcurl code also gets right.

Corrected a few errors.

Closes #16669
This commit is contained in:
Daniel Stenberg 2025-03-11 10:34:47 +01:00
parent 763fa529df
commit dc12ecd5db
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 197 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
src/tool_operate.c
View File

@ -404,14 +404,8 @@ static CURLcode pre_transfer(struct GlobalConfig *global,
} }
#endif #endif
if(uploadfilesize != -1) { if(uploadfilesize != -1)
struct OperationConfig *config = per->config; /* for the macro below */ my_setopt_offt(per->curl, CURLOPT_INFILESIZE_LARGE, uploadfilesize);
#ifdef CURL_DISABLE_LIBCURL_OPTION
(void)config;
(void)global;
#endif
my_setopt(per->curl, CURLOPT_INFILESIZE_LARGE, uploadfilesize);
}
} }
per->uploadfilesize = uploadfilesize; per->uploadfilesize = uploadfilesize;
per->start = tvnow(); per->start = tvnow();
@ -894,14 +888,13 @@ static CURLcode config2setopts(struct GlobalConfig *global,
#endif #endif
if(!config->tcp_nodelay) if(!config->tcp_nodelay)
my_setopt(curl, CURLOPT_TCP_NODELAY, 0L); my_setopt_long(curl, CURLOPT_TCP_NODELAY, 0);
if(config->tcp_fastopen) if(config->tcp_fastopen)
my_setopt(curl, CURLOPT_TCP_FASTOPEN, 1L); my_setopt_long(curl, CURLOPT_TCP_FASTOPEN, 1);
if(config->mptcp) if(config->mptcp)
my_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, my_setopt(curl, CURLOPT_OPENSOCKETFUNCTION, tool_socket_open_mptcp_cb);
tool_socket_open_mptcp_cb);
/* where to store */ /* where to store */
my_setopt(curl, CURLOPT_WRITEDATA, per); my_setopt(curl, CURLOPT_WRITEDATA, per);
@ -933,23 +926,22 @@ static CURLcode config2setopts(struct GlobalConfig *global,
curl_off_t num; curl_off_t num;
const char *p = env; const char *p = env;
if(!curlx_str_number(&p, &num, LONG_MAX)) if(!curlx_str_number(&p, &num, LONG_MAX))
my_setopt(curl, CURLOPT_BUFFERSIZE, (long)num); my_setopt_long(curl, CURLOPT_BUFFERSIZE, (long)num);
} }
else else
#endif #endif
if(config->recvpersecond && if(config->recvpersecond && (config->recvpersecond < BUFFER_SIZE))
(config->recvpersecond < BUFFER_SIZE))
/* use a smaller sized buffer for better sleeps */ /* use a smaller sized buffer for better sleeps */
my_setopt(curl, CURLOPT_BUFFERSIZE, (long)config->recvpersecond); my_setopt_long(curl, CURLOPT_BUFFERSIZE, (long)config->recvpersecond);
else else
my_setopt(curl, CURLOPT_BUFFERSIZE, BUFFER_SIZE); my_setopt_long(curl, CURLOPT_BUFFERSIZE, BUFFER_SIZE);
} }
my_setopt_str(curl, CURLOPT_URL, per->url); my_setopt_str(curl, CURLOPT_URL, per->url);
my_setopt(curl, CURLOPT_NOPROGRESS, my_setopt_long(curl, CURLOPT_NOPROGRESS,
global->noprogress || global->silent ? 1L : 0L); global->noprogress || global->silent);
if(config->no_body) if(config->no_body)
my_setopt(curl, CURLOPT_NOBODY, 1L); my_setopt_long(curl, CURLOPT_NOBODY, 1);
if(config->oauth_bearer) if(config->oauth_bearer)
my_setopt_str(curl, CURLOPT_XOAUTH2_BEARER, config->oauth_bearer); my_setopt_str(curl, CURLOPT_XOAUTH2_BEARER, config->oauth_bearer);
@ -969,8 +961,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_str(curl, CURLOPT_PROXYUSERPWD, config->proxyuserpwd); my_setopt_str(curl, CURLOPT_PROXYUSERPWD, config->proxyuserpwd);
/* new in libcurl 7.3 */ /* new in libcurl 7.3 */
my_setopt(curl, CURLOPT_HTTPPROXYTUNNEL, config->proxytunnel ? my_setopt_long(curl, CURLOPT_HTTPPROXYTUNNEL, config->proxytunnel);
1L : 0L);
/* new in libcurl 7.52.0 */ /* new in libcurl 7.52.0 */
if(config->preproxy) if(config->preproxy)
@ -991,14 +982,14 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.19.4 */ /* new in libcurl 7.19.4 */
my_setopt_str(curl, CURLOPT_NOPROXY, config->noproxy); my_setopt_str(curl, CURLOPT_NOPROXY, config->noproxy);
my_setopt(curl, CURLOPT_SUPPRESS_CONNECT_HEADERS, my_setopt_long(curl, CURLOPT_SUPPRESS_CONNECT_HEADERS,
config->suppress_connect_headers ? 1L : 0L); config->suppress_connect_headers);
my_setopt(curl, CURLOPT_FAILONERROR, config->failonerror ? 1L : 0L); my_setopt_long(curl, CURLOPT_FAILONERROR, config->failonerror);
my_setopt(curl, CURLOPT_REQUEST_TARGET, config->request_target); my_setopt_str(curl, CURLOPT_REQUEST_TARGET, config->request_target);
my_setopt(curl, CURLOPT_UPLOAD, per->uploadfile ? 1L : 0L); my_setopt_long(curl, CURLOPT_UPLOAD, !!per->uploadfile);
my_setopt(curl, CURLOPT_DIRLISTONLY, config->dirlistonly ? 1L : 0L); my_setopt_long(curl, CURLOPT_DIRLISTONLY, config->dirlistonly);
my_setopt(curl, CURLOPT_APPEND, config->ftp_append ? 1L : 0L); my_setopt_long(curl, CURLOPT_APPEND, config->ftp_append);
if(config->netrc_opt) if(config->netrc_opt)
my_setopt_enum(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL); my_setopt_enum(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
@ -1010,7 +1001,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
if(config->netrc_file) if(config->netrc_file)
my_setopt_str(curl, CURLOPT_NETRC_FILE, config->netrc_file); my_setopt_str(curl, CURLOPT_NETRC_FILE, config->netrc_file);
my_setopt(curl, CURLOPT_TRANSFERTEXT, config->use_ascii ? 1L : 0L); my_setopt_long(curl, CURLOPT_TRANSFERTEXT, config->use_ascii);
if(config->login_options) if(config->login_options)
my_setopt_str(curl, CURLOPT_LOGIN_OPTIONS, config->login_options); my_setopt_str(curl, CURLOPT_LOGIN_OPTIONS, config->login_options);
my_setopt_str(curl, CURLOPT_USERPWD, config->userpwd); my_setopt_str(curl, CURLOPT_USERPWD, config->userpwd);
@ -1019,7 +1010,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
per->errorbuffer = global_errorbuffer; per->errorbuffer = global_errorbuffer;
my_setopt(curl, CURLOPT_ERRORBUFFER, global_errorbuffer); my_setopt(curl, CURLOPT_ERRORBUFFER, global_errorbuffer);
} }
my_setopt(curl, CURLOPT_TIMEOUT_MS, config->timeout_ms); my_setopt_long(curl, CURLOPT_TIMEOUT_MS, config->timeout_ms);
switch(config->httpreq) { switch(config->httpreq) {
case TOOL_HTTPREQ_SIMPLEPOST: case TOOL_HTTPREQ_SIMPLEPOST:
@ -1030,8 +1021,8 @@ static CURLcode config2setopts(struct GlobalConfig *global,
else { else {
my_setopt_str(curl, CURLOPT_POSTFIELDS, my_setopt_str(curl, CURLOPT_POSTFIELDS,
curlx_dyn_ptr(&config->postdata)); curlx_dyn_ptr(&config->postdata));
my_setopt(curl, CURLOPT_POSTFIELDSIZE_LARGE, my_setopt_offt(curl, CURLOPT_POSTFIELDSIZE_LARGE,
(curl_off_t)curlx_dyn_len(&config->postdata)); curlx_dyn_len(&config->postdata));
} }
break; break;
case TOOL_HTTPREQ_MIMEPOST: case TOOL_HTTPREQ_MIMEPOST:
@ -1056,7 +1047,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.81.0 */ /* new in libcurl 7.81.0 */
if(config->mime_options) if(config->mime_options)
my_setopt(curl, CURLOPT_MIME_OPTIONS, config->mime_options); my_setopt_long(curl, CURLOPT_MIME_OPTIONS, config->mime_options);
/* new in libcurl 7.10.6 (default is Basic) */ /* new in libcurl 7.10.6 (default is Basic) */
if(config->authtype) if(config->authtype)
@ -1072,21 +1063,21 @@ static CURLcode config2setopts(struct GlobalConfig *global,
if(proto_http) { if(proto_http) {
long postRedir = 0; long postRedir = 0;
my_setopt(curl, CURLOPT_FOLLOWLOCATION, my_setopt_long(curl, CURLOPT_FOLLOWLOCATION,
config->followlocation ? 1L : 0L); config->followlocation);
my_setopt(curl, CURLOPT_UNRESTRICTED_AUTH, my_setopt_long(curl, CURLOPT_UNRESTRICTED_AUTH,
config->unrestricted_auth ? 1L : 0L); config->unrestricted_auth);
my_setopt_str(curl, CURLOPT_AWS_SIGV4, config->aws_sigv4); my_setopt_str(curl, CURLOPT_AWS_SIGV4, config->aws_sigv4);
my_setopt(curl, CURLOPT_AUTOREFERER, config->autoreferer ? 1L : 0L); my_setopt_long(curl, CURLOPT_AUTOREFERER, config->autoreferer);
/* new in libcurl 7.36.0 */ /* new in libcurl 7.36.0 */
if(config->proxyheaders) { if(config->proxyheaders) {
my_setopt_slist(curl, CURLOPT_PROXYHEADER, config->proxyheaders); my_setopt_slist(curl, CURLOPT_PROXYHEADER, config->proxyheaders);
my_setopt(curl, CURLOPT_HEADEROPT, (long)CURLHEADER_SEPARATE); my_setopt_long(curl, CURLOPT_HEADEROPT, CURLHEADER_SEPARATE);
} }
/* new in libcurl 7.5 */ /* new in libcurl 7.5 */
my_setopt(curl, CURLOPT_MAXREDIRS, config->maxredirs); my_setopt_long(curl, CURLOPT_MAXREDIRS, config->maxredirs);
if(config->httpversion) if(config->httpversion)
my_setopt_enum(curl, CURLOPT_HTTP_VERSION, config->httpversion); my_setopt_enum(curl, CURLOPT_HTTP_VERSION, config->httpversion);
@ -1099,7 +1090,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
postRedir |= CURL_REDIR_POST_302; postRedir |= CURL_REDIR_POST_302;
if(config->post303) if(config->post303)
postRedir |= CURL_REDIR_POST_303; postRedir |= CURL_REDIR_POST_303;
my_setopt(curl, CURLOPT_POSTREDIR, postRedir); my_setopt_long(curl, CURLOPT_POSTREDIR, postRedir);
/* new in libcurl 7.21.6 */ /* new in libcurl 7.21.6 */
if(config->encoding) if(config->encoding)
@ -1107,10 +1098,10 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.21.6 */ /* new in libcurl 7.21.6 */
if(config->tr_encoding) if(config->tr_encoding)
my_setopt(curl, CURLOPT_TRANSFER_ENCODING, 1L); my_setopt_long(curl, CURLOPT_TRANSFER_ENCODING, 1);
/* new in libcurl 7.64.0 */ /* new in libcurl 7.64.0 */
my_setopt(curl, CURLOPT_HTTP09_ALLOWED, my_setopt_long(curl, CURLOPT_HTTP09_ALLOWED,
config->http09_allowed ? 1L : 0L); config->http09_allowed);
if(result) { if(result) {
errorf(global, "HTTP/0.9 is not supported in this build"); errorf(global, "HTTP/0.9 is not supported in this build");
return result; return result;
@ -1120,18 +1111,18 @@ static CURLcode config2setopts(struct GlobalConfig *global,
if(proto_ftp) if(proto_ftp)
my_setopt_str(curl, CURLOPT_FTPPORT, config->ftpport); my_setopt_str(curl, CURLOPT_FTPPORT, config->ftpport);
my_setopt(curl, CURLOPT_LOW_SPEED_LIMIT, my_setopt_long(curl, CURLOPT_LOW_SPEED_LIMIT,
config->low_speed_limit); config->low_speed_limit);
my_setopt(curl, CURLOPT_LOW_SPEED_TIME, config->low_speed_time); my_setopt_long(curl, CURLOPT_LOW_SPEED_TIME, config->low_speed_time);
my_setopt(curl, CURLOPT_MAX_SEND_SPEED_LARGE, my_setopt_offt(curl, CURLOPT_MAX_SEND_SPEED_LARGE,
config->sendpersecond); config->sendpersecond);
my_setopt(curl, CURLOPT_MAX_RECV_SPEED_LARGE, my_setopt_offt(curl, CURLOPT_MAX_RECV_SPEED_LARGE,
config->recvpersecond); config->recvpersecond);
if(config->use_resume) if(config->use_resume)
my_setopt(curl, CURLOPT_RESUME_FROM_LARGE, config->resume_from); my_setopt_offt(curl, CURLOPT_RESUME_FROM_LARGE, config->resume_from);
else else
my_setopt(curl, CURLOPT_RESUME_FROM_LARGE, CURL_OFF_T_C(0)); my_setopt_offt(curl, CURLOPT_RESUME_FROM_LARGE, CURL_OFF_T_C(0));
my_setopt_str(curl, CURLOPT_KEYPASSWD, config->key_passwd); my_setopt_str(curl, CURLOPT_KEYPASSWD, config->key_passwd);
my_setopt_str(curl, CURLOPT_PROXY_KEYPASSWD, config->proxy_key_passwd); my_setopt_str(curl, CURLOPT_PROXY_KEYPASSWD, config->proxy_key_passwd);
@ -1155,7 +1146,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.56.0 */ /* new in libcurl 7.56.0 */
if(config->ssh_compression) if(config->ssh_compression)
my_setopt(curl, CURLOPT_SSH_COMPRESSION, 1L); my_setopt_long(curl, CURLOPT_SSH_COMPRESSION, 1);
if(!config->insecure_ok) { if(!config->insecure_ok) {
char *known = global->knownhosts; char *known = global->knownhosts;
@ -1268,7 +1259,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_str(curl, CURLOPT_SSL_EC_CURVES, config->ssl_ec_curves); my_setopt_str(curl, CURLOPT_SSL_EC_CURVES, config->ssl_ec_curves);
if(config->writeout) if(config->writeout)
my_setopt_str(curl, CURLOPT_CERTINFO, 1L); my_setopt_long(curl, CURLOPT_CERTINFO, 1);
if(feature_ssl) { if(feature_ssl) {
my_setopt_str(curl, CURLOPT_SSLCERT, config->cert); my_setopt_str(curl, CURLOPT_SSLCERT, config->cert);
@ -1284,28 +1275,28 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* libcurl default is strict verifyhost -> 1L, verifypeer -> 1L */ /* libcurl default is strict verifyhost -> 1L, verifypeer -> 1L */
if(config->insecure_ok) { if(config->insecure_ok) {
my_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L); my_setopt_long(curl, CURLOPT_SSL_VERIFYPEER, 0);
my_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); my_setopt_long(curl, CURLOPT_SSL_VERIFYHOST, 0);
} }
if(config->doh_insecure_ok) { if(config->doh_insecure_ok) {
my_setopt(curl, CURLOPT_DOH_SSL_VERIFYPEER, 0L); my_setopt_long(curl, CURLOPT_DOH_SSL_VERIFYPEER, 0);
my_setopt(curl, CURLOPT_DOH_SSL_VERIFYHOST, 0L); my_setopt_long(curl, CURLOPT_DOH_SSL_VERIFYHOST, 0);
} }
if(config->proxy_insecure_ok) { if(config->proxy_insecure_ok) {
my_setopt(curl, CURLOPT_PROXY_SSL_VERIFYPEER, 0L); my_setopt_long(curl, CURLOPT_PROXY_SSL_VERIFYPEER, 0);
my_setopt(curl, CURLOPT_PROXY_SSL_VERIFYHOST, 0L); my_setopt_long(curl, CURLOPT_PROXY_SSL_VERIFYHOST, 0);
} }
if(config->verifystatus) if(config->verifystatus)
my_setopt(curl, CURLOPT_SSL_VERIFYSTATUS, 1L); my_setopt_long(curl, CURLOPT_SSL_VERIFYSTATUS, 1);
if(config->doh_verifystatus) if(config->doh_verifystatus)
my_setopt(curl, CURLOPT_DOH_SSL_VERIFYSTATUS, 1L); my_setopt_long(curl, CURLOPT_DOH_SSL_VERIFYSTATUS, 1);
if(config->falsestart) if(config->falsestart)
my_setopt(curl, CURLOPT_SSL_FALSESTART, 1L); my_setopt_long(curl, CURLOPT_SSL_FALSESTART, 1);
my_setopt_SSLVERSION(curl, CURLOPT_SSLVERSION, my_setopt_SSLVERSION(curl, CURLOPT_SSLVERSION,
config->ssl_version | config->ssl_version_max); config->ssl_version | config->ssl_version_max);
@ -1315,18 +1306,12 @@ static CURLcode config2setopts(struct GlobalConfig *global,
{ {
long mask = long mask =
(config->ssl_allow_beast ? (config->ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) |
CURLSSLOPT_ALLOW_BEAST : 0) | (config->ssl_allow_earlydata ? CURLSSLOPT_EARLYDATA : 0) |
(config->ssl_allow_earlydata ? (config->ssl_no_revoke ? CURLSSLOPT_NO_REVOKE : 0) |
CURLSSLOPT_EARLYDATA : 0) | (config->ssl_revoke_best_effort ? CURLSSLOPT_REVOKE_BEST_EFFORT : 0) |
(config->ssl_no_revoke ? (config->native_ca_store ? CURLSSLOPT_NATIVE_CA : 0) |
CURLSSLOPT_NO_REVOKE : 0) | (config->ssl_auto_client_cert ? CURLSSLOPT_AUTO_CLIENT_CERT : 0);
(config->ssl_revoke_best_effort ?
CURLSSLOPT_REVOKE_BEST_EFFORT : 0) |
(config->native_ca_store ?
CURLSSLOPT_NATIVE_CA : 0) |
(config->ssl_auto_client_cert ?
CURLSSLOPT_AUTO_CLIENT_CERT : 0);
if(mask) if(mask)
my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, mask); my_setopt_bitmask(curl, CURLOPT_SSL_OPTIONS, mask);
@ -1334,12 +1319,10 @@ static CURLcode config2setopts(struct GlobalConfig *global,
{ {
long mask = long mask =
(config->proxy_ssl_allow_beast ? (config->proxy_ssl_allow_beast ? CURLSSLOPT_ALLOW_BEAST : 0) |
CURLSSLOPT_ALLOW_BEAST : 0) |
(config->proxy_ssl_auto_client_cert ? (config->proxy_ssl_auto_client_cert ?
CURLSSLOPT_AUTO_CLIENT_CERT : 0) | CURLSSLOPT_AUTO_CLIENT_CERT : 0) |
(config->proxy_native_ca_store ? (config->proxy_native_ca_store ? CURLSSLOPT_NATIVE_CA : 0);
CURLSSLOPT_NATIVE_CA : 0);
if(mask) if(mask)
my_setopt_bitmask(curl, CURLOPT_PROXY_SSL_OPTIONS, mask); my_setopt_bitmask(curl, CURLOPT_PROXY_SSL_OPTIONS, mask);
@ -1347,14 +1330,14 @@ static CURLcode config2setopts(struct GlobalConfig *global,
} }
if(config->path_as_is) if(config->path_as_is)
my_setopt(curl, CURLOPT_PATH_AS_IS, 1L); my_setopt_long(curl, CURLOPT_PATH_AS_IS, 1);
if(config->no_body || config->remote_time) { if(config->no_body || config->remote_time) {
/* no body or use remote time */ /* no body or use remote time */
my_setopt(curl, CURLOPT_FILETIME, 1L); my_setopt_long(curl, CURLOPT_FILETIME, 1);
} }
my_setopt(curl, CURLOPT_CRLF, config->crlf ? 1L : 0L); my_setopt_long(curl, CURLOPT_CRLF, config->crlf);
my_setopt_slist(curl, CURLOPT_QUOTE, config->quote); my_setopt_slist(curl, CURLOPT_QUOTE, config->quote);
my_setopt_slist(curl, CURLOPT_POSTQUOTE, config->postquote); my_setopt_slist(curl, CURLOPT_POSTQUOTE, config->postquote);
my_setopt_slist(curl, CURLOPT_PREQUOTE, config->prequote); my_setopt_slist(curl, CURLOPT_PREQUOTE, config->prequote);
@ -1396,11 +1379,10 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_str(curl, CURLOPT_COOKIEJAR, config->cookiejar); my_setopt_str(curl, CURLOPT_COOKIEJAR, config->cookiejar);
/* new in libcurl 7.9.7 */ /* new in libcurl 7.9.7 */
my_setopt(curl, CURLOPT_COOKIESESSION, config->cookiesession ? my_setopt_long(curl, CURLOPT_COOKIESESSION, config->cookiesession);
1L : 0L);
my_setopt_enum(curl, CURLOPT_TIMECONDITION, config->timecond); my_setopt_enum(curl, CURLOPT_TIMECONDITION, config->timecond);
my_setopt(curl, CURLOPT_TIMEVALUE_LARGE, config->condtime); my_setopt_offt(curl, CURLOPT_TIMEVALUE_LARGE, config->condtime);
my_setopt_str(curl, CURLOPT_CUSTOMREQUEST, config->customrequest); my_setopt_str(curl, CURLOPT_CUSTOMREQUEST, config->customrequest);
customrequest_helper(config, config->httpreq, config->customrequest); customrequest_helper(config, config->httpreq, config->customrequest);
my_setopt(curl, CURLOPT_STDERR, tool_stderr); my_setopt(curl, CURLOPT_STDERR, tool_stderr);
@ -1420,7 +1402,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
else if(per->uploadfile && !strcmp(per->uploadfile, ".")) { else if(per->uploadfile && !strcmp(per->uploadfile, ".")) {
/* when reading from stdin in non-blocking mode, we use the progress /* when reading from stdin in non-blocking mode, we use the progress
function to unpause a busy read */ function to unpause a busy read */
my_setopt(curl, CURLOPT_NOPROGRESS, 0L); my_setopt_long(curl, CURLOPT_NOPROGRESS, 0);
my_setopt(curl, CURLOPT_XFERINFOFUNCTION, tool_readbusy_cb); my_setopt(curl, CURLOPT_XFERINFOFUNCTION, tool_readbusy_cb);
my_setopt(curl, CURLOPT_XFERINFODATA, per); my_setopt(curl, CURLOPT_XFERINFODATA, per);
} }
@ -1441,7 +1423,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_slist(curl, CURLOPT_TELNETOPTIONS, config->telnet_options); my_setopt_slist(curl, CURLOPT_TELNETOPTIONS, config->telnet_options);
/* new in libcurl 7.7: */ /* new in libcurl 7.7: */
my_setopt(curl, CURLOPT_CONNECTTIMEOUT_MS, config->connecttimeout_ms); my_setopt_long(curl, CURLOPT_CONNECTTIMEOUT_MS, config->connecttimeout_ms);
if(config->doh_url) if(config->doh_url)
my_setopt_str(curl, CURLOPT_DOH_URL, config->doh_url); my_setopt_str(curl, CURLOPT_DOH_URL, config->doh_url);
@ -1478,17 +1460,17 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in libcurl 7.9.2: */ /* new in libcurl 7.9.2: */
if(config->disable_epsv) if(config->disable_epsv)
/* disable it */ /* disable it */
my_setopt(curl, CURLOPT_FTP_USE_EPSV, 0L); my_setopt_long(curl, CURLOPT_FTP_USE_EPSV, 0L);
/* new in libcurl 7.10.5 */ /* new in libcurl 7.10.5 */
if(config->disable_eprt) if(config->disable_eprt)
/* disable it */ /* disable it */
my_setopt(curl, CURLOPT_FTP_USE_EPRT, 0L); my_setopt_long(curl, CURLOPT_FTP_USE_EPRT, 0L);
if(global->tracetype != TRACE_NONE) { if(global->tracetype != TRACE_NONE) {
my_setopt(curl, CURLOPT_DEBUGFUNCTION, tool_debug_cb); my_setopt(curl, CURLOPT_DEBUGFUNCTION, tool_debug_cb);
my_setopt(curl, CURLOPT_DEBUGDATA, config); my_setopt(curl, CURLOPT_DEBUGDATA, config);
my_setopt(curl, CURLOPT_VERBOSE, 1L); my_setopt_long(curl, CURLOPT_VERBOSE, 1L);
} }
/* new in curl 7.9.3 */ /* new in curl 7.9.3 */
@ -1500,16 +1482,16 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in curl 7.10.7, extended in 7.19.4. Modified to use /* new in curl 7.10.7, extended in 7.19.4. Modified to use
CREATE_DIR_RETRY in 7.49.0 */ CREATE_DIR_RETRY in 7.49.0 */
my_setopt(curl, CURLOPT_FTP_CREATE_MISSING_DIRS, my_setopt_long(curl, CURLOPT_FTP_CREATE_MISSING_DIRS,
(long)(config->ftp_create_dirs ? (config->ftp_create_dirs ?
CURLFTP_CREATE_DIR_RETRY : CURLFTP_CREATE_DIR_NONE)); CURLFTP_CREATE_DIR_RETRY : CURLFTP_CREATE_DIR_NONE));
/* new in curl 7.10.8 */ /* new in curl 7.10.8 */
if(config->max_filesize) if(config->max_filesize)
my_setopt(curl, CURLOPT_MAXFILESIZE_LARGE, my_setopt_offt(curl, CURLOPT_MAXFILESIZE_LARGE,
config->max_filesize); config->max_filesize);
my_setopt(curl, CURLOPT_IPRESOLVE, config->ip_version); my_setopt_long(curl, CURLOPT_IPRESOLVE, config->ip_version);
/* new in curl 7.15.5 */ /* new in curl 7.15.5 */
if(config->ftp_ssl_reqd) if(config->ftp_ssl_reqd)
@ -1530,7 +1512,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in curl 7.19.4 */ /* new in curl 7.19.4 */
if(config->socks5_gssapi_nec) if(config->socks5_gssapi_nec)
my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_NEC, 1L); my_setopt_long(curl, CURLOPT_SOCKS5_GSSAPI_NEC, 1);
/* new in curl 7.55.0 */ /* new in curl 7.55.0 */
if(config->socks5_auth) if(config->socks5_auth)
@ -1549,22 +1531,20 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* curl 7.13.0 */ /* curl 7.13.0 */
my_setopt_str(curl, CURLOPT_FTP_ACCOUNT, config->ftp_account); my_setopt_str(curl, CURLOPT_FTP_ACCOUNT, config->ftp_account);
my_setopt(curl, CURLOPT_IGNORE_CONTENT_LENGTH, config->ignorecl ? my_setopt_long(curl, CURLOPT_IGNORE_CONTENT_LENGTH, config->ignorecl);
1L : 0L);
/* curl 7.14.2 */ /* curl 7.14.2 */
my_setopt(curl, CURLOPT_FTP_SKIP_PASV_IP, config->ftp_skip_ip ? my_setopt_long(curl, CURLOPT_FTP_SKIP_PASV_IP, config->ftp_skip_ip);
1L : 0L);
/* curl 7.15.1 */ /* curl 7.15.1 */
if(proto_ftp) if(proto_ftp)
my_setopt(curl, CURLOPT_FTP_FILEMETHOD, my_setopt_long(curl, CURLOPT_FTP_FILEMETHOD,
(long)config->ftp_filemethod); config->ftp_filemethod);
/* curl 7.15.2 */ /* curl 7.15.2 */
if(config->localport) { if(config->localport) {
my_setopt(curl, CURLOPT_LOCALPORT, config->localport); my_setopt_long(curl, CURLOPT_LOCALPORT, config->localport);
my_setopt_str(curl, CURLOPT_LOCALPORTRANGE, config->localportrange); my_setopt_long(curl, CURLOPT_LOCALPORTRANGE, config->localportrange);
} }
/* curl 7.15.5 */ /* curl 7.15.5 */
@ -1574,30 +1554,30 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* curl 7.16.0 */ /* curl 7.16.0 */
if(config->disable_sessionid) if(config->disable_sessionid)
/* disable it */ /* disable it */
my_setopt(curl, CURLOPT_SSL_SESSIONID_CACHE, 0L); my_setopt_long(curl, CURLOPT_SSL_SESSIONID_CACHE, 0);
/* curl 7.16.2 */ /* curl 7.16.2 */
if(config->raw) { if(config->raw) {
my_setopt(curl, CURLOPT_HTTP_CONTENT_DECODING, 0L); my_setopt_long(curl, CURLOPT_HTTP_CONTENT_DECODING, 0);
my_setopt(curl, CURLOPT_HTTP_TRANSFER_DECODING, 0L); my_setopt_long(curl, CURLOPT_HTTP_TRANSFER_DECODING, 0);
} }
/* curl 7.17.1 */ /* curl 7.17.1 */
if(!config->nokeepalive) { if(!config->nokeepalive) {
my_setopt(curl, CURLOPT_TCP_KEEPALIVE, 1L); my_setopt_long(curl, CURLOPT_TCP_KEEPALIVE, 1);
if(config->alivetime) { if(config->alivetime) {
my_setopt(curl, CURLOPT_TCP_KEEPIDLE, config->alivetime); my_setopt_long(curl, CURLOPT_TCP_KEEPIDLE, config->alivetime);
my_setopt(curl, CURLOPT_TCP_KEEPINTVL, config->alivetime); my_setopt_long(curl, CURLOPT_TCP_KEEPINTVL, config->alivetime);
} }
if(config->alivecnt) if(config->alivecnt)
my_setopt(curl, CURLOPT_TCP_KEEPCNT, config->alivecnt); my_setopt_long(curl, CURLOPT_TCP_KEEPCNT, config->alivecnt);
} }
else else
my_setopt(curl, CURLOPT_TCP_KEEPALIVE, 0L); my_setopt_long(curl, CURLOPT_TCP_KEEPALIVE, 0);
/* curl 7.20.0 */ /* curl 7.20.0 */
if(config->tftp_blksize && proto_tftp) if(config->tftp_blksize && proto_tftp)
my_setopt(curl, CURLOPT_TFTP_BLKSIZE, config->tftp_blksize); my_setopt_long(curl, CURLOPT_TFTP_BLKSIZE, config->tftp_blksize);
if(config->mail_from) if(config->mail_from)
my_setopt_str(curl, CURLOPT_MAIL_FROM, config->mail_from); my_setopt_str(curl, CURLOPT_MAIL_FROM, config->mail_from);
@ -1606,15 +1586,15 @@ static CURLcode config2setopts(struct GlobalConfig *global,
my_setopt_slist(curl, CURLOPT_MAIL_RCPT, config->mail_rcpt); my_setopt_slist(curl, CURLOPT_MAIL_RCPT, config->mail_rcpt);
/* curl 7.69.x */ /* curl 7.69.x */
my_setopt(curl, CURLOPT_MAIL_RCPT_ALLOWFAILS, my_setopt_long(curl, CURLOPT_MAIL_RCPT_ALLOWFAILS,
config->mail_rcpt_allowfails ? 1L : 0L); config->mail_rcpt_allowfails);
/* curl 7.20.x */ /* curl 7.20.x */
if(config->ftp_pret) if(config->ftp_pret)
my_setopt(curl, CURLOPT_FTP_USE_PRET, 1L); my_setopt_long(curl, CURLOPT_FTP_USE_PRET, 1);
if(config->create_file_mode) if(config->create_file_mode)
my_setopt(curl, CURLOPT_NEW_FILE_PERMS, config->create_file_mode); my_setopt_long(curl, CURLOPT_NEW_FILE_PERMS, config->create_file_mode);
if(config->proto_present) if(config->proto_present)
my_setopt_str(curl, CURLOPT_PROTOCOLS_STR, config->proto_str); my_setopt_str(curl, CURLOPT_PROTOCOLS_STR, config->proto_str);
@ -1657,8 +1637,8 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in 7.22.0 */ /* new in 7.22.0 */
if(config->gssapi_delegation) if(config->gssapi_delegation)
my_setopt_str(curl, CURLOPT_GSSAPI_DELEGATION, my_setopt_long(curl, CURLOPT_GSSAPI_DELEGATION,
config->gssapi_delegation); config->gssapi_delegation);
if(config->mail_auth) if(config->mail_auth)
my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth); my_setopt_str(curl, CURLOPT_MAIL_AUTH, config->mail_auth);
@ -1669,10 +1649,10 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in 7.31.0 */ /* new in 7.31.0 */
if(config->sasl_ir) if(config->sasl_ir)
my_setopt(curl, CURLOPT_SASL_IR, 1L); my_setopt_long(curl, CURLOPT_SASL_IR, 1);
if(config->noalpn) { if(config->noalpn) {
my_setopt(curl, CURLOPT_SSL_ENABLE_ALPN, 0L); my_setopt_long(curl, CURLOPT_SSL_ENABLE_ALPN, 0);
} }
/* new in 7.40.0, abstract support added in 7.53.0 */ /* new in 7.40.0, abstract support added in 7.53.0 */
@ -1693,21 +1673,21 @@ static CURLcode config2setopts(struct GlobalConfig *global,
/* new in 7.47.0 */ /* new in 7.47.0 */
if(config->expect100timeout_ms > 0) if(config->expect100timeout_ms > 0)
my_setopt_str(curl, CURLOPT_EXPECT_100_TIMEOUT_MS, my_setopt_long(curl, CURLOPT_EXPECT_100_TIMEOUT_MS,
config->expect100timeout_ms); config->expect100timeout_ms);
/* new in 7.48.0 */ /* new in 7.48.0 */
if(config->tftp_no_options && proto_tftp) if(config->tftp_no_options && proto_tftp)
my_setopt(curl, CURLOPT_TFTP_NO_OPTIONS, 1L); my_setopt_long(curl, CURLOPT_TFTP_NO_OPTIONS, 1);
/* new in 7.59.0 */ /* new in 7.59.0 */
if(config->happy_eyeballs_timeout_ms != CURL_HET_DEFAULT) if(config->happy_eyeballs_timeout_ms != CURL_HET_DEFAULT)
my_setopt(curl, CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS, my_setopt_long(curl, CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS,
config->happy_eyeballs_timeout_ms); config->happy_eyeballs_timeout_ms);
/* new in 7.60.0 */ /* new in 7.60.0 */
if(config->haproxy_protocol) if(config->haproxy_protocol)
my_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L); my_setopt_long(curl, CURLOPT_HAPROXYPROTOCOL, 1);
/* new in 8.2.0 */ /* new in 8.2.0 */
if(config->haproxy_clientip) if(config->haproxy_clientip)
@ -1715,7 +1695,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
config->haproxy_clientip); config->haproxy_clientip);
if(config->disallow_username_in_url) if(config->disallow_username_in_url)
my_setopt(curl, CURLOPT_DISALLOW_USERNAME_IN_URL, 1L); my_setopt_long(curl, CURLOPT_DISALLOW_USERNAME_IN_URL, 1);
if(config->altsvc) if(config->altsvc)
my_setopt_str(curl, CURLOPT_ALTSVC, config->altsvc); my_setopt_str(curl, CURLOPT_ALTSVC, config->altsvc);
@ -1753,7 +1733,7 @@ static CURLcode config2setopts(struct GlobalConfig *global,
} }
/* new in 8.13.0 */ /* new in 8.13.0 */
if(config->upload_flags) if(config->upload_flags)
my_setopt(curl, CURLOPT_UPLOAD_FLAGS, (long)config->upload_flags); my_setopt_long(curl, CURLOPT_UPLOAD_FLAGS, config->upload_flags);
return result; return result;
} }

126
src/tool_setopt.c
View File

@ -601,6 +601,50 @@ nomem:
return ret; return ret;
} }
/* options that set long */
CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
long lval)
{
long defval = 0L;
const struct NameValue *nv = NULL;
CURLcode ret = CURLE_OK;
DEBUGASSERT(tag < CURLOPTTYPE_OBJECTPOINT);
for(nv = setopt_nv_CURLNONZERODEFAULTS; nv->name; nv++) {
if(!strcmp(name, nv->name)) {
defval = nv->value;
break; /* found it */
}
}
ret = curl_easy_setopt(curl, tag, lval);
if((lval != defval) && global->libcurl && !ret) {
/* we only use this for real if --libcurl was used */
CODE2("curl_easy_setopt(hnd, %s, %ldL);", name, lval);
}
nomem:
return ret;
}
/* options that set curl_off_t */
CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
curl_off_t lval)
{
CURLcode ret = CURLE_OK;
DEBUGASSERT((tag >= CURLOPTTYPE_OFF_T) && (tag < CURLOPTTYPE_BLOB));
ret = curl_easy_setopt(curl, tag, lval);
if(global->libcurl && !ret && lval) {
/* we only use this for real if --libcurl was used */
CODE2("curl_easy_setopt(hnd, %s, (curl_off_t)%"
CURL_FORMAT_CURL_OFF_T ");", name, lval);
}
nomem:
return ret;
}
/* generic setopt wrapper for all other options. /* generic setopt wrapper for all other options.
* Some type information is encoded in the tag value. */ * Some type information is encoded in the tag value. */
CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
@ -608,87 +652,47 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
const char *name, CURLoption tag, ...) const char *name, CURLoption tag, ...)
{ {
va_list arg; va_list arg;
char buf[256];
const char *value = NULL; const char *value = NULL;
bool remark = FALSE; bool remark = FALSE;
bool skip = FALSE; bool skip = FALSE;
bool escape = FALSE; bool escape = FALSE;
char *escaped = NULL; char *escaped = NULL;
CURLcode ret = CURLE_OK; CURLcode ret = CURLE_OK;
void *pval;
va_start(arg, tag); va_start(arg, tag);
if(tag < CURLOPTTYPE_OBJECTPOINT) { DEBUGASSERT(tag >= CURLOPTTYPE_OBJECTPOINT);
/* Value is expected to be a long */ DEBUGASSERT((tag < CURLOPTTYPE_OFF_T) || (tag >= CURLOPTTYPE_BLOB));
long lval = va_arg(arg, long);
long defval = 0L;
const struct NameValue *nv = NULL;
for(nv = setopt_nv_CURLNONZERODEFAULTS; nv->name; nv++) {
if(!strcmp(name, nv->name)) {
defval = nv->value;
break; /* found it */
}
}
msnprintf(buf, sizeof(buf), "%ldL", lval); /* we never set _BLOB options in the curl tool */
value = buf; DEBUGASSERT(tag < CURLOPTTYPE_BLOB);
ret = curl_easy_setopt(curl, tag, lval);
if(lval == defval)
skip = TRUE;
}
else if(tag < CURLOPTTYPE_OFF_T) {
/* Value is some sort of object pointer */
void *pval = va_arg(arg, void *);
/* function pointers are never printable */ /* Value is some sort of object pointer */
if(tag >= CURLOPTTYPE_FUNCTIONPOINT) { pval = va_arg(arg, void *);
if(pval) {
value = "function pointer";
remark = TRUE;
}
else
skip = TRUE;
}
else if(pval && str) { /* function pointers are never printable */
value = (char *)pval; if(tag >= CURLOPTTYPE_FUNCTIONPOINT) {
escape = TRUE; if(pval) {
} value = "function pointer";
else if(pval) {
value = "object pointer";
remark = TRUE; remark = TRUE;
} }
else else
skip = TRUE; skip = TRUE;
ret = curl_easy_setopt(curl, tag, pval);
} }
else if(tag < CURLOPTTYPE_BLOB) {
/* Value is expected to be curl_off_t */
curl_off_t oval = va_arg(arg, curl_off_t);
msnprintf(buf, sizeof(buf),
"(curl_off_t)%" CURL_FORMAT_CURL_OFF_T, oval);
value = buf;
ret = curl_easy_setopt(curl, tag, oval);
if(!oval) else if(pval && str) {
skip = TRUE; value = (char *)pval;
escape = TRUE;
} }
else { else if(pval) {
/* Value is a blob */ value = "object pointer";
void *pblob = va_arg(arg, void *); remark = TRUE;
/* blobs are never printable */
if(pblob) {
value = "blob pointer";
remark = TRUE;
}
else
skip = TRUE;
ret = curl_easy_setopt(curl, tag, pblob);
} }
else
skip = TRUE;
ret = curl_easy_setopt(curl, tag, pval);
va_end(arg); va_end(arg);

20
src/tool_setopt.h
View File

@ -97,6 +97,12 @@ CURLcode tool_setopt_mimepost(CURL *curl, struct GlobalConfig *config,
CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config, CURLcode tool_setopt_slist(CURL *curl, struct GlobalConfig *config,
const char *name, CURLoption tag, const char *name, CURLoption tag,
struct curl_slist *list); struct curl_slist *list);
CURLcode tool_setopt_long(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
long lval);
CURLcode tool_setopt_offt(CURL *curl, struct GlobalConfig *global,
const char *name, CURLoption tag,
curl_off_t lval);
CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global, CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
struct OperationConfig *config, struct OperationConfig *config,
const char *name, CURLoption tag, ...); const char *name, CURLoption tag, ...);
@ -104,6 +110,12 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
#define my_setopt(x,y,z) \ #define my_setopt(x,y,z) \
SETOPT_CHECK(tool_setopt(x, FALSE, global, config, #y, y, z), y) SETOPT_CHECK(tool_setopt(x, FALSE, global, config, #y, y, z), y)
#define my_setopt_long(x,y,z) \
SETOPT_CHECK(tool_setopt_long(x, global, #y, y, z), y)
#define my_setopt_offt(x,y,z) \
SETOPT_CHECK(tool_setopt_offt(x, global, #y, y, z), y)
#define my_setopt_str(x,y,z) \ #define my_setopt_str(x,y,z) \
SETOPT_CHECK(tool_setopt(x, TRUE, global, config, #y, y, z), y) SETOPT_CHECK(tool_setopt(x, TRUE, global, config, #y, y, z), y)
@ -133,7 +145,13 @@ CURLcode tool_setopt(CURL *curl, bool str, struct GlobalConfig *global,
#define my_setopt(x,y,z) \ #define my_setopt(x,y,z) \
SETOPT_CHECK(curl_easy_setopt(x, y, z), y) SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
#define my_setopt_str(x,y,z) \ #define my_setopt_long(x,y,z) \
SETOPT_CHECK(curl_easy_setopt(x, y, (long)(z)), y)
#define my_setopt_offt(x,y,z) \
SETOPT_CHECK(curl_easy_setopt(x, y, (curl_off_t)(z)), y)
#define my_setopt_str(x,y,z) \
SETOPT_CHECK(curl_easy_setopt(x, y, z), y) SETOPT_CHECK(curl_easy_setopt(x, y, z), y)
#define my_setopt_enum(x,y,z) \ #define my_setopt_enum(x,y,z) \

2
src/tool_ssls.c
View File

@ -51,7 +51,7 @@ static CURLcode tool_ssls_easy(struct GlobalConfig *global,
if(!result && (global->tracetype != TRACE_NONE)) { if(!result && (global->tracetype != TRACE_NONE)) {
my_setopt(*peasy, CURLOPT_DEBUGFUNCTION, tool_debug_cb); my_setopt(*peasy, CURLOPT_DEBUGFUNCTION, tool_debug_cb);
my_setopt(*peasy, CURLOPT_DEBUGDATA, config); my_setopt(*peasy, CURLOPT_DEBUGDATA, config);
my_setopt(*peasy, CURLOPT_VERBOSE, 1L); my_setopt_long(*peasy, CURLOPT_VERBOSE, 1L);
} }
return result; return result;
} }