diff options
author | Kevin Wolf <kwolf@redhat.com> | 2011-04-29 10:58:12 +0200 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2011-05-03 11:29:21 +0200 |
commit | e80fec7feb62c741df5360c1841ca49e4087c1cd (patch) | |
tree | f92fca5c17997c30f5f6600ae97d8255a31c277d /qemu-img.c | |
parent | 57aa265d462a64a06268be26d49020729cff56c1 (diff) | |
download | qemu-e80fec7feb62c741df5360c1841ca49e4087c1cd.zip qemu-e80fec7feb62c741df5360c1841ca49e4087c1cd.tar.gz qemu-e80fec7feb62c741df5360c1841ca49e4087c1cd.tar.bz2 |
qemu-img resize: Fix option parsing
For shrinking images, you're supposed to use a negative size. However, the
leading minus makes getopt think that it's an option and so you get the help
text if you don't use -- like in 'qemu-img resize test.img -- -1G'.
This patch handles the size first and removes it from the argument list so that
getopt won't even try to interpret it and you don't need -- any more.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'qemu-img.c')
-rw-r--r-- | qemu-img.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -1442,6 +1442,16 @@ static int img_resize(int argc, char **argv) { NULL } }; + /* Remove size from argv manually so that negative numbers are not treated + * as options by getopt. */ + if (argc < 3) { + help(); + return 1; + } + + size = argv[--argc]; + + /* Parse getopt arguments */ fmt = NULL; for(;;) { c = getopt(argc, argv, "f:h"); @@ -1458,11 +1468,10 @@ static int img_resize(int argc, char **argv) break; } } - if (optind + 1 >= argc) { + if (optind >= argc) { help(); } filename = argv[optind++]; - size = argv[optind++]; /* Choose grow, shrink, or absolute resize mode */ switch (size[0]) { |