aboutsummaryrefslogtreecommitdiff
path: root/storage-daemon
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-03-01 10:28:43 -0500
committerKevin Wolf <kwolf@redhat.com>2021-03-08 14:55:18 +0100
commita5ef35052e66721e9f943b2b9a91176536b4d896 (patch)
tree05db1adc17b7ad5b8c9d1f8df07bf485486815db /storage-daemon
parent3b6ad6230e902168f63315e47933025b016f546e (diff)
downloadqemu-a5ef35052e66721e9f943b2b9a91176536b4d896.zip
qemu-a5ef35052e66721e9f943b2b9a91176536b4d896.tar.gz
qemu-a5ef35052e66721e9f943b2b9a91176536b4d896.tar.bz2
storage-daemon: report unexpected arguments on the fly
If the first character of optstring is '-', then each nonoption argv element is handled as if it were the argument of an option with character code 1. This removes the reordering of the argv array, and enables usage of loc_set_cmdline to provide better error messages. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20210301152844.291799-2-pbonzini@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'storage-daemon')
-rw-r--r--storage-daemon/qemu-storage-daemon.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/storage-daemon/qemu-storage-daemon.c b/storage-daemon/qemu-storage-daemon.c
index 9021a46..b7e1b90 100644
--- a/storage-daemon/qemu-storage-daemon.c
+++ b/storage-daemon/qemu-storage-daemon.c
@@ -174,7 +174,7 @@ static void process_options(int argc, char *argv[])
* they are given on the command lines. This means that things must be
* defined first before they can be referenced in another option.
*/
- while ((c = getopt_long(argc, argv, "hT:V", long_options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "-hT:V", long_options, NULL)) != -1) {
switch (c) {
case '?':
exit(EXIT_FAILURE);
@@ -275,14 +275,13 @@ static void process_options(int argc, char *argv[])
qobject_unref(args);
break;
}
+ case 1:
+ error_report("Unexpected argument: %s", optarg);
+ exit(EXIT_FAILURE);
default:
g_assert_not_reached();
}
}
- if (optind != argc) {
- error_report("Unexpected argument: %s", argv[optind]);
- exit(EXIT_FAILURE);
- }
}
int main(int argc, char *argv[])