Instead of ignoring all option values but the last one, multiple -o
options now have the same meaning as having a single option with all
settings in the order of their respective -o options.
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: Jeff Cody <jc...@redhat.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
---
qemu-img.c | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 3fd2168..6ceaeb2 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -2667,7 +2667,18 @@ static int img_amend(int argc, char **argv)
help();
break;
case 'o':
- options = optarg;
+ if (!is_valid_option_list(optarg)) {
+ error_report("Invalid option list: %s", optarg);
+ ret = -1;
+ goto out;
+ }
+ if (!options) {
+ options = g_strdup(optarg);
+ } else {
+ char *old_options = options;
+ options = g_strdup_printf("%s,%s", options, optarg);
+ g_free(old_options);
+ }
break;
case 'f':
fmt = optarg;
@@ -2697,7 +2708,7 @@ static int img_amend(int argc, char **argv)
fmt = bs->drv->format_name;
- if (is_help_option(options)) {
+ if (has_help_option(options)) {
ret = print_block_option_help(filename, fmt);
goto out;
}
@@ -2724,6 +2735,8 @@ out:
}
free_option_parameters(create_options);
free_option_parameters(options_param);
+ g_free(options);
+
if (ret) {
return 1;
}
--
1.8.1.4
