romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-05 21:16:13 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_getparam: build post data using dynbuf (more)

Browse source
This commit is contained in:
Daniel Stenberg 2024-01-08 17:00:05 +01:00
parent 1dba44b2f1
commit 1f4433dad4
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
5 changed files with 26 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/tool_getparam.c
View file

@ -803,7 +803,7 @@ static ParameterError set_data(char subletter,
if(subletter == 'e') { /* --data-urlencode */
err = data_urlencode(global, nextarg, &postdata, &size);
if(err)
goto done;
return err;
}
else if('@' == *nextarg && (subletter != 'r')) {
/* the data begins with a '@' letter, it means that a file name
@ -819,8 +819,7 @@ static ParameterError set_data(char subletter,
file = fopen(nextarg, "rb");
if(!file) {
errorf(global, "Failed to open %s", nextarg);
err = PARAM_READ_ERROR;
goto done;
return PARAM_READ_ERROR;
}
}
@ -837,64 +836,39 @@ static ParameterError set_data(char subletter,
if(file && (file != stdin))
fclose(file);
if(err)
goto done;
return err;
if(!postdata) {
/* no data from the file, point to a zero byte string to make this
get sent as a POST anyway */
postdata = strdup("");
if(!postdata) {
err = PARAM_NO_MEM;
goto done;
}
if(!postdata)
return PARAM_NO_MEM;
}
}
else {
err = getstr(&postdata, nextarg, ALLOW_BLANK);
if(err)
goto done;
return err;
if(postdata)
size = strlen(postdata);
}
if(subletter == 'f')
config->jsoned = TRUE;
if(config->postfields) {
/* we already have a string, append this one - perhaps with a separator */
struct curlx_dynbuf out;
curlx_dyn_init(&out, MAX_FILE2MEMORY);
if(curlx_dyn_addn(&out, config->postfields,
(size_t)config->postfieldsize))
if(curlx_dyn_len(&config->postdata)) {
/* skip separator append for --json */
if(!err && (subletter != 'f') &&
curlx_dyn_addn(&config->postdata, "&", 1))
err = PARAM_NO_MEM;
/* skip the separator append for --json */
if(!err && (subletter != 'f') && curlx_dyn_addn(&out, "&", 1))
err = PARAM_NO_MEM;
if(!err && curlx_dyn_addn(&out, postdata, size))
err = PARAM_NO_MEM;
config->postfieldsize = curlx_dyn_len(&out);
free(config->postfields);
Curl_safefree(postdata);
config->postfields = curlx_dyn_ptr(&out);
}
else {
config->postfields = postdata;
config->postfieldsize = curlx_uztoso(size);
}
/*
We can't set the request type here, as this data might be used in
a simple GET if -G is used. Already or soon.
if(!err && curlx_dyn_addn(&config->postdata, postdata, size))
err = PARAM_NO_MEM;
if(SetHTTPrequest(HTTPREQ_SIMPLEPOST, &config->httpreq)) {
Curl_safefree(postdata);
return PARAM_BAD_USE;
}
*/
Curl_safefree(postdata);
done:
config->postfields = curlx_dyn_ptr(&config->postdata);
return err;
}