matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib, vtysh: reduce code duplication

Browse source 
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-06-03 00:29:51 +03:00
parent d532d1092e
commit c22789620d
3 changed files with 12 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/command.c
View file

@ -2231,11 +2231,7 @@ DEFUN (no_banner_motd,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(find, int cmd_find_cmds(struct vty *vty, struct cmd_token **argv, int argc)
find_cmd,
"find REGEX...",
"Find CLI command matching a regular expression\n"
"Search pattern (POSIX regex)\n")
{ {
const struct cmd_node *node; const struct cmd_node *node;
const struct cmd_element *cli; const struct cmd_element *cli;
@ -2313,6 +2309,15 @@ done:
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(find,
find_cmd,
"find REGEX...",
"Find CLI command matching a regular expression\n"
"Search pattern (POSIX regex)\n")
{
return cmd_find_cmds(vty, argv, argc);
}
#if defined(DEV_BUILD) && defined(HAVE_SCRIPTING) #if defined(DEV_BUILD) && defined(HAVE_SCRIPTING)
DEFUN(script, DEFUN(script,
script_cmd, script_cmd,

1
lib/command.h
View file

@ -574,6 +574,7 @@ extern void cmd_init_config_callbacks(void (*start_config_cb)(void),
extern void cmd_terminate(void); extern void cmd_terminate(void);
extern void cmd_exit(struct vty *vty); extern void cmd_exit(struct vty *vty);
extern int cmd_list_cmds(struct vty *vty, int do_permute); extern int cmd_list_cmds(struct vty *vty, int do_permute);
extern int cmd_find_cmds(struct vty *vty, struct cmd_token **argv, int argc);
extern int cmd_domainname_set(const char *domainname); extern int cmd_domainname_set(const char *domainname);
extern int cmd_hostname_set(const char *hostname); extern int cmd_hostname_set(const char *hostname);

74
vtysh/vtysh.c
View file

@ -3619,79 +3619,7 @@ DEFUN(find,
"Find CLI command matching a regular expression\n" "Find CLI command matching a regular expression\n"
"Search pattern (POSIX regex)\n") "Search pattern (POSIX regex)\n")
{ {
const struct cmd_node *node; return cmd_find_cmds(vty, argv, argc);
const struct cmd_element *cli;
vector clis;
regex_t exp = {};
char *pattern = argv_concat(argv, argc, 1);
int cr = regcomp(&exp, pattern, REG_NOSUB | REG_EXTENDED);
XFREE(MTYPE_TMP, pattern);
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++) {
node = vector_slot(cmdvec, i);
if (!node)
continue;
clis = node->cmd_vector;
for (unsigned int j = 0; j < vector_active(clis); j++) {
cli = vector_slot(clis, j);
if (regexec(&exp, cli->string, 0, NULL, 0) == 0)
vty_out(vty, " (%s) %s\n",
node->name, cli->string);
}
}
done:
regfree(&exp);
return CMD_SUCCESS;
} }
DEFUN_HIDDEN(show_cli_graph_vtysh, DEFUN_HIDDEN(show_cli_graph_vtysh,