diff options
| author | Igor Ryzhov <iryzhov@nfware.com> | 2021-06-02 23:29:51 +0200 |
|---|---|---|
| committer | Igor Ryzhov <iryzhov@nfware.com> | 2021-06-03 01:03:15 +0200 |
| commit | c22789620db38f388e5800d6d0e3b708b44be2f5 (patch) | |
| tree | a64027d2ac901f11326511fc7c972d309c8cf5c1 /vtysh | |
| parent | Merge pull request #8644 from idryzhov/fix-vrf-bind (diff) | |
| download | frr-c22789620db38f388e5800d6d0e3b708b44be2f5.tar.xz frr-c22789620db38f388e5800d6d0e3b708b44be2f5.zip | |
lib, vtysh: reduce code duplication
Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
Diffstat (limited to 'vtysh')
| -rw-r--r-- | vtysh/vtysh.c | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 111c2dbc0..9db4a7547 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -3619,79 +3619,7 @@ DEFUN(find, "Find CLI command matching a regular expression\n" "Search pattern (POSIX regex)\n") { - const struct cmd_node *node; - 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; + return cmd_find_cmds(vty, argv, argc); } DEFUN_HIDDEN(show_cli_graph_vtysh, |