diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-06-20 14:48:27 -0400 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-06-21 01:05:02 +0000 |
| commit | 3773a7561c79e3545fca664c2a25cf2312de0ada (patch) | |
| tree | 083e9fda037f4811ebe3cf7aa9564ee57df33c9b /capinfos.c | |
| parent | c11ae8ac827afa50ef226ebaef134f54ac0e532b (diff) | |
| download | wireshark-3773a7561c79e3545fca664c2a25cf2312de0ada.tar.gz | |
Add command-line argument to request the version to a number of the utilities.
In some cases "-v" was already used so "-V" is the option.
Note that the version information in these utilities is much shorter than what
is presented by the big programs.
As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804
Bug: 5804
Change-Id: I35db35a4eace2797afd895f9be7322ef39928480
Reviewed-on: https://code.wireshark.org/review/2489
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'capinfos.c')
| -rw-r--r-- | capinfos.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/capinfos.c b/capinfos.c index 811f5af8bd..e43fa049b5 100644 --- a/capinfos.c +++ b/capinfos.c @@ -992,6 +992,16 @@ process_cap_file(wtap *wth, const char *filename) } static void +print_version(FILE *output) +{ + fprintf(output, "Capinfos %s" +#ifdef GITVERSION + " (" GITVERSION " from " GITBRANCH ")" +#endif + "\n", VERSION); +} + +static void usage(gboolean is_error) { FILE *output; @@ -1004,11 +1014,7 @@ usage(gboolean is_error) output = stderr; } - fprintf(output, "Capinfos %s" -#ifdef GITVERSION - " (" GITVERSION " from " GITBRANCH ")" -#endif - "\n", VERSION); + print_version(output); fprintf(output, "Prints various information (infos) about capture files.\n"); fprintf(output, "See http://www.wireshark.org for more information.\n"); fprintf(output, "\n"); @@ -1352,6 +1358,11 @@ main(int argc, char *argv[]) exit(0); break; + case 'v': + print_version(stdout); + exit(0); + break; + case '?': /* Bad flag - print usage message */ usage(TRUE); exit(1); |