Re: [Qemu-devel] [PATCH] block: fix qemu-img --help invocation

[Eric Blake]

On 04/25/2014 12:27 PM, Jeff Cody wrote:
> This fixes a bug introduced in commit ac1307ab, that caused the
> '--help' option to not be recognized as a valid command, and not
> print any help.
> 
> This also restores the previous behavior of qemu-img printing the full
> help when called with no arguments.
> 
> Signed-off-by: Jeff Cody <address@hidden>
> ---
>  qemu-img.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/qemu-img.c b/qemu-img.c
> index 4dae84a..3f878f6 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -2800,7 +2800,7 @@ int main(int argc, char **argv)
>      qemu_init_main_loop();
>      bdrv_init();
>      if (argc < 2) {
> -        error_exit("Not enough arguments");
> +        help();
>      }

This now gives exit status 0 where it gave status 1 prior to ac1307ab -
is that intentional?

>      cmdname = argv[1];
>      argc--; argv++;
> @@ -2813,5 +2813,6 @@ int main(int argc, char **argv)
>      }
>  
>      /* not found */
> -    error_exit("Command not found: %s", cmdname);
> +    help();
> +    return 0; /* never reached */

Why do we need a never reached comment if help() is marked noreturn?
Also, this now prints FULL help even for 'qemu-img --huh' - shouldn't we
really distinguish the two, by doing full help 0 status for "--help",
and compressed help status 1 otherwise (aka "unrecognized option
'--huh', try "--help" for details")?

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

signature.asc
Description: OpenPGP digital signature