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

tool_main: Moved easy handle into global config structure

Browse source
This commit is contained in:
Steve Holme 2014-02-23 14:32:22 +00:00
parent 0d9ddf91ca
commit 59b5ef444e
5 changed files with 42 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tool_getparam.c
View file

@ -1798,32 +1798,36 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
return PARAM_OK;
}
ParameterError parse_args(struct OperationConfig *config, int argc,
ParameterError parse_args(struct GlobalConfig *config, int argc,
argv_item_t argv[])
{
int i;
bool stillflags;
char *orig_opt;
ParameterError result = PARAM_OK;
struct OperationConfig *operation = config->first;
for(i = 1, stillflags = TRUE; i < argc && !result; i++) {
orig_opt = argv[i];
if(curlx_strequal(":", argv[i]) &&
(config->url_list && config->url_list->url)) {
(operation->url_list && operation->url_list->url)) {
/* Allocate the next config */
config->next = malloc(sizeof(struct OperationConfig));
if(config->next) {
operation->next = malloc(sizeof(struct OperationConfig));
if(operation->next) {
/* Initialise the newly created config */
config_init(config->next);
config_init(operation->next);
/* Copy the easy handle */
config->next->easy = config->easy;
operation->next->easy = config->easy;
/* Update the last operation pointer */
config->last = operation->next;
/* Move onto the new config */
config->next->prev = config;
config = config->next;
operation->next->prev = operation;
operation = operation->next;
/* Reset the flag indicator */
stillflags = TRUE;
@ -1843,7 +1847,7 @@ ParameterError parse_args(struct OperationConfig *config, int argc,
else {
nextarg = (i < (argc - 1)) ? argv[i + 1] : NULL;
result = getparameter(flag, nextarg, &passarg, config);
result = getparameter(flag, nextarg, &passarg, operation);
if(!result && passarg)
i++; /* we're supposed to skip this */
}
@ -1852,7 +1856,7 @@ ParameterError parse_args(struct OperationConfig *config, int argc,
bool used;
/* Just add the URL please */
result = getparameter((char *)"--url", argv[i], &used, config);
result = getparameter((char *)"--url", argv[i], &used, operation);
}
}
@ -1863,9 +1867,9 @@ ParameterError parse_args(struct OperationConfig *config, int argc,
const char *reason = param2text(result);
if(!curlx_strequal(":", orig_opt))
helpf(config->errors, "option %s: %s\n", orig_opt, reason);
helpf(operation->errors, "option %s: %s\n", orig_opt, reason);
else
helpf(config->errors, "%s\n", reason);
helpf(operation->errors, "%s\n", reason);
}
return result;