aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2019-01-31 08:15:23 +0100
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2019-02-04 16:43:57 +0000
commit9ea9dd0d5fdad50d9b2ea2bdddd9d919efab31ca (patch)
treebde4b387a1a3e27ec6f19fa3579c9831fd2379a7
parentb55f4d2df21b966c3953264d8961f259814f4650 (diff)
vty: enable tab-completion for optional-multi-choice args
In cmd_complete_command_real(), detect and strip square braces from multi-choice arguments, to enable tab-completion for commands like > list cmd [(alpha|beta)] > cmd <TAB> alpha beta > cmd be<TAB> > cmd beta Change-Id: I8c304300b3633bb6e9b3457fcfa42121c8272ac0
-rw-r--r--src/vty/command.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/vty/command.c b/src/vty/command.c
index 2242e761..de084ab3 100644
--- a/src/vty/command.c
+++ b/src/vty/command.c
@@ -2010,9 +2010,18 @@ static char **cmd_complete_command_real(vector vline, struct vty *vty,
descvec = vector_slot(strvec, index);
for (j = 0; j < vector_active(descvec); j++)
if ((desc = vector_slot(descvec, j))) {
- if ((string = cmd_entry_function(vector_slot(vline, index), desc->cmd)))
+ const char *cmd = desc->cmd;
+ char *tmp = NULL;
+
+ if (CMD_OPTION(desc->cmd)) {
+ tmp = cmd_deopt(tall_vty_cmd_ctx, desc->cmd);
+ cmd = tmp;
+ }
+ if ((string = cmd_entry_function(vector_slot(vline, index), cmd)))
if (cmd_unique_string (matchvec, string))
vector_set (matchvec, talloc_strdup(tall_vty_cmd_ctx, string));
+ if (tmp)
+ talloc_free(tmp);
}
}
}