From nobody Mon Feb 9 01:47:30 2026 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1710510847196335.2571046561641; Fri, 15 Mar 2024 06:54:07 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EEBAD1812; Fri, 15 Mar 2024 09:54:05 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0E5711CCC; Fri, 15 Mar 2024 09:45:24 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4ED9F1AB1; Fri, 15 Mar 2024 09:45:08 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 65F981AE4 for ; Fri, 15 Mar 2024 09:44:37 -0400 (EDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-113-Ru7dlCBANfOmCicYesDlrQ-1; Fri, 15 Mar 2024 09:44:35 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50A3518654CD for ; Fri, 15 Mar 2024 13:44:35 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id BFA01C15771 for ; Fri, 15 Mar 2024 13:44:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.4 X-MC-Unique: Ru7dlCBANfOmCicYesDlrQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 11/28] vsh: Fix option formatting for 'VHS_OT_ARGV' options Date: Fri, 15 Mar 2024 14:44:06 +0100 Message-ID: <220bf44268ff8f5ace7b0034dba3dfb379b4bceb.1710510136.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: SEGDPNNNKBFGTLYIWDZIM26GHVHY5GTR X-Message-ID-Hash: SEGDPNNNKBFGTLYIWDZIM26GHVHY5GTR X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1710510848994100001 While previous fixes kept the help output unchanged as base for the refactors it turns out that the formatting of help for argv options is wrong. Specifically in SYNOPSIS the non-positional _ARGV would have the option name in square brackets (which in other cases means that given thing is optional) despite being required. Similarly in the DESCRIPTION section positional versions would not show the optional argument name and also didn't use the three dots to signal that it can be used multiple times. Signed-off-by: Peter Krempa --- tools/vsh.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index eeee58d39e..cbddc5ed92 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -714,9 +714,9 @@ vshCmddefHelp(const vshCmdDef *def) } } else { if (opt->required) { - fprintf(stdout, _(" {[--%1$s] }..."), opt-= >name); + fprintf(stdout, _(" --%1$s ..."), opt->nam= e); } else { - fprintf(stdout, _(" [[--%1$s] ]..."), opt-= >name); + fprintf(stdout, _(" [--%1$s ]..."), opt->n= ame); } } break; @@ -765,9 +765,9 @@ vshCmddefHelp(const vshCmdDef *def) case VSH_OT_ARGV: if (opt->positional) { - optstr =3D g_strdup_printf("<%s>", opt->name); + optstr =3D g_strdup_printf(_("[--%1$s] ..."), = opt->name); } else { - optstr =3D g_strdup_printf(_("[--%1$s] "), opt= ->name); + optstr =3D g_strdup_printf(_("--%1$s ..."), op= t->name); } break; --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org