From nobody Sun Jul 13 14:19:17 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1514913166624127.76919410890036; Tue, 2 Jan 2018 09:12:46 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5AB8A81DEA; Tue, 2 Jan 2018 17:12:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2EE0D5D968; Tue, 2 Jan 2018 17:12:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id EB5AE1802124; Tue, 2 Jan 2018 17:12:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w02HChhJ003187 for ; Tue, 2 Jan 2018 12:12:43 -0500 Received: by smtp.corp.redhat.com (Postfix) id 55B6A1754E; Tue, 2 Jan 2018 17:12:43 +0000 (UTC) Received: from localhost.localdomain (ovpn-204-45.brq.redhat.com [10.40.204.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDD5F17557 for ; Tue, 2 Jan 2018 17:12:42 +0000 (UTC) From: Michal Privoznik To: libvir-list@redhat.com Date: Tue, 2 Jan 2018 18:12:06 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 13/18] vsh: Filter --options X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Tue, 02 Jan 2018 17:12:45 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" 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 will no longer offer --verbose option. Signed-off-by: Michal Privoznik --- tools/vsh.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++- 1 file changed, 59 insertions(+), 1 deletion(-) diff --git a/tools/vsh.c b/tools/vsh.c index 49e8033bd..f061783e0 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -2769,6 +2769,60 @@ vshCompleterFilter(char ***list, } =20 =20 +static int +vshReadlineOptionsPrune(char ***list, + vshCmd *last) +{ + char **newList =3D NULL; + size_t newList_len =3D 0; + size_t list_len; + size_t i; + + if (!list || !*list) + return -1; + + if (!last->opts) + return 0; + + list_len =3D virStringListLength((const char **) *list); + + if (VIR_ALLOC_N(newList, list_len + 1) < 0) + return -1; + + for (i =3D 0; i < list_len; i++) { + const char *list_opt =3D STRSKIP((*list)[i], "--"); + bool exist =3D false; + vshCmdOpt *opt =3D last->opts; + + /* Should never happen (TM) */ + if (!list_opt) + return -1; + + while (opt) { + if (STREQ(opt->def->name, list_opt)) { + exist =3D true; + break; + } + + opt =3D 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 =3D newList; + return 0; +} + + static char * vshReadlineParse(const char *text, int state) { @@ -2817,9 +2871,13 @@ vshReadlineParse(const char *text, int state) if (!cmd) { list =3D vshReadlineCommandGenerator(text); } else { - if (!opt || opt->type !=3D VSH_OT_DATA) + if (!opt || opt->type !=3D VSH_OT_DATA) { list =3D vshReadlineOptionsGenerator(text, cmd); =20 + if (vshReadlineOptionsPrune(&list, partial) < 0) + goto cleanup; + } + if (opt && opt->completer) { char **completer_list =3D opt->completer(autoCompleteOpaqu= e, partial, --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list