From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pl-0000oU-BP for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WG8pe-0002h0-Ud for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48296) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WG8pe-0002gT-Le for qemu-devel@nongnu.org; Wed, 19 Feb 2014 10:13:06 -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 s1JFD3We024173 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 19 Feb 2014 10:13:04 -0500 From: Kevin Wolf Date: Wed, 19 Feb 2014 16:12:52 +0100 Message-Id: <1392822778-4823-2-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 1/7] qemu-img create: 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 If you specified multiple -o options for qemu-img create, it would silently ignore all but the last one. Similarly, for other options the last occurence wins (which is at least a bit less surprising). Error out instead. The only exception is a -o help option, which may be added to any valid qemu-img create command and ignores all other options. Signed-off-by: Kevin Wolf --- qemu-img.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index c989850..6a64fe1 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -341,13 +341,14 @@ static int img_create(int argc, char **argv) { int c; uint64_t img_size = -1; - const char *fmt = "raw"; + const char *fmt = NULL; const char *base_fmt = NULL; const char *filename; const char *base_filename = NULL; char *options = NULL; Error *local_err = NULL; bool quiet = false; + bool options_help = false; for(;;) { c = getopt(argc, argv, "F:b:f:he6o:q"); @@ -360,12 +361,24 @@ static int img_create(int argc, char **argv) help(); break; case 'F': + if (base_fmt) { + error_report("-F may only be specified once"); + return 1; + } base_fmt = optarg; break; case 'b': + if (base_filename) { + error_report("-b may only be specified once"); + return 1; + } base_filename = optarg; break; case 'f': + if (fmt) { + error_report("-f may only be specified once"); + return 1; + } fmt = optarg; break; case 'e': @@ -377,7 +390,16 @@ static int img_create(int argc, char **argv) "compat6\' instead!"); return 1; case 'o': - options = optarg; + if (is_help_option(optarg)) { + options_help = true; + } else if (!options) { + options = optarg; + } else { + error_report("-o cannot be used multiple times. Please use a " + "single -o option with comma-separated settings " + "instead."); + return 1; + } break; case 'q': quiet = true; @@ -385,6 +407,10 @@ static int img_create(int argc, char **argv) } } + if (!fmt) { + fmt = "raw"; + } + /* Get the filename */ if (optind >= argc) { help(); @@ -413,7 +439,7 @@ static int img_create(int argc, char **argv) help(); } - if (options && is_help_option(options)) { + if (options_help) { return print_block_option_help(filename, fmt); } -- 1.8.1.4