Message ID | 1374284656-12025-12-git-send-email-xiawenc@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 07/19/2013 07:44 PM, Wenchao Xia wrote: > This patch allow auto completion work normal for sub command case, s/allow/allows/ > "info block [DEVICE]" can auto complete now, by re-enter the completion > function. In original code "info" is treated as a special case, now it > is treated as a sub command group, global variable info_cmds is not used > any more. > > "help" command is still treated as a special case, since it is not a sub > command group but want to auto complete command in root command table. > > Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> > --- > monitor.c | 14 +++++++------- > 1 files changed, 7 insertions(+), 7 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/monitor.c b/monitor.c index b6e7b64..4430aa3 100644 --- a/monitor.c +++ b/monitor.c @@ -4246,6 +4246,12 @@ static void monitor_find_completion_by_table(Monitor *mon, return; } + if (cmd->sub_table) { + /* do the job again */ + return monitor_find_completion_by_table(mon, cmd->sub_table, + &args[1], nb_args - 1); + } + ptype = next_arg_type(cmd->args_type); for(i = 0; i < nb_args - 2; i++) { if (*ptype != '\0') { @@ -4272,13 +4278,7 @@ static void monitor_find_completion_by_table(Monitor *mon, bdrv_iterate(block_completion_it, &mbs); break; case 's': - /* XXX: more generic ? */ - if (!strcmp(cmd->name, "info")) { - readline_set_completion_index(mon->rs, strlen(str)); - for(cmd = info_cmds; cmd->name != NULL; cmd++) { - cmd_completion(mon, str, cmd->name); - } - } else if (!strcmp(cmd->name, "sendkey")) { + if (!strcmp(cmd->name, "sendkey")) { char *sep = strrchr(str, '-'); if (sep) str = sep + 1;
This patch allow auto completion work normal for sub command case, "info block [DEVICE]" can auto complete now, by re-enter the completion function. In original code "info" is treated as a special case, now it is treated as a sub command group, global variable info_cmds is not used any more. "help" command is still treated as a special case, since it is not a sub command group but want to auto complete command in root command table. Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> --- monitor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)