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

add min_args/max_args checking

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14022 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2004-07-05 11:28:50 +00:00
parent d970c48c81
commit ceae987caf
1 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/sl/slc-gram.y
View File

@@ -177,6 +177,8 @@ check_command(struct assignment *as)
int seen_function = 0;
int seen_help = 0;
int seen_argument = 0;
int seen_minargs = 0;
int seen_maxargs = 0;
int ret = 0;
for(a = as; a != NULL; a = a->next) {
if(strcmp(a->name, "name") == 0)
@@ -189,6 +191,10 @@ check_command(struct assignment *as)
seen_help++;
} else if(strcmp(a->name, "argument") == 0) {
seen_argument++;
} else if(strcmp(a->name, "min_args") == 0) {
seen_minargs++;
} else if(strcmp(a->name, "max_args") == 0) {
seen_maxargs++;
} else {
ex(a, "unknown name");
ret++;
@@ -210,6 +216,14 @@ check_command(struct assignment *as)
ex(as, "multiple argument strings");
ret++;
}
if(seen_minargs > 1) {
ex(as, "multiple min_args strings");
ret++;
}
if(seen_maxargs > 1) {
ex(as, "multiple max_args strings");
ret++;
}
return ret;
}
@@ -484,9 +498,51 @@ gen_wrapper(struct assignment *as)
cprint(1, "if(getarg(args, %d, argc, argv, &optind))\n", nargs);
cprint(2, "goto usage;\n");
if(arg == NULL) {
cprint(1, "if(optind < argc)\n");
cprint(2, "goto usage;\n");
{
int min_args = -1;
int max_args = -1;
char *end;
if(arg == NULL) {
max_args = 0;
} else {
if((tmp = find(as, "min_args")) != NULL) {
min_args = strtol(tmp->u.value, &end, 0);
if(*end != '\0') {
ex(tmp, "min_args is not numeric");
exit(1);
}
if(min_args < 0) {
ex(tmp, "min_args must be non-negative");
exit(1);
}
}
if((tmp = find(as, "max_args")) != NULL) {
max_args = strtol(tmp->u.value, &end, 0);
if(*end != '\0') {
ex(tmp, "max_args is not numeric");
exit(1);
}
if(max_args < 0) {
ex(tmp, "max_args must be non-negative");
exit(1);
}
}
}
if(min_args != -1 || max_args != -1) {
if(min_args == max_args)
cprint(1, "if(argc - optind != %d)\n",
min_args);
else if(max_args != -1 && min_args != -1)
cprint(1, "if(argc - optind < %d || argc - optind > %d)\n",
min_args, max_args);
else if(max_args != -1)
cprint(1, "if(argc - optind > %d)\n",
max_args);
else if(min_args != -1)
cprint(1, "if(argc - optind < %d)\n",
min_args);
cprint(2, "goto usage;\n");
}
}
cprint(1, "if(help_flag)\n");