accept any number of no-
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2449 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -123,7 +123,7 @@ arg_match_long(struct getargs *args, size_t num_args,
|
|||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
char *optarg;
|
char *optarg;
|
||||||
int negate = 0;
|
int negate;
|
||||||
int partial_match = 0;
|
int partial_match = 0;
|
||||||
struct getargs *partial = NULL;
|
struct getargs *partial = NULL;
|
||||||
struct getargs *current = NULL;
|
struct getargs *current = NULL;
|
||||||
@@ -138,32 +138,31 @@ arg_match_long(struct getargs *args, size_t num_args,
|
|||||||
for (i = 0; i < num_args; ++i) {
|
for (i = 0; i < num_args; ++i) {
|
||||||
if(args[i].long_name) {
|
if(args[i].long_name) {
|
||||||
int len = strlen(args[i].long_name);
|
int len = strlen(args[i].long_name);
|
||||||
|
char *p = argv;
|
||||||
|
int p_len = argv_len;
|
||||||
|
negate = 0;
|
||||||
|
|
||||||
if (strncmp (args[i].long_name, argv, len) == 0) {
|
for (;;) {
|
||||||
|
if (strncmp (args[i].long_name, p, len) == 0) {
|
||||||
current = &args[i];
|
current = &args[i];
|
||||||
optarg = argv + len;
|
optarg = p + len;
|
||||||
break;
|
} else if (strncmp (args[i].long_name,
|
||||||
} else if (args[i].type == arg_flag
|
p,
|
||||||
&& strncmp (argv, "no-", 3) == 0
|
p_len) == 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_match;
|
||||||
partial = &args[i];
|
partial = &args[i];
|
||||||
optarg = argv + argv_len;
|
optarg = p + p_len;
|
||||||
} else if (args[i].type == arg_flag
|
} else if (args[i].type == arg_flag
|
||||||
&& strncmp (argv, "no-", 3) == 0
|
&& strncmp (argv, "no-", 3) == 0) {
|
||||||
&& strncmp (args[i].long_name,
|
negate = !negate;
|
||||||
argv + 3,
|
p += 3;
|
||||||
argv_len - 3) == 0) {
|
p_len -= 3;
|
||||||
++partial_match;
|
continue;
|
||||||
partial = &args[i];
|
|
||||||
optarg = argv + argv_len;
|
|
||||||
negate = 1;
|
|
||||||
}
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (current)
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (current == NULL)
|
if (current == NULL)
|
||||||
|
Reference in New Issue
Block a user