From 787f4feb4d39759de5c335b1e7eb4c4ace84d28b Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Fri, 16 Mar 2012 13:23:00 -0600 Subject: [PATCH] virsh: trim aliases from -h output Commit af3f9aab taught 'virsh help' to ignore command aliases, but forgot 'virsh -h'. * tools/virsh.c (vshUsage): Handle aliases. --- tools/virsh.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 19f9bbe393..9e5c9b2e57 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -19718,12 +19718,15 @@ vshUsage(void) " commands (non interactive mode):\n\n"), progname, progname); for (grp = cmdGroups; grp->name; grp++) { - fprintf(stdout, _(" %s (help keyword '%s')\n"), grp->name, grp->keyword); - - for (cmd = grp->commands; cmd->name; cmd++) + fprintf(stdout, _(" %s (help keyword '%s')\n"), + grp->name, grp->keyword); + for (cmd = grp->commands; cmd->name; cmd++) { + if (cmd->flags & VSH_CMD_FLAG_ALIAS) + continue; fprintf(stdout, - " %-30s %s\n", cmd->name, _(vshCmddefGetInfo(cmd, "help"))); - + " %-30s %s\n", cmd->name, + _(vshCmddefGetInfo(cmd, "help"))); + } fprintf(stdout, "\n"); } -- GitLab