Merge pull request #2221 from rodnymolina/vtysh_extension

vtysh: Extending vtysh to allow question-mark cmds

diff --combined vtysh/vtysh.c
index 4974e538ea0789ec4a859cdd9323a3d0bd3bcb32,785a16fba315ae9bb22e671cb234aaadf9df6d7e..30de9d7711b2b51e07f9ed9b64b4430f3321e8bc
--- 1/vtysh/vtysh.c
--- 2/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@@ -341,7 -341,6 +341,7 @@@ static int vtysh_execute_func(const cha
  
        if (user_mode) {
                if (strncmp("en", vector_slot(vline, 0), 2) == 0) {
 +                      cmd_free_strvec(vline);
                        fprintf(stdout, "%% Command not allowed: enable\n");
                        return CMD_WARNING;
                }
@@@ -846,27 -845,29 +846,29 @@@ int vtysh_config_from_file(struct vty *
        return (retcode);
  }
  
- /* We don't care about the point of the cursor when '?' is typed. */
- static int vtysh_rl_describe(void)
+ /*
+  * Function processes cli commands terminated with '?' character when entered
+  * through either 'vtysh' or 'vtysh -c' interfaces.
+  */
+ static int vtysh_process_questionmark(const char *input, int input_len)
  {
-       int ret;
+       int ret, width = 0;
        unsigned int i;
-       vector vline;
-       vector describe;
-       int width;
+       vector vline, describe;
        struct cmd_token *token;
  
-       vline = cmd_make_strvec(rl_line_buffer);
+       if (!input)
+               return 1;
+ 
+       vline = cmd_make_strvec(input);
  
        /* In case of '> ?'. */
        if (vline == NULL) {
                vline = vector_init(1);
                vector_set(vline, NULL);
-       } else if (rl_end && isspace((int)rl_line_buffer[rl_end - 1]))
+       } else if (input_len && isspace((int)input[input_len - 1]))
                vector_set(vline, NULL);
  
-       fprintf(stdout, "\n");
- 
        describe = cmd_describe_command(vline, vty, &ret);
  
        /* Ambiguous and no match error. */
@@@ -875,7 -876,6 +877,6 @@@
                cmd_free_strvec(vline);
                vector_free(describe);
                fprintf(stdout, "%% Ambiguous command.\n");
-               rl_on_new_line();
                return 0;
                break;
        case CMD_ERR_NO_MATCH:
@@@ -883,7 -883,6 +884,6 @@@
                if (describe)
                        vector_free(describe);
                fprintf(stdout, "%% There is no matched command.\n");
-               rl_on_new_line();
                return 0;
                break;
        }
@@@ -933,9 -932,61 +933,61 @@@
        cmd_free_strvec(vline);
        vector_free(describe);
  
+       return 0;
+ }
+ 
+ /*
+  * Entry point for user commands terminated with '?' character and typed through
+  * the usual vtysh's stdin interface. This is the function being registered with
+  * readline() api's.
+  */
+ static int vtysh_rl_describe(void)
+ {
+       int ret;
+ 
+       fprintf(stdout, "\n");
+ 
+       ret = vtysh_process_questionmark(rl_line_buffer, rl_end);
        rl_on_new_line();
  
-       return 0;
+       return ret;
+ }
+ 
+ /*
+  * Function in charged of processing vtysh instructions terminating with '?'
+  * character and received through the 'vtysh -c' interface. If user's
+  * instruction is well-formatted, we will call the same processing routine
+  * utilized by the traditional vtysh's stdin interface.
+  */
+ int vtysh_execute_command_questionmark(char *input)
+ {
+       int input_len, qmark_count = 0;
+       const char *str;
+ 
+       if (!(input && *input))
+               return 1;
+ 
+       /* Finding out question_mark count and strlen */
+       for (str = input; *str; ++str) {
+               if (*str == '?')
+                       qmark_count++;
+       }
+       input_len = str - input;
+ 
+       /*
+        * Verify that user's input terminates in '?' and that patterns such as
+        * 'cmd ? subcmd ?' are prevented.
+        */
+       if (qmark_count != 1 || input[input_len - 1] != '?')
+               return 1;
+ 
+       /*
+        * Questionmark-processing function is not expecting to receive '?'
+        * character in input string.
+        */
+       input[input_len - 1] = '\0';
+ 
+       return vtysh_process_questionmark(input, input_len - 1);
  }
  
  /* Result of cmd_complete_command() call will be stored here
@@@ -2373,8 -2424,6 +2425,8 @@@ DEFUNSH(VTYSH_ALL, no_vtysh_config_pass
        "no password", NO_STR
        "Modify the terminal connection password\n")
  {
 +      vty_out(vty, NO_PASSWD_CMD_WARNING);
 +
        return CMD_SUCCESS;
  }
  
@@@ -2393,8 -2442,6 +2445,8 @@@ DEFUNSH(VTYSH_ALL, no_vtysh_config_enab
        "Modify enable password parameters\n"
        "Assign the privileged level password\n")
  {
 +      vty_out(vty, NO_PASSWD_CMD_WARNING);
 +
        return CMD_SUCCESS;
  }