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>

5 files changed, 28 insertions, 1 deletions

diff --git a/doc/capinfos.pod b/doc/capinfos.pod
index 9359cf79ee..c3247414bd 100644
--- a/doc/capinfos.pod
+++ b/doc/capinfos.pod
@@ -33,6 +33,7 @@ S<[ B<-S> ]>
 S<[ B<-t> ]>
 S<[ B<-T> ]>
 S<[ B<-u> ]>
+S<[ B<-v> ]>
 S<[ B<-x> ]>
 S<[ B<-y> ]>
 S<[ B<-z> ]>
@@ -267,6 +268,10 @@ Displays the capture duration, in seconds.  This is the
 difference in time between the earliest packet seen and
 latest packet seen.
 
+=item -v
+
+Displays the tool's version and exits.
+
 =item -x
 
 Displays the average packet rate, in packets/sec
diff --git a/doc/editcap.pod b/doc/editcap.pod
index d93264409a..c9b7ee32fe 100644
--- a/doc/editcap.pod
+++ b/doc/editcap.pod
@@ -33,6 +33,9 @@ S<[ B<-v> ]>
 I<infile>
 I<outfile>
 
+B<editcap>
+S<[ B<-V> ]>
+
 =head1 DESCRIPTION
 
 B<Editcap> is a program that reads some or all of the captured packets from the
@@ -263,6 +266,10 @@ Use of B<-v> with the de-duplication switches of B<-d>, B<-D> or B<-w>
 will cause all MD5 hashes to be printed whether the packet is skipped
 or not.
 
+=item -V
+
+Print the version and exit.
+
 =item -w  E<lt>dup time windowE<gt>
 
 Attempts to remove duplicate packets.  The current packet's arrival time
diff --git a/doc/mergecap.pod b/doc/mergecap.pod
index c19ec6dc98..65e75d4f6a 100644
--- a/doc/mergecap.pod
+++ b/doc/mergecap.pod
@@ -12,6 +12,7 @@ S<[ B<-h> ]>
 S<[ B<-s> E<lt>I<snaplen>E<gt> ]>
 S<[ B<-T> E<lt>I<encapsulation type>E<gt> ]>
 S<[ B<-v> ]>
+S<[ B<-V> ]>
 S<B<-w> E<lt>I<outfile>E<gt>|->
 E<lt>I<infile>E<gt> [E<lt>I<infile>E<gt> I<...>]
 
@@ -111,6 +112,10 @@ fddi>' is specified).
 
 Causes B<mergecap> to print a number of messages while it's working.
 
+=item -V
+
+Print the version and exit.
+
 =item -w  E<lt>outfileE<gt>|-
 
 Sets the output filename. If the name is 'B<->', stdout will be used.
diff --git a/doc/reordercap.pod b/doc/reordercap.pod
index 3aa3918e33..50dc9b7493 100644
--- a/doc/reordercap.pod
+++ b/doc/reordercap.pod
@@ -7,6 +7,7 @@ reordercap - Reorder input file by timestamp into output file
 
 B<reordercap>
 S<[ B<-n> ]>
+S<[ B<-v> ]>
 E<lt>I<infile>E<gt> E<lt>I<outfile>E<gt>
 
 =head1 DESCRIPTION
@@ -40,6 +41,10 @@ the same way B<reordercap> handles this.
 When the B<-n> option is used, B<reordercap> will not write out the output
 file if it finds that the input file is already in order.
 
+=item -v
+
+Print the version and exit.
+
 =back
 
 =head1 SEE ALSO
diff --git a/doc/text2pcap.pod b/doc/text2pcap.pod
index 30981131ee..62f09ebe76 100644
--- a/doc/text2pcap.pod
+++ b/doc/text2pcap.pod
@@ -22,6 +22,7 @@ S<[ B<-S> E<lt>srcportE<gt>,E<lt>destportE<gt>,E<lt>ppiE<gt> ]>
 S<[ B<-t> E<lt>timefmtE<gt> ]>
 S<[ B<-T> E<lt>srcportE<gt>,E<lt>destportE<gt> ]>
 S<[ B<-u> E<lt>srcportE<gt>,E<lt>destportE<gt> ]>
+S<[ B<-v> ]>
 E<lt>I<infile>E<gt>|-
 E<lt>I<outfile>E<gt>|-
 
@@ -218,6 +219,10 @@ IP or Ethernet headers. Note that appropriate Ethernet and IP headers
 are automatically also included with each packet.
 Example: I<-u1000,69> to make the packets look like TFTP/UDP packets.
 
+=item -v
+
+Print the version and exit.
+
 =item -4 E<lt>srcipE<gt>,E<lt>destipE<gt>
 
 Prepend dummy IP header with specified IPv4 dest and source address.
@@ -230,7 +235,7 @@ Example: I<-4 10.0.0.1,10.0.0.2> to use 10.0.0.1 and 10.0.0.2 for all IP packets
 Prepend dummy IP header with specified IPv6 dest and source address.
 This option should be accompanied by one of the following options: -i, -s, -S, -T, -u
 Use this option to apply "custom" IP addresses.
-Example: I<-6 fe80:0:0:0:202:b3ff:fe1e:8329, 2001:0db8:85a3:0000:0000:8a2e:0370:7334> to 
+Example: I<-6 fe80:0:0:0:202:b3ff:fe1e:8329, 2001:0db8:85a3:0000:0000:8a2e:0370:7334> to
 use fe80:0:0:0:202:b3ff:fe1e:8329 and 2001:0db8:85a3:0000:0000:8a2e:0370:7334 for all IP packets.
 
 =back