Re: [Qemu-block] [PATCH 5/6] qemu-img: move common options parsing before commands processing

[Eric Blake]

On 06/13/2016 10:58 AM, Denis V. Lunev wrote:
> This is necessary to enable creation of common qemu-img options which will
> be specified before command.
> 
> The patch also enables '-V' alias to '--version' (exactly like in other
> block utilities) and documents this change.
> 
> Signed-off-by: Denis V. Lunev 
> CC: Eric Blake 
> CC: Paolo Bonzini 
> CC: Stefan Hajnoczi 
> CC: Kevin Wolf 
> ---
>  qemu-img.c| 39 ++-
>  qemu-img.texi | 10 +-
>  2 files changed, 35 insertions(+), 14 deletions(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index 4b56ad3..d22ebdf 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -87,9 +87,12 @@ static void QEMU_NORETURN help(void)
>  {
>  const char *help_msg =
> QEMU_IMG_VERSION
> -   "usage: qemu-img command [command options]\n"
> +   "usage: qemu-img [standard options] command [command options]\n"
> "QEMU disk image utility\n"
> "\n"
> +   "'-h', '--help'   display this help and exit\n"
> +   "'-V', '--version'output version information and exit\n"
> +   "\n"
> "Command syntax:\n"
>  #define DEF(option, callback, arg_string)\
> "  " arg_string "\n"
> @@ -3476,7 +3479,7 @@ int main(int argc, char **argv)
>  int c;
>  static const struct option long_options[] = {
>  {"help", no_argument, 0, 'h'},
> -{"version", no_argument, 0, 'v'},
> +{"version", no_argument, 0, 'V'},

I guess it doesn't hurt to change to '-V', since neither '-v' nor '-V'
worked prior to the patch.

Reviewed-by: Eric Blake 

-- 
Eric Blake   eblake redhat com+1-919-301-3266
Libvirt virtualization library http://libvirt.org



signature.asc
Description: OpenPGP digital signature

[Qemu-block] [PATCH 5/6] qemu-img: move common options parsing before commands processing

[Denis V. Lunev]

This is necessary to enable creation of common qemu-img options which will
be specified before command.

The patch also enables '-V' alias to '--version' (exactly like in other
block utilities) and documents this change.

Signed-off-by: Denis V. Lunev 
CC: Eric Blake 
CC: Paolo Bonzini 
CC: Stefan Hajnoczi 
CC: Kevin Wolf 
---
 qemu-img.c| 39 ++-
 qemu-img.texi | 10 +-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 4b56ad3..d22ebdf 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -87,9 +87,12 @@ static void QEMU_NORETURN help(void)
 {
 const char *help_msg =
QEMU_IMG_VERSION
-   "usage: qemu-img command [command options]\n"
+   "usage: qemu-img [standard options] command [command options]\n"
"QEMU disk image utility\n"
"\n"
+   "'-h', '--help'   display this help and exit\n"
+   "'-V', '--version'output version information and exit\n"
+   "\n"
"Command syntax:\n"
 #define DEF(option, callback, arg_string)\
"  " arg_string "\n"
@@ -3476,7 +3479,7 @@ int main(int argc, char **argv)
 int c;
 static const struct option long_options[] = {
 {"help", no_argument, 0, 'h'},
-{"version", no_argument, 0, 'v'},
+{"version", no_argument, 0, 'V'},
 {0, 0, 0, 0}
 };
 
@@ -3499,27 +3502,37 @@ int main(int argc, char **argv)
 if (argc < 2) {
 error_exit("Not enough arguments");
 }
-cmdname = argv[1];
 
 qemu_add_opts(_object_opts);
 qemu_add_opts(_source_opts);
 
-/* find the command */
-for (cmd = img_cmds; cmd->name != NULL; cmd++) {
-if (!strcmp(cmdname, cmd->name)) {
-return cmd->handler(argc - 1, argv + 1);
+while ((c = getopt_long(argc, argv, "+hV", long_options, NULL)) != -1) {
+switch (c) {
+case 'h':
+help();
+return 0;
+case 'V':
+printf(QEMU_IMG_VERSION);
+return 0;
 }
 }
 
-c = getopt_long(argc, argv, "h", long_options, NULL);
+cmdname = argv[optind];
 
-if (c == 'h') {
-help();
-}
-if (c == 'v') {
-printf(QEMU_IMG_VERSION);
+/* reset getopt_long scanning */
+argc -= optind;
+if (argc < 1) {
 return 0;
 }
+argv += optind;
+optind = 1;
+
+/* find the command */
+for (cmd = img_cmds; cmd->name != NULL; cmd++) {
+if (!strcmp(cmdname, cmd->name)) {
+return cmd->handler(argc, argv);
+}
+}
 
 /* not found */
 error_exit("Command not found: %s", cmdname);
diff --git a/qemu-img.texi b/qemu-img.texi
index afaebdd..5a47810 100644
--- a/qemu-img.texi
+++ b/qemu-img.texi
@@ -1,6 +1,6 @@
 @example
 @c man begin SYNOPSIS
-@command{qemu-img} @var{command} [@var{command} @var{options}]
+@command{qemu-img} [@var{standard} @var{options}] @var{command} [@var{command} 
@var{options}]
 @c man end
 @end example
 
@@ -16,6 +16,14 @@ inconsistent state.
 
 @c man begin OPTIONS
 
+Standard options:
+@table @option
+@item -h, --help
+Display this help and exit
+@item -V, --version
+Display version information and exit
+@end table
+
 The following commands are supported:
 
 @include qemu-img-cmds.texi
-- 
2.5.0