summary refs log tree commit diff stats
path: root/qemu-img.c
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-03-17 18:45:39 +0800
committerMax Reitz <mreitz@redhat.com>2017-03-27 16:50:36 +0200
commit4581c16fce3c1078351f3424208f346b11b378f0 (patch)
tree0c021c9186f0b319aeebcea3a0b65345908dd6ee /qemu-img.c
parentea2afcf5b6727a577cf561fd8fe0d8c397ecc927 (diff)
downloadfocaccia-qemu-4581c16fce3c1078351f3424208f346b11b378f0.tar.gz
focaccia-qemu-4581c16fce3c1078351f3424208f346b11b378f0.zip
qemu-img: show help for invalid global options
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 <stefanha@redhat.com>
Message-id: 20170317104541.28979-2-stefanha@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r--qemu-img.c1
1 files changed, 1 insertions, 0 deletions
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':