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 54e5918727516e5a0e93b1a5eab4aa726b27dc17..fe920853dd615eb41cbc839bbbfde0b0dfa81089 100644 (file)
--- 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 11c44b6b666a1be07a9c6bae8d0006622897e4be..6147e97ea7108e1668927fc3190671801a06ec48 100644 (file)
--- 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 2c97950c603b3cfcdd7f40ffc9046b6c15dccee3..b94ae49b1bc71cf3d1f24812cc262c58cdd7d005 100644 (file)
--- 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: