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

partial matching for long options

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2447 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-19 00:15:35 +00:00
parent 03a4e6eefb
commit 269dd2347c
1 changed files with 81 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
lib/roken/getarg.c
View File

@@ -101,41 +101,79 @@ arg_printusage (struct getargs *args,
}
static int
arg_match(struct getargs *arg, char *argv)
arg_match_long(struct getargs *args, size_t num_args,
char *argv)
{
int i;
char *optarg;
int negate = 0;
if(arg->long_name) {
int len = strlen(arg->long_name);
if(strncmp(arg->long_name, argv, len))
if(arg->type == arg_flag && strlen(argv) > 3 &&
strncmp(arg->long_name, argv + 3, len) == 0){
optarg = argv + 3 + len;
negate = 1;
} else
return ARG_ERR_NO_MATCH;
else
optarg = argv + len;
int partial_match = 0;
struct getargs *partial = NULL;
struct getargs *current = NULL;
int argv_len;
char *p;
if(*optarg != '=' && (arg->type != arg_flag && *optarg == 0))
argv_len = strlen(argv);
p = strchr (argv, '=');
if (p != NULL)
argv_len = p - argv;
for (i = 0; i < num_args; ++i) {
if(args[i].long_name) {
int len = strlen(args[i].long_name);
if (strncmp (args[i].long_name, argv, len) == 0) {
current = &args[i];
optarg = argv + len;
break;
} else if (args[i].type == arg_flag
&& strncmp (argv, "no-", 3) == 0
&& strncmp (args[i].long_name, argv + 3, len) == 0) {
current = &args[i];
optarg = argv + len + 3;
negate = 1;
break;
} else if (strncmp (args[i].long_name, argv, argv_len) == 0) {
++partial_match;
partial = &args[i];
optarg = argv + argv_len;
} else if (args[i].type == arg_flag
&& strncmp (argv, "no-", 3) == 0
&& strncmp (args[i].long_name,
argv + 3,
argv_len - 3) == 0) {
++partial_match;
partial = &args[i];
optarg = argv + argv_len;
negate = 1;
}
}
}
if (current == NULL)
if (partial_match == 1)
current = partial;
else
return ARG_ERR_NO_MATCH;
switch(arg->type){
if(*optarg != '=' && (current->type != arg_flag && *optarg == 0))
return ARG_ERR_NO_MATCH;
switch(current->type){
case arg_integer:
{
int tmp;
if(sscanf(optarg + 1, "%d", &tmp) != 1)
return ARG_ERR_BAD_ARG;
*(int*)arg->value = tmp;
*(int*)current->value = tmp;
return 0;
}
case arg_string:
{
*(char**)arg->value = optarg + 1;
*(char**)current->value = optarg + 1;
return 0;
}
case arg_flag:
{
int *flag = arg->value;
int *flag = current->value;
if(*optarg == 0 ||
strcmp(optarg + 1, "yes") == 0 ||
strcmp(optarg + 1, "true") == 0){
@@ -147,9 +185,9 @@ arg_match(struct getargs *arg, char *argv)
}
return ARG_ERR_BAD_ARG;
}
default:
abort ();
}
}
return ARG_ERR_NO_MATCH;
}
int
@@ -167,11 +205,7 @@ getarg(struct getargs *args, size_t num_args,
i++;
break;
}
for(j = 0; j < num_args; j++){
ret = arg_match(&args[j], argv[i] + 2);
if(ret != ARG_ERR_NO_MATCH)
break;
}
ret = arg_match_long (args, num_args, argv[i] + 2);
if(ret)
return ret;
}else{