From: Benno Schulenberg <bensberg@justemail.net>
Date: Wed, 23 Jan 2013 12:48:50 +0000 (+0100)
Subject: textual: standardize the reporting of program name plus package version
X-Git-Tag: v2.23-rc1~268
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c6625a15d39047e008c1638679b6d9e82ff9554;p=thirdparty%2Futil-linux.git

textual: standardize the reporting of program name plus package version

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

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 54e5918727..fe920853dd 100644
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -213,7 +213,7 @@ static void
 die(const char *fmt, ...) {
 	va_list ap;
 
-	fprintf(stderr, "%s: ", program_invocation_short_name);
+	fprintf(stderr, UTIL_LINUX_VERSION);
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 11c44b6b66..6147e97ea7 100644
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -206,8 +206,7 @@ int main(int argc, char *argv[])
 				_("invalid exit code"));
 			break;
 		case 'V':
-			printf(_("%s from %s\n"),
-			       program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EX_OK);
 		default:
 			/* optopt will be set if this was an unrecognized
diff --git a/text-utils/more.c b/text-utils/more.c
index 2c97950c60..b94ae49b1b 100644
--- a/text-utils/more.c
+++ b/text-utils/more.c
@@ -568,8 +568,7 @@ void argscan(char *s)
 		case '\t':
 			break;
 		case 'V':
-                        printf(_("%s from %s\n"),
-                               program_invocation_short_name, PACKAGE_STRING);
+			printf(UTIL_LINUX_VERSION);
 			exit(EXIT_SUCCESS);
 			break;
 		default: