[Qemu-devel] [PATCH 3/7] qemu-img amend: Detect options specified more than once

[Kevin Wolf]

Instead of ignoring all option values but the last one, error out if an
option is set multiple times.

Again, the only exception is a -o help option, which may be added to any
valid qemu-img amend command and ignores all other options.

Signed-off-by: Kevin Wolf <address@hidden>
---
 qemu-img.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c
index 55c2c75..247987d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2687,6 +2687,7 @@ static int img_amend(int argc, char **argv)
 {
     int c, ret = 0;
     char *options = NULL;
+    bool options_help = false;
     QEMUOptionParameter *create_options = NULL, *options_param = NULL;
     const char *fmt = NULL, *filename;
     bool quiet = false;
@@ -2704,9 +2705,22 @@ static int img_amend(int argc, char **argv)
                 help();
                 break;
             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 'f':
+                if (fmt) {
+                    error_report("-f may only be specified once");
+                    return 1;
+                }
                 fmt = optarg;
                 break;
             case 'q':
@@ -2734,7 +2748,7 @@ static int img_amend(int argc, char **argv)
 
     fmt = bs->drv->format_name;
 
-    if (is_help_option(options)) {
+    if (options_help) {
         ret = print_block_option_help(filename, fmt);
         goto out;
     }
-- 
1.8.1.4