moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

tool_operate: Moved argument parsing into operate()

This commit is contained in:
Steve Holme 2014-02-06 19:31:44 +00:00
parent 5204b45ff9
commit dd97828df7
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/tool_operate.c
View File

@ -235,17 +235,6 @@ static int operate_do(struct Configurable *config, int argc,
** from outside of nested loops further down below.
*/
/* Parse the command line arguments */
res = parse_args(config, argc, argv);
if(res) {
if(res != PARAM_HELP_REQUESTED)
res = CURLE_FAILED_INIT;
else
res = CURLE_OK;
goto quit_curl;
}
if(config->userpwd && !config->xoauth2_bearer) {
res = checkpasswd("host", &config->userpwd);
if(res)
@ -1855,9 +1844,19 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
}
}
if(!result)
if(!result) {
/* Parse the command line arguments */
ParameterError res = parse_args(config, argc, argv);
if(res) {
if(res != PARAM_HELP_REQUESTED)
result = CURLE_FAILED_INIT;
else
result = CURLE_OK;
}
/* Perform the main operation */
result = operate_do(config, argc, argv);
else
result = operate_do(config, argc, argv);
}
/* Perform the cleanup */
operate_free(config);