Message ID | 8fb8959efcbf66f8fe6eacafdd86c44b369406bf.1398710046.git.jcody@redhat.com |
---|---|
State | New |
Headers | show |
On 04/28/2014 12:37 PM, Jeff Cody wrote: > This allows qemu-img to print out version information, without > needing to print the long help wall of text. > > While there, perform some minor whitespace cleanup, and remove the > unused option_index variable in the call to getopt_long(). > > Reported-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Jeff Cody <jcody@redhat.com> > --- > qemu-img.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/qemu-img.c b/qemu-img.c > index d884324..96f4463 100644 > --- a/qemu-img.c > +++ b/qemu-img.c > @@ -33,6 +33,9 @@ > #include "block/qapi.h" > #include <getopt.h> > > +#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \ > + ", Copyright (c) 2004-2008 Fabrice Bellard\n" Is it worth listing 2014 in the copyright blurb? Then again, since Fabrice hasn't made a contribution in years, who would be the logical listing as the owner for any newer copyright year? "Copyright 2004-2014 Fabrice Bellard et. al"? But in the context of this patch, you just moved an existing string - any changes to the string necessarily would be in a separate patch (if at all), so it doesn't affect my review. Reviewed-by: Eric Blake <eblake@redhat.com>
Am 28.04.2014 um 20:37 hat Jeff Cody geschrieben: > This allows qemu-img to print out version information, without > needing to print the long help wall of text. > > While there, perform some minor whitespace cleanup, and remove the > unused option_index variable in the call to getopt_long(). > > Reported-by: Eric Blake <eblake@redhat.com> > Signed-off-by: Jeff Cody <jcody@redhat.com> Thanks, applied to the block branch. Kevin
diff --git a/qemu-img.c b/qemu-img.c index d884324..96f4463 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -33,6 +33,9 @@ #include "block/qapi.h" #include <getopt.h> +#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \ + ", Copyright (c) 2004-2008 Fabrice Bellard\n" + typedef struct img_cmd_t { const char *name; int (*handler)(int argc, char **argv); @@ -75,7 +78,7 @@ static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...) static void QEMU_NORETURN help(void) { const char *help_msg = - "qemu-img version " QEMU_VERSION ", Copyright (c) 2004-2008 Fabrice Bellard\n" + QEMU_IMG_VERSION "usage: qemu-img command [command options]\n" "QEMU disk image utility\n" "\n" @@ -2790,9 +2793,9 @@ int main(int argc, char **argv) const img_cmd_t *cmd; const char *cmdname; int c; - int option_index = 0; static const struct option long_options[] = { {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, {0, 0, 0, 0} }; @@ -2811,17 +2814,21 @@ int main(int argc, char **argv) cmdname = argv[1]; /* find the command */ - for(cmd = img_cmds; cmd->name != NULL; cmd++) { + for (cmd = img_cmds; cmd->name != NULL; cmd++) { if (!strcmp(cmdname, cmd->name)) { return cmd->handler(argc - 1, argv + 1); } } - c = getopt_long(argc, argv, "h", long_options, &option_index); + c = getopt_long(argc, argv, "h", long_options, NULL); if (c == 'h') { help(); } + if (c == 'v') { + printf(QEMU_IMG_VERSION); + return 0; + } /* not found */ error_exit("Command not found: %s", cmdname);
This allows qemu-img to print out version information, without needing to print the long help wall of text. While there, perform some minor whitespace cleanup, and remove the unused option_index variable in the call to getopt_long(). Reported-by: Eric Blake <eblake@redhat.com> Signed-off-by: Jeff Cody <jcody@redhat.com> --- qemu-img.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)