oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

change the way arg_collect works; it's still quite horrible though

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7184 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1999-10-18 17:13:43 +00:00
parent 2dff026a5c
commit a8827e2cb4
1 changed files with 33 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/roken/getarg.c
View File

@@ -347,7 +347,7 @@ arg_match_long(struct getargs *args, size_t num_args,
return ARG_ERR_NO_MATCH; return ARG_ERR_NO_MATCH;
} }
if(*optarg == '\0' && !ISFLAG(*current)) if(*optarg == '\0' && !ISFLAG(*current) && current->type != arg_collect)
return ARG_ERR_NO_MATCH; return ARG_ERR_NO_MATCH;
switch(current->type){ switch(current->type){
case arg_integer: case arg_integer:
@@ -395,7 +395,8 @@ arg_match_long(struct getargs *args, size_t num_args,
} }
case arg_collect:{ case arg_collect:{
struct getarg_collect_info *c = current->value; struct getarg_collect_info *c = current->value;
return (*c->func)(optarg + 1, argc, rargv, optind, c->data); int o = argv - rargv[*optind];
return (*c->func)(FALSE, argc, rargv, optind, &o, c->data);
} }
default: default:
abort (); abort ();
@@ -426,7 +427,7 @@ getarg(struct getargs *args, size_t num_args,
return ret; return ret;
} }
} else { } else {
for(j = 1; argv[i][j]; j++) { for(j = 1; argv[i] && j > 0 && j < strlen(argv[i]); j++) {
for(k = 0; k < num_args; k++) { for(k = 0; k < num_args; k++) {
char *optarg; char *optarg;
if(args[k].short_name == 0) if(args[k].short_name == 0)
@@ -440,6 +441,14 @@ getarg(struct getargs *args, size_t num_args,
*(int*)args[k].value = 0; *(int*)args[k].value = 0;
break; break;
} }
if(args[k].type == arg_collect){
struct getarg_collect_info *c = args[k].value;
if((*c->func)(TRUE, argc, argv, &i, &j, c->data)) {
*optind = i;
return ARG_ERR_BAD_ARG;
}
break;
}
if(argv[i][j + 1]) if(argv[i][j + 1])
optarg = &argv[i][j + 1]; optarg = &argv[i][j + 1];
else{ else{
@@ -472,14 +481,6 @@ getarg(struct getargs *args, size_t num_args,
} }
*(double*)args[k].value = tmp; *(double*)args[k].value = tmp;
goto out; goto out;
} else if(args[k].type == arg_collect){
struct getarg_collect_info *c = args[k].value;
if((*c->func)(optarg, argc, argv, &i,
c->data)) {
*optind = i;
return ARG_ERR_BAD_ARG;
}
goto out;
} }
*optind = i; *optind = i;
return ARG_ERR_BAD_ARG; return ARG_ERR_BAD_ARG;
@@ -498,6 +499,27 @@ getarg(struct getargs *args, size_t num_args,
return 0; return 0;
} }
char *
getarg_optarg(int short_flag, int argc, char **argv, int *optind, int *optarg)
{
char *arg;
if(short_flag) {
if(argv[*optind][*optarg + 1] == '\0') {
arg = argv[*optind + 1];
*optarg = -1;
} else {
arg = &argv[*optind][*optarg + 1];
*optarg = -1;
}
} else {
arg = strchr(argv[*optind], '=');
if(arg)
arg++;
*optarg = -1;
}
return arg;
}
#if TEST #if TEST
int foo_flag = 2; int foo_flag = 2;
int flag1 = 0; int flag1 = 0;