vsh: Filter --options

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>

diff --git a/tools/vsh.c b/tools/vsh.c
index 59314b288090765d0439c1a6a25601784ac5762f..b9b801f18a498e0b372482e3fc8b4150ba6e3ea9 100644 (file)
--- a/tools/vsh.c
+++ b/tools/vsh.c
@@ -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,