[PATCH 11/28] vsh: Fix option formatting for 'VHS_OT_ARGV' options

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 <pkrempa@xxxxxxxxxx>
---
 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] <string>}..."), opt->name);
+                        fprintf(stdout, _(" --%1$s <string>..."), opt->name);
                     } else {
-                        fprintf(stdout, _(" [[--%1$s] <string>]..."), opt->name);
+                        fprintf(stdout, _(" [--%1$s <string>]..."), opt->name);
                     }
                 }
                 break;
@@ -765,9 +765,9 @@ vshCmddefHelp(const vshCmdDef *def)

             case VSH_OT_ARGV:
                 if (opt->positional) {
-                    optstr = g_strdup_printf("<%s>", opt->name);
+                    optstr = g_strdup_printf(_("[--%1$s] <string>..."), opt->name);
                 } else {
-                    optstr = g_strdup_printf(_("[--%1$s] <string>"), opt->name);
+                    optstr = g_strdup_printf(_("--%1$s <string>..."), opt->name);
                 }
                 break;

-- 
2.44.0
_______________________________________________
Devel mailing list -- devel@xxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux