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

virsh: supply long option for -V

Browse Source 
* tools/virsh.c (vshParseArgv): Use NULL instead of 0 for pointer,
and symbolic names for has_arg.  Give --version an optional arg.
(vshUsage): Document this.
* tools/virsh.pod: Likewise.
This commit is contained in:
Eric Blake 2010-11-09 13:44:47 -07:00
parent 96d52fcf43
commit 51c83a2b1a
2 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tools/virsh.c
View File

@ -11523,8 +11523,8 @@ vshUsage(void)
" -q | --quiet quiet mode\n"
" -t | --timing print timing information\n"
" -l | --log <file> output logging to file\n"
" -v | --version program version\n\n"
" -V version and full options\n\n"
" -v | --version[=short] program version\n\n"
" -V | --version=long version and full options\n\n"
" commands (non interactive mode):\n"), progname, progname);
for (cmd = commands; cmd->name; cmd++)
@ -11669,15 +11669,15 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
bool help = false;
int arg;
struct option opt[] = {
{"debug", 1, 0, 'd'},
{"help", 0, 0, 'h'},
{"quiet", 0, 0, 'q'},
{"timing", 0, 0, 't'},
{"version", 0, 0, 'v'},
{"connect", 1, 0, 'c'},
{"readonly", 0, 0, 'r'},
{"log", 1, 0, 'l'},
{0, 0, 0, 0}
{"debug", required_argument, NULL, 'd'},
{"help", no_argument, NULL, 'h'},
{"quiet", no_argument, NULL, 'q'},
{"timing", no_argument, NULL, 't'},
{"version", optional_argument, NULL, 'v'},
{"connect", required_argument, NULL, 'c'},
{"readonly", no_argument, NULL, 'r'},
{"log", required_argument, NULL, 'l'},
{NULL, 0, NULL, 0}
};
/* Standard (non-command) options. The leading + ensures that no
@ -11703,12 +11703,15 @@ vshParseArgv(vshControl *ctl, int argc, char **argv)
case 'c':
ctl->name = vshStrdup(ctl, optarg);
break;
case 'v':
if (STRNEQ_NULLABLE(optarg, "long")) {
puts(VERSION);
exit(EXIT_SUCCESS);
}
/* fall through */
case 'V':
vshShowVersion(ctl);
exit(EXIT_SUCCESS);
case 'v':
puts(VERSION);
exit(EXIT_SUCCESS);
case 'r':
ctl->readonly = TRUE;
break;

4
tools/virsh.pod
View File

@ -54,12 +54,12 @@ The B<virsh> program understands the following I<OPTIONS>.
Ignore all other arguments, and behave as if the B<help> command were
given instead.
=item B<-v>, B<--version>
=item B<-v>, B<--version[=short]>
Ignore all other arguments, and prints the version of the libvirt library
virsh is coming from
=item B<-V>
=item B<-V>, B<--version=long>
Ignore all other arguments, and prints the version of the libvirt library
virsh is coming from and which options and driver are compiled in.