romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 12:53:06 +03:00
Code Issues Projects Releases Packages Wiki Activity

tool_getparam: move the --url-query logic into url_query()

Browse source 
This function is not doing post at all so it was always weirdly placed.
This commit is contained in:
Daniel Stenberg 2024-01-08 17:00:05 +01:00
parent 8aecfad9e6
commit 3870d03b5d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 42 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

81
src/tool_getparam.c
View file

@ -760,6 +760,43 @@ static const struct LongShort *single(char letter)
return singles[letter - ' '];
}
#define MAX_QUERY_LEN 100000 /* larger is not likely to ever work */
static ParameterError url_query(char *nextarg,
struct GlobalConfig *global,
struct OperationConfig *config)
{
size_t size = 0;
ParameterError err = PARAM_OK;
char *query;
struct curlx_dynbuf dyn;
curlx_dyn_init(&dyn, MAX_QUERY_LEN);
if(*nextarg == '+') {
/* use without encoding */
query = strdup(&nextarg[1]);
if(!query)
err = PARAM_NO_MEM;
}
else
err = data_urlencode(global, nextarg, &query, &size);
if(!err) {
if(config->query) {
CURLcode result = curlx_dyn_addf(&dyn, "%s&%s", config->query, query);
free(query);
if(result)
err = PARAM_NO_MEM;
else {
free(config->query);
config->query = curlx_dyn_ptr(&dyn);
}
}
else
config->query = query;
}
return err;
}
static ParameterError set_data(char subletter,
char *nextarg,
struct GlobalConfig *global,
@ -770,43 +807,7 @@ static ParameterError set_data(char subletter,
size_t size = 0;
ParameterError err = PARAM_OK;
if(subletter == 'g') { /* --url-query */
#define MAX_QUERY_LEN 100000 /* larger is not likely to ever work */
char *query;
struct curlx_dynbuf dyn;
curlx_dyn_init(&dyn, MAX_QUERY_LEN);
if(*nextarg == '+') {
/* use without encoding */
query = strdup(&nextarg[1]);
if(!query) {
err = PARAM_NO_MEM;
goto done;
}
}
else {
err = data_urlencode(global, nextarg, &query, &size);
if(err)
goto done;
}
if(config->query) {
CURLcode result =
curlx_dyn_addf(&dyn, "%s&%s", config->query, query);
free(query);
if(result) {
err = PARAM_NO_MEM;
goto done;
}
free(config->query);
config->query = curlx_dyn_ptr(&dyn);
}
else
config->query = query;
goto done; /* this is not a POST argument at all */
}
else if(subletter == 'e') { /* --data-urlencode */
if(subletter == 'e') { /* --data-urlencode */
err = data_urlencode(global, nextarg, &postdata, &size);
if(err)
goto done;
@ -1828,10 +1829,12 @@ ParameterError getparameter(const char *flag, /* f or -long-flag */
case ONEOPT('d', 'b'): /* --data-binary */
case ONEOPT('d', 'e'): /* --data-urlencode */
case ONEOPT('d', 'f'): /* --json */
case ONEOPT('d', 'g'): /* --url-query */
case ONEOPT('d', 'r'): /* --data-raw */
err = set_data(subletter, nextarg, global, config);
break;
break;
case ONEOPT('d', 'g'): /* --url-query */
err = url_query(nextarg, global, config);
break;
case ONEOPT('D', '\0'): /* --dump-header */
err = getstr(&config->headerfile, nextarg, DENY_BLANK);
break;