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

vtysh, lib: allow regexp in find command

Browse Source 
¯\_(ツ)_/¯

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2019-08-30 16:18:11 +00:00
parent a3aea4ebaf
commit 68912a2066
2 changed files with 118 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
lib/command.c
View File

@ -2711,15 +2711,66 @@ DEFUN (no_banner_motd,
DEFUN(find, DEFUN(find,
find_cmd, find_cmd,
"find COMMAND...", "find REGEX",
"Find CLI command containing text\n" "Find CLI command matching a regular expression\n"
"Text to search for\n") "Search pattern (POSIX regex)\n")
{ {
char *text = argv_concat(argv, argc, 1); char *pattern = argv[1]->arg;
const struct cmd_node *node; const struct cmd_node *node;
const struct cmd_element *cli; const struct cmd_element *cli;
vector clis; vector clis;
regex_t exp = {};
int cr = regcomp(&exp, pattern, REG_NOSUB | REG_EXTENDED);
if (cr != 0) {
switch (cr) {
case REG_BADBR:
vty_out(vty, "%% Invalid {...} expression\n");
break;
case REG_BADRPT:
vty_out(vty, "%% Bad repetition operator\n");
break;
case REG_BADPAT:
vty_out(vty, "%% Regex syntax error\n");
break;
case REG_ECOLLATE:
vty_out(vty, "%% Invalid collating element\n");
break;
case REG_ECTYPE:
vty_out(vty, "%% Invalid character class name\n");
break;
case REG_EESCAPE:
vty_out(vty,
"%% Regex ended with escape character (\\)\n");
break;
case REG_ESUBREG:
vty_out(vty,
"%% Invalid number in \\digit construction\n");
break;
case REG_EBRACK:
vty_out(vty, "%% Unbalanced square brackets\n");
break;
case REG_EPAREN:
vty_out(vty, "%% Unbalanced parentheses\n");
break;
case REG_EBRACE:
vty_out(vty, "%% Unbalanced braces\n");
break;
case REG_ERANGE:
vty_out(vty,
"%% Invalid endpoint in range expression\n");
break;
case REG_ESPACE:
vty_out(vty, "%% Failed to compile (out of memory)\n");
break;
}
goto done;
}
for (unsigned int i = 0; i < vector_active(cmdvec); i++) { for (unsigned int i = 0; i < vector_active(cmdvec); i++) {
node = vector_slot(cmdvec, i); node = vector_slot(cmdvec, i);
if (!node) if (!node)
@ -2727,14 +2778,15 @@ DEFUN(find,
clis = node->cmd_vector; clis = node->cmd_vector;
for (unsigned int j = 0; j < vector_active(clis); j++) { for (unsigned int j = 0; j < vector_active(clis); j++) {
cli = vector_slot(clis, j); cli = vector_slot(clis, j);
if (strcasestr(cli->string, text))
if (regexec(&exp, cli->string, 0, NULL, 0) == 0)
vty_out(vty, " (%s) %s\n", vty_out(vty, " (%s) %s\n",
node_names[node->node], cli->string); node_names[node->node], cli->string);
} }
} }
XFREE(MTYPE_TMP, text); done:
regfree(&exp);
return CMD_SUCCESS; return CMD_SUCCESS;
} }

66
vtysh/vtysh.c
View File

@ -3288,15 +3288,66 @@ DEFUN (no_vtysh_output_file,
DEFUN(find, DEFUN(find,
find_cmd, find_cmd,
"find COMMAND...", "find REGEX",
"Find CLI command containing text\n" "Find CLI command matching a regular expression\n"
"Text to search for\n") "Search pattern (POSIX regex)\n")
{ {
char *text = argv_concat(argv, argc, 1); char *pattern = argv[1]->arg;
const struct cmd_node *node; const struct cmd_node *node;
const struct cmd_element *cli; const struct cmd_element *cli;
vector clis; vector clis;
regex_t exp = {};
int cr = regcomp(&exp, pattern, REG_NOSUB | REG_EXTENDED);
if (cr != 0) {
switch (cr) {
case REG_BADBR:
vty_out(vty, "%% Invalid \\{...\\} expression\n");
break;
case REG_BADRPT:
vty_out(vty, "%% Bad repetition operator\n");
break;
case REG_BADPAT:
vty_out(vty, "%% Regex syntax error\n");
break;
case REG_ECOLLATE:
vty_out(vty, "%% Invalid collating element\n");
break;
case REG_ECTYPE:
vty_out(vty, "%% Invalid character class name\n");
break;
case REG_EESCAPE:
vty_out(vty,
"%% Regex ended with escape character (\\)\n");
break;
case REG_ESUBREG:
vty_out(vty,
"%% Invalid number in \\digit construction\n");
break;
case REG_EBRACK:
vty_out(vty, "%% Unbalanced square brackets\n");
break;
case REG_EPAREN:
vty_out(vty, "%% Unbalanced parentheses\n");
break;
case REG_EBRACE:
vty_out(vty, "%% Unbalanced braces\n");
break;
case REG_ERANGE:
vty_out(vty,
"%% Invalid endpoint in range expression\n");
break;
case REG_ESPACE:
vty_out(vty, "%% Failed to compile (out of memory)\n");
break;
}
goto done;
}
for (unsigned int i = 0; i < vector_active(cmdvec); i++) { for (unsigned int i = 0; i < vector_active(cmdvec); i++) {
node = vector_slot(cmdvec, i); node = vector_slot(cmdvec, i);
if (!node) if (!node)
@ -3304,14 +3355,15 @@ DEFUN(find,
clis = node->cmd_vector; clis = node->cmd_vector;
for (unsigned int j = 0; j < vector_active(clis); j++) { for (unsigned int j = 0; j < vector_active(clis); j++) {
cli = vector_slot(clis, j); cli = vector_slot(clis, j);
if (strcasestr(cli->string, text))
if (regexec(&exp, cli->string, 0, NULL, 0) == 0)
vty_out(vty, " (%s) %s\n", vty_out(vty, " (%s) %s\n",
node_names[node->node], cli->string); node_names[node->node], cli->string);
} }
} }
XFREE(MTYPE_TMP, text); done:
regfree(&exp);
return CMD_SUCCESS; return CMD_SUCCESS;
} }