External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-03 12:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: update help for "virsh help help"

Browse Source 
As virsh help supports both command and command group now,
update "cmdHelp" to print consite help, (this patch is
increment of "7829052757953023b0826e0293ffe18ed4ab89e9").

And also remove redundant empty line in "vshUsage".

* tools/virsh.c
This commit is contained in:
Osier Yang 2010-12-01 20:24:58 +08:00 committed by Eric Blake
parent 474b1c1487
commit 33e38e7710
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/virsh.c
View File

@ -562,13 +562,15 @@ vshReconnect(vshControl *ctl) {
*/
static const vshCmdInfo info_help[] = {
{"help", N_("print help")},
{"desc", N_("Prints global help or command specific help.")},
{"desc", N_("Prints global help, command specific help, or help for a\n"
" group of related commands")},
{NULL, NULL}
};
static const vshCmdOptDef opts_help[] = {
{"command", VSH_OT_DATA, 0, N_("name of command")},
{"command", VSH_OT_DATA, 0, N_("Prints global help or command specific help.")},
{"group", VSH_OT_DATA, 0, N_("Prints global help or help for a group of related commands.")},
{NULL, 0, 0, NULL}
};
@ -577,7 +579,12 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
{
const vshCmdDef *c;
const vshCmdGrp *g;
const char *name = vshCommandOptString(cmd, "command", NULL);
const char *name;
name = vshCommandOptString(cmd, "command", NULL);
if (!name)
name = vshCommandOptString(cmd, "group", NULL);
if (!name) {
const vshCmdGrp *grp;
@ -596,8 +603,8 @@ cmdHelp(vshControl *ctl, const vshCmd *cmd)
vshPrint(ctl, "\n");
}
return TRUE;
}
return TRUE;
}
if ((c = vshCmddefSearch(name))) {
return vshCmddefHelp(ctl, name);