proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 19:13:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

grammar_sandbox: count ambiguous commands

Browse Source 
... and make the return value useful (for vtysh)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2017-02-10 17:14:50 +01:00
parent dab8cd005f
commit 37f9f36ec9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/grammar_sandbox.c
View File

@ -362,6 +362,7 @@ DEFUN (grammar_findambig,
struct cmd_permute_item *prev = NULL, *cur = NULL; struct cmd_permute_item *prev = NULL, *cur = NULL;
struct listnode *ln; struct listnode *ln;
int i, printall, scan, scannode = 0; int i, printall, scan, scannode = 0;
int ambig = 0;
i = 0; i = 0;
printall = argv_find (argv, argc, "printall", &i); printall = argv_find (argv, argc, "printall", &i);
@ -405,15 +406,20 @@ DEFUN (grammar_findambig,
vty_out (vty, " %s%s '%s'%s", prev->el->name, VTY_NEWLINE, prev->el->string, VTY_NEWLINE); vty_out (vty, " %s%s '%s'%s", prev->el->name, VTY_NEWLINE, prev->el->string, VTY_NEWLINE);
vty_out (vty, " %s%s '%s'%s", cur->el->name, VTY_NEWLINE, cur->el->string, VTY_NEWLINE); vty_out (vty, " %s%s '%s'%s", cur->el->name, VTY_NEWLINE, cur->el->string, VTY_NEWLINE);
vty_out (vty, "%s", VTY_NEWLINE); vty_out (vty, "%s", VTY_NEWLINE);
ambig++;
} }
prev = cur; prev = cur;
} }
list_delete (commands); list_delete (commands);
vty_out (vty, "%s", VTY_NEWLINE);
} while (scan && scannode < LINK_PARAMS_NODE); } while (scan && scannode < LINK_PARAMS_NODE);
vty_out (vty, "%d ambiguous commands found.%s", ambig, VTY_NEWLINE);
if (scan) if (scan)
nodegraph = NULL; nodegraph = NULL;
return CMD_SUCCESS; return ambig == 0 ? CMD_SUCCESS : CMD_WARNING;
} }
DEFUN (grammar_init_graph, DEFUN (grammar_init_graph,