From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pm-0000oW-EV for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WG8pg-0002hg-EK for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pg-0002hP-6W for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:08 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1JFD7AF016480 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Feb 2014 10:13:07 -0500 From: Kevin Wolf Date: Wed, 19 Feb 2014 16:12:55 +0100 Message-Id: <1392822778-4823-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1392822778-4823-1-git-send-email-kwolf@redhat.com> References: <1392822778-4823-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 4/7] qemu-img: Detect options specified more than once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com, mreitz@redhat.com Instead of ignoring all option values but the last one, error out if an option is set multiple times. These are the simpler subcommands without -o, so the patch becomes a bit easier and we can fix the remaining subcommands in a single patch. Signed-off-by: Kevin Wolf --- qemu-img.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/qemu-img.c b/qemu-img.c index 247987d..a889c84 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -594,6 +594,10 @@ static int img_check(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 'r': @@ -608,6 +612,10 @@ static int img_check(int argc, char **argv) } break; case OPTION_OUTPUT: + if (output) { + error_report("--output may only be specified once"); + return 1; + } output = optarg; break; case 'q': @@ -716,9 +724,17 @@ static int img_commit(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 't': + if (cache) { + error_report("-t may only be specified once"); + return 1; + } cache = optarg; break; case 'q': @@ -949,9 +965,17 @@ static int img_compare(int argc, char **argv) help(); break; case 'f': + if (fmt1) { + error_report("-f may only be specified once"); + return 1; + } fmt1 = optarg; break; case 'F': + if (fmt2) { + error_report("-F may only be specified once"); + return 1; + } fmt2 = optarg; break; case 'p': @@ -1906,9 +1930,17 @@ static int img_info(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case OPTION_OUTPUT: + if (output) { + error_report("--output may only be specified once"); + return 1; + } output = optarg; break; case OPTION_BACKING_CHAIN: @@ -2074,9 +2106,17 @@ static int img_map(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case OPTION_OUTPUT: + if (output) { + error_report("--output may only be specified once"); + return 1; + } output = optarg; break; } @@ -2282,7 +2322,7 @@ static int img_rebase(int argc, char **argv) /* Parse commandline parameters */ fmt = NULL; - cache = BDRV_DEFAULT_CACHE; + cache = NULL; out_baseimg = NULL; out_basefmt = NULL; for(;;) { @@ -2296,12 +2336,24 @@ static int img_rebase(int argc, char **argv) help(); return 0; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 'F': + if (out_basefmt) { + error_report("-F may only be specified once"); + return 1; + } out_basefmt = optarg; break; case 'b': + if (out_baseimg) { + error_report("-b may only be specified once"); + return 1; + } out_baseimg = optarg; break; case 'u': @@ -2311,6 +2363,10 @@ static int img_rebase(int argc, char **argv) progress = 1; break; case 't': + if (cache) { + error_report("-t may only be specified once"); + return 1; + } cache = optarg; break; case 'q': @@ -2319,6 +2375,10 @@ static int img_rebase(int argc, char **argv) } } + if (!cache) { + cache = BDRV_DEFAULT_CACHE; + } + if (quiet) { progress = 0; } @@ -2603,6 +2663,10 @@ static int img_resize(int argc, char **argv) help(); break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 'q': -- 1.8.1.4