This is necessary to enable creation of common qemu-img options which will be specified before command.
Signed-off-by: Denis V. Lunev <[email protected]> CC: Eric Blake <[email protected]> CC: Paolo Bonzini <[email protected]> CC: Stefan Hajnoczi <[email protected]> CC: Kevin Wolf <[email protected]> --- qemu-img.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 4b56ad3..aa85b6c 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -3499,26 +3499,33 @@ int main(int argc, char **argv) if (argc < 2) { error_exit("Not enough arguments"); } - cmdname = argv[1]; qemu_add_opts(&qemu_object_opts); qemu_add_opts(&qemu_source_opts); - /* find the command */ - for (cmd = img_cmds; cmd->name != NULL; cmd++) { - if (!strcmp(cmdname, cmd->name)) { - return cmd->handler(argc - 1, argv + 1); + while ((c = getopt_long(argc, argv, "+h", long_options, NULL)) != -1) { + switch (c) { + case 'h': + help(); + return 0; + case 'v': + printf(QEMU_IMG_VERSION); + return 0; } } - c = getopt_long(argc, argv, "h", long_options, NULL); + cmdname = argv[optind]; - if (c == 'h') { - help(); - } - if (c == 'v') { - printf(QEMU_IMG_VERSION); - return 0; + /* reset getopt_long scanning */ + argc -= optind; + argv += optind; + optind = 1; + + /* find the command */ + for (cmd = img_cmds; cmd->name != NULL; cmd++) { + if (!strcmp(cmdname, cmd->name)) { + return cmd->handler(argc, argv); + } } /* not found */ -- 2.1.4
