mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-11-27 05:50:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

--libcurl: hide setopt() calls setting default options

Browse Source 
And additionally, don't show function or object pointers actual value
since they make no sense to anyone. Show 'functionpointer' and
'objectpointer' instead.
This commit is contained in:
Daniel Stenberg 2010-07-06 22:13:22 +02:00
parent 12533bb184
commit a57611e308
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.c
View File

@ -4081,6 +4081,7 @@ static CURLcode _my_setopt(CURL *curl, bool str, struct Configurable *config,
char *bufp; char *bufp;
char value[256]; char value[256];
bool remark=FALSE; bool remark=FALSE;
bool skip=FALSE;
va_start(arg, tag); va_start(arg, tag);
@ -4088,7 +4089,8 @@ static CURLcode _my_setopt(CURL *curl, bool str, struct Configurable *config,
long lval = va_arg(arg, long); long lval = va_arg(arg, long);
snprintf(value, sizeof(value), "%ld", lval); snprintf(value, sizeof(value), "%ld", lval);
ret = curl_easy_setopt(curl, tag, lval); ret = curl_easy_setopt(curl, tag, lval);
if(!lval)
skip = TRUE;
} }
else if(tag < CURLOPTTYPE_OFF_T) { else if(tag < CURLOPTTYPE_OFF_T) {
void *pval = va_arg(arg, void *); void *pval = va_arg(arg, void *);
@ -4097,32 +4099,36 @@ static CURLcode _my_setopt(CURL *curl, bool str, struct Configurable *config,
/* function pointers are never printable */ /* function pointers are never printable */
if (tag >= CURLOPTTYPE_FUNCTIONPOINT) { if (tag >= CURLOPTTYPE_FUNCTIONPOINT) {
if (pval) { if (pval) {
snprintf(value, sizeof(value), "%p", pval); strcpy(value, "functionpointer"); /* 'value' fits 256 bytes */
remark = TRUE; remark = TRUE;
} }
else else
strcpy(value, "NULL"); skip = TRUE;
} }
else if(pval && str) else if(pval && str)
snprintf(value, sizeof(value), "\"%s\"", (char *)ptr); snprintf(value, sizeof(value), "\"%s\"", (char *)ptr);
else if(pval) { else if(pval) {
snprintf(value, sizeof(value), "%p", pval); strcpy(value, "objectpointer"); /* 'value' fits 256 bytes */
remark = TRUE; remark = TRUE;
} }
else { else
strcpy(value, "NULL"); /* value fits more than 5 bytes */ skip = TRUE;
}
ret = curl_easy_setopt(curl, tag, pval); ret = curl_easy_setopt(curl, tag, pval);
} }
else { else {
curl_off_t oval = va_arg(arg, curl_off_t); curl_off_t oval = va_arg(arg, curl_off_t);
snprintf(value, sizeof(value), "(curl_off_t)%" CURL_FORMAT_CURL_OFF_T, oval); snprintf(value, sizeof(value),
"(curl_off_t)%" CURL_FORMAT_CURL_OFF_T, oval);
ret = curl_easy_setopt(curl, tag, oval); ret = curl_easy_setopt(curl, tag, oval);
if(!oval)
skip = TRUE;
} }
if(config->libcurl) { if(config->libcurl && !skip) {
/* we only use this for real if --libcurl was used */ /* we only use this for real if --libcurl was used */
bufp = curlx_maprintf("%scurl_easy_setopt(hnd, %s, %s);%s", bufp = curlx_maprintf("%scurl_easy_setopt(hnd, %s, %s);%s",
@ -5002,7 +5008,8 @@ operate(struct Configurable *config, int argc, argv_item_t argv[])
my_setopt(curl, CURLOPT_BUFFERSIZE, config->recvpersecond); my_setopt(curl, CURLOPT_BUFFERSIZE, config->recvpersecond);
/* size of uploaded file: */ /* size of uploaded file: */
my_setopt(curl, CURLOPT_INFILESIZE_LARGE, uploadfilesize); if(uploadfilesize != -1)
my_setopt(curl, CURLOPT_INFILESIZE_LARGE, uploadfilesize);
my_setopt_str(curl, CURLOPT_URL, url); /* what to fetch */ my_setopt_str(curl, CURLOPT_URL, url); /* what to fetch */
my_setopt_str(curl, CURLOPT_PROXY, config->proxy); /* proxy to use */ my_setopt_str(curl, CURLOPT_PROXY, config->proxy); /* proxy to use */
if(config->proxy) if(config->proxy)