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>

1 files changed, 17 insertions, 6 deletions

diff --git a/mergecap.c b/mergecap.c
index a9c1ef9e08..85654adfbc 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -99,6 +99,16 @@ get_positive_int(const char *string, const char *name)
   return number;
 }
 
+static void
+print_version(FILE *output)
+{
+  fprintf(output, "Mergecap %s"
+#ifdef GITVERSION
+      " (" GITVERSION " from " GITBRANCH ")"
+#endif
+      "\n", VERSION);
+}
+
 /*
  * Show the usage
  */
@@ -114,11 +124,7 @@ usage(gboolean is_error)
     output = stderr;
   }
 
-  fprintf(output, "Mergecap %s"
-#ifdef GITVERSION
-          " (" GITVERSION " from " GITBRANCH ")"
-#endif
-          "\n", VERSION);
+  print_version(output);
   fprintf(output, "Merge two or more capture files into one.\n");
   fprintf(output, "See http://www.wireshark.org for more information.\n");
   fprintf(output, "\n");
@@ -239,7 +245,7 @@ main(int argc, char *argv[])
 #endif /* _WIN32 */
 
   /* Process the options first */
-  while ((opt = getopt(argc, argv, "aF:hs:T:vw:")) != -1) {
+  while ((opt = getopt(argc, argv, "aF:hs:T:vVw:")) != -1) {
 
     switch (opt) {
     case 'a':
@@ -279,6 +285,11 @@ main(int argc, char *argv[])
       verbose = TRUE;
       break;
 
+    case 'V':
+      print_version(stdout);
+      exit(0);
+      break;
+
     case 'w':
       out_filename = optarg;
       break;