Patchwork qemu-img resize: Fix option parsing

login
register
mail settings
Submitter Kevin Wolf
Date April 29, 2011, 9:06 a.m.
Message ID <1304067992-7088-1-git-send-email-kwolf@redhat.com>
Download mbox | patch
Permalink /patch/93404/
State New
Headers show

Comments

Kevin Wolf - April 29, 2011, 9:06 a.m.
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>
---
 qemu-img.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
Stefan Hajnoczi - May 3, 2011, 11:22 a.m.
On Fri, Apr 29, 2011 at 10:06 AM, Kevin Wolf <kwolf@redhat.com> wrote:
> 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>
> ---
>  qemu-img.c |   13 +++++++++++--
>  1 files changed, 11 insertions(+), 2 deletions(-)

Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

Patch

diff --git a/qemu-img.c b/qemu-img.c
index ed5ba91..e825123 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -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]) {