tool_operate: Moved command line argument parsing into separate function

This commit is contained in:
Steve Holme 2014-02-02 14:58:25 +00:00
parent 8034b08e0e
commit c35d05aa62
3 changed files with 56 additions and 40 deletions

View file

@ -1847,3 +1847,47 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
return PARAM_OK;
}
ParameterError parse_args(struct Configurable *config, int argc,
argv_item_t argv[])
{
int i;
bool stillflags;
char *orig_opt;
ParameterError result = PARAM_OK;
for(i = 1, stillflags = TRUE; i < argc && !result; i++) {
orig_opt = argv[i];
if(stillflags && ('-' == argv[i][0])) {
char *nextarg;
bool passarg;
char *flag = argv[i];
if(curlx_strequal("--", argv[i]))
/* This indicates the end of the flags and thus enables the
following (URL) argument to start with -. */
stillflags = FALSE;
else {
nextarg = (i < (argc - 1)) ? argv[i + 1] : NULL;
result = getparameter(flag, nextarg, &passarg, config);
if(!result && passarg)
i++; /* we're supposed to skip this */
}
}
else {
bool used;
/* Just add the URL please */
result = getparameter((char *)"--url", argv[i], &used, config);
}
}
if(result && result != PARAM_HELP_REQUESTED) {
const char *reason = param2text(result);
helpf(config->errors, "option %s: %s\n", orig_opt, reason);
}
return result;
}