ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-19 05:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve command-line parser: "\word" forces label

Browse Source 
This allows the same function to be used with different commands.
Recent improvements to the parser stopped adding labels for bare words
"word" in the CLI schema, to reduce the chance of label conflicts, eg {
"get", "file", "<file>" }.  Now a backslash-prepended word in the schema
"\word" will cause the matched argument to be labelled "word", just like
"[word]" does except "\word" is not optional.
This commit is contained in:
Andrew Bettison 2013-02-18 17:13:30 +10:30
parent 0bcfaccc2b
commit ce788eaeec
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cli.c
View File

@ -7,11 +7,16 @@
int cli_usage(const struct cli_schema *commands) {
printf("Usage:\n");
int i,j;
for(i=0;commands[i].function;i++) {
for(j=0;commands[i].words[j];j++)
printf(" %s",commands[i].words[j]);
printf("\n %s\n",commands[i].description);
unsigned cmd;
for (cmd = 0; commands[cmd].function; ++cmd) {
unsigned opt;
const char *word;
for (opt = 0; (word = commands[cmd].words[opt]); ++opt) {
if (word[0] == '\\')
++word;
printf(" %s", word);
}
printf("\n %s\n",commands[cmd].description);
}
return 0;
}
@ -43,6 +48,11 @@ int cli_parse(const int argc, const char *const *args, const struct cli_schema *
*
* "word" consumes one argument that exactly matches "word", does not label it
*
* "\word" consumes one argument that exactly matches "word" and labels it "word"
*
* "[word]" consumes one argument if it exactly matches "word", records it with label
* "word"
*
* "<label>" consumes exactly one argument "ANY", records it with label "label"
*
* "prefix=<any>" consumes one argument "prefix=ANY" or two arguments "prefix" "ANY",
@ -64,9 +74,6 @@ int cli_parse(const int argc, const char *const *args, const struct cli_schema *
*
* "[prefix<any>]" consumes one argument "prefixANY" if available, records the text matching
* ANY with label "prefix"
*
* "[word]" consumes one argument if it exactly matches "word", records it with label
* "word"
*/
if (wordlen == 3 && word[0] == '.' && word[1] == '.' && word[2] == '.') {
cmdpa.varargi = arg;
@ -115,6 +122,12 @@ int cli_parse(const int argc, const char *const *args, const struct cli_schema *
if (arg < argc)
text = args[arg++];
}
} else if (wordlen > 1 && word[0] == '\\') {
if (strlen(args[arg]) == wordlen - 1 && strncmp(args[arg], &word[1], wordlen - 1) == 0) {
label = &word[1];
labellen = wordlen - 1;
text = args[arg++];
}
} else if (arg < argc && strlen(args[arg]) == wordlen && strncmp(args[arg], word, wordlen) == 0) {
if (optional) {
text = args[arg];