From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHDQR-0001EH-5l for qemu-devel@nongnu.org; Tue, 03 May 2011 07:05:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QHDQP-0005OQ-9C for qemu-devel@nongnu.org; Tue, 03 May 2011 07:05:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:62400) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QHDQP-0005OC-0u for qemu-devel@nongnu.org; Tue, 03 May 2011 07:05:53 -0400 From: Kevin Wolf Date: Tue, 3 May 2011 13:08:21 +0200 Message-Id: <1304420906-5776-2-git-send-email-kwolf@redhat.com> In-Reply-To: <1304420906-5776-1-git-send-email-kwolf@redhat.com> References: <1304420906-5776-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 1/6] qemu-img resize: Fix option parsing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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 --- qemu-img.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) 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]) { -- 1.7.2.3