External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsh: Filter --options

Browse Source 
Similarly to the previous commit, once we've presented an
--option for a command to the user it makes no sense to offer it
again. Therefore, we can prune all already specified options. For
instance, after this patch:

  virsh # migrate --verbose <TAB><TAB>

will no longer offer --verbose option.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Michal Privoznik 2017-12-29 11:25:38 +01:00
parent d4e63aff5d
commit cc005fe5a8
1 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
tools/vsh.c
View File

@ -2772,6 +2772,60 @@ vshCompleterFilter(char ***list,
}
static int
vshReadlineOptionsPrune(char ***list,
vshCmd *last)
{
char **newList = NULL;
size_t newList_len = 0;
size_t list_len;
size_t i;
if (!list || !*list)
return -1;
if (!last->opts)
return 0;
list_len = virStringListLength((const char **) *list);
if (VIR_ALLOC_N(newList, list_len + 1) < 0)
return -1;
for (i = 0; i < list_len; i++) {
const char *list_opt = STRSKIP((*list)[i], "--");
bool exist = false;
vshCmdOpt *opt = last->opts;
/* Should never happen (TM) */
if (!list_opt)
return -1;
while (opt) {
if (STREQ(opt->def->name, list_opt)) {
exist = true;
break;
}
opt = opt->next;
}
if (exist) {
VIR_FREE((*list)[i]);
continue;
}
VIR_STEAL_PTR(newList[newList_len], (*list)[i]);
newList_len++;
}
ignore_value(VIR_REALLOC_N_QUIET(newList, newList_len + 1));
VIR_FREE(*list);
*list = newList;
return 0;
}
static char *
vshReadlineParse(const char *text, int state)
{
@ -2820,9 +2874,13 @@ vshReadlineParse(const char *text, int state)
if (!cmd) {
list = vshReadlineCommandGenerator(text);
} else {
if (!opt || (opt->type != VSH_OT_DATA && opt->type != VSH_OT_STRING))
if (!opt || (opt->type != VSH_OT_DATA && opt->type != VSH_OT_STRING)) {
list = vshReadlineOptionsGenerator(text, cmd);
if (vshReadlineOptionsPrune(&list, partial) < 0)
goto cleanup;
}
if (opt && opt->completer) {
char **completer_list = opt->completer(autoCompleteOpaque,
partial,