External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-20 11:35:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: make -h always give help

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=817244 mentions that
unlike most other tools, where --help or --version prevent all
further parsing of all later options, virsh was strange in that
--version stopped parsing but --help tried to plow on to the end.
There was no rationale for this original implementation (since
2005!), so I think we can safely conform to common usage patterns.

* tools/virsh.c (main): Drop useless 'help' variable.
(cherry picked from commit 46e5d36b8998c53fbea9c589f618ae906103fec7)
This commit is contained in:
Eric Blake 2012-04-30 14:19:11 -06:00 committed by Cole Robinson
parent 180fb3b2b4
commit 763f71e51f
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/virsh.c
View File

@ -19896,7 +19896,6 @@ vshAllowedEscapeChar(char c)
static bool static bool
vshParseArgv(vshControl *ctl, int argc, char **argv) vshParseArgv(vshControl *ctl, int argc, char **argv)
{ {
bool help = false;
int arg, len; int arg, len;
struct option opt[] = { struct option opt[] = {
{"debug", required_argument, NULL, 'd'}, {"debug", required_argument, NULL, 'd'},
@ -19923,7 +19922,8 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
} }
break; break;
case 'h': case 'h':
help = true; vshUsage();
exit(EXIT_SUCCESS);
break; break;
case 'q': case 'q':
ctl->quiet = true; ctl->quiet = true;
@ -19968,17 +19968,6 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
} }
} }
if (help) {
if (optind < argc) {
vshError(ctl, _("extra argument '%s'. See --help."), argv[optind]);
exit(EXIT_FAILURE);
}
/* list all command */
vshUsage();
exit(EXIT_SUCCESS);
}
if (argc > optind) { if (argc > optind) {
/* parse command */ /* parse command */
ctl->imode = false; ctl->imode = false;