From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 3 Aug 2011 08:23:08 +0000 (+0200)
Subject: wipefs: change option -v to -V for --version; add it to man page
X-Git-Tag: v2.20-rc2~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=11295cd10264460271481494983d58b9507b73e0;p=thirdparty%2Futil-linux.git

wipefs: change option -v to -V for --version; add it to man page

Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
---

diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8
index ebb64bd4fe..00a406d2ee 100644
--- a/misc-utils/wipefs.8
+++ b/misc-utils/wipefs.8
@@ -7,7 +7,7 @@
 wipefs \- wipe a filesystem signature from a device
 .SH SYNOPSIS
 .B wipefs
-.RB [ \-ahnp ]
+.RB [ \-ahnpV ]
 .RB [ \-o
 .IR offset ]
 .I device
@@ -36,8 +36,10 @@ The \fIoffset\fR argument may be followed by binary (2^N) suffixes KiB, MiB,
 GiB, TiB, PiB and EiB (the "iB" is optional, e.g. "K" has the same meaning as
 "KiB") or decimal (10^N) suffixes KB, MB, GB, PB and EB.
 .IP "\fB\-p, \-\-parsable\fP"
-Print out in parsable instead of printable format. Encode all potentially unsafe
+Print out in parsable instead of printable format.  Encode all potentially unsafe
 characters of a string to the corresponding hex value prefixed by '\\x'.
+.IP "\fB\-V, \-\-version\fP"
+Output version information and exit.
 .SH AUTHOR
 Karel Zak <kzak@redhat.com>.
 .SH AVAILABILITY
diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index 09c6070ce1..10102aea48 100644
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -309,7 +309,7 @@ usage(FILE *out)
 	" -n, --no-act        do everything except the actual write() call\n"
 	" -o, --offset <num>  offset to erase, in bytes\n"
 	" -p, --parsable      print out in parsable instead of printable format\n"
-	" -v, --version       output version information and exit\n"));
+	" -V, --version       output version information and exit\n"));
 
 	fprintf(out, _("\nFor more information see wipefs(8).\n"));
 
@@ -330,7 +330,7 @@ main(int argc, char **argv)
 	    { "no-act",    0, 0, 'n' },
 	    { "offset",    1, 0, 'o' },
 	    { "parsable",  0, 0, 'p' },
-	    { "version",   0, 0, 'v' },
+	    { "version",   0, 0, 'V' },
 	    { NULL,        0, 0, 0 }
 	};
 
@@ -338,7 +338,7 @@ main(int argc, char **argv)
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
 
-	while ((c = getopt_long(argc, argv, "ahno:pv", longopts, NULL)) != -1) {
+	while ((c = getopt_long(argc, argv, "ahno:pV", longopts, NULL)) != -1) {
 		switch(c) {
 		case 'a':
 			all++;
@@ -356,7 +356,7 @@ main(int argc, char **argv)
 		case 'p':
 			mode = WP_MODE_PARSABLE;
 			break;
-		case 'v':
+		case 'V':
 			printf(_("%s from %s\n"), program_invocation_short_name,
 				PACKAGE_STRING);
 			return EXIT_SUCCESS;