lib, vtysh: Make archaic "terminal" optional in configure command

The 'configure terminal' command is a bit redundant, so make
the terminal portion optional.

Signed-off-by: Dinesh Dutt <dd.ps4u@gmail.com>

diff --git a/lib/command.c b/lib/command.c
index b3ef028004f687dcf686c7669bc205f10a50548c..d6fd1fa561d4edfc20b876cb0d19dfa88085879f 100644 (file)
--- a/lib/command.c
+++ b/lib/command.c
@@ -1386,7 +1386,7 @@ int config_from_file(struct vty *vty, FILE *fp, unsigned int *line_num)
 /* Configuration from terminal */
 DEFUN (config_terminal,
        config_terminal_cmd,
-       "configure terminal",
+       "configure [terminal]",
        "Configuration from vty interface\n"
        "Configuration terminal\n")
 {

diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index eff1e996ed144a95f69151e1dff2e82e71b6bdc1..24effa70472460f9ac90225471d7bfebf503c743 100644 (file)
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -502,7 +502,7 @@ static int vtysh_execute_func(const char *line, int pager)
                        vtysh_execute("exit");
                } else if (tried) {
                        vtysh_execute("end");
-                       vtysh_execute("configure terminal");
+                       vtysh_execute("configure");
                }
        }
        /*
@@ -540,7 +540,7 @@ static int vtysh_execute_func(const char *line, int pager)
                if (pager && strncmp(line, "exit", 4))
                        vty_open_pager(vty);
 
-               if (!strcmp(cmd->string, "configure terminal")) {
+               if (!strcmp(cmd->string, "configure")) {
                        for (i = 0; i < array_size(vtysh_client); i++) {
                                cmd_stat = vtysh_client_execute(
                                        &vtysh_client[i], line);
@@ -674,7 +674,7 @@ int vtysh_mark_file(const char *filename)
        vty->node = CONFIG_NODE;
 
        vtysh_execute_no_pager("enable");
-       vtysh_execute_no_pager("configure terminal");
+       vtysh_execute_no_pager("configure");
        vty_buf_copy = XCALLOC(MTYPE_VTYSH_CMD, VTY_BUFSIZ);
 
        while (fgets(vty->buf, VTY_BUFSIZ, confp)) {
@@ -1744,7 +1744,7 @@ DEFUNSH(VTYSH_REALLYALL, vtysh_disable, vtysh_disable_cmd, "disable",
 }
 
 DEFUNSH(VTYSH_REALLYALL, vtysh_config_terminal, vtysh_config_terminal_cmd,
-       "configure terminal",
+       "configure [terminal]",
        "Configuration from vty interface\n"
        "Configuration terminal\n")
 {
@@ -1786,7 +1786,7 @@ static int vtysh_exit(struct vty *vty)
        case BFD_NODE:
        case RPKI_NODE:
                vtysh_execute("end");
-               vtysh_execute("configure terminal");
+               vtysh_execute("configure");
                vty->node = CONFIG_NODE;
                break;
        case BGP_VPNV4_NODE: