[PULL,1/6] qemu-img: show help for invalid global options

Commit Message

Max Reitz March 27, 2017, 3:52 p.m. UTC

From: Stefan Hajnoczi <[e-mail]>

The qemu-img sub-command executes regardless of invalid global options:

  $ qemu-img --foo info test.img
  qemu-img: unrecognized option '--foo'
  image: test.img
  ...

The unrecognized option warning may be missed by the user.  This can
hide incorrect command-lines in scripts and confuse users.

This patch prints the help information and terminates instead of
executing the sub-command.

Signed-off-by: Stefan Hajnoczi <[e-mail]>
Message-id: [e-mail]
Reviewed-by: Eric Blake <[e-mail]>
Signed-off-by: Max Reitz <[e-mail]>
---
 qemu-img.c | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 98b836b030..ce293a4710 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -4339,6 +4339,7 @@  int main(int argc, char **argv)
     while ((c = getopt_long(argc, argv, "+hVT:", long_options, NULL)) != -1) {
         switch (c) {
         case 'h':
+        case '?':
             help();
             return 0;
         case 'V':