External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 19:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: make 'help' command ignore spurious options

Browse Source 
Similar to the previous patch, prepending 'help' to a partial
command string doesn't cut us any slack.

$ virsh help pool-define-as --name foo --type dir
error: command 'help' doesn't support option --name

This patch adds a few hacks to make 'help' ignore everything after the
first data bit, so the above command shows help output for pool-define-as.
This commit is contained in:
Cole Robinson 2012-08-05 18:13:18 -04:00
parent d2f971390e
commit 86157b594f
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/virsh.c
View File

@ -1219,8 +1219,10 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
} }
} }
vshError(ctl, _("command '%s' doesn't support option --%s"), if (STRNEQ(cmd->name, "help")) {
cmd->name, name); vshError(ctl, _("command '%s' doesn't support option --%s"),
cmd->name, name);
}
return NULL; return NULL;
} }
@ -1987,9 +1989,12 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
*optstr = '\0'; /* convert the '=' to '\0' */ *optstr = '\0'; /* convert the '=' to '\0' */
optstr = vshStrdup(ctl, optstr + 1); optstr = vshStrdup(ctl, optstr + 1);
} }
/* Special case 'help' to ignore all spurious options */
if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2, if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2,
&opts_seen, &opt_index))) { &opts_seen, &opt_index))) {
VIR_FREE(optstr); VIR_FREE(optstr);
if (STREQ(cmd->name, "help"))
continue;
goto syntaxError; goto syntaxError;
} }
VIR_FREE(tkdata); VIR_FREE(tkdata);
@ -2027,8 +2032,10 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
continue; continue;
} else { } else {
get_data: get_data:
/* Special case 'help' to ignore spurious data */
if (!(opt = vshCmddefGetData(cmd, &opts_need_arg, if (!(opt = vshCmddefGetData(cmd, &opts_need_arg,
&opts_seen))) { &opts_seen)) &&
STRNEQ(cmd->name, "help")) {
vshError(ctl, _("unexpected data '%s'"), tkdata); vshError(ctl, _("unexpected data '%s'"), tkdata);
goto syntaxError; goto syntaxError;
} }