textual: use UTIL_LINUX_VERSION everywhere

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/disk-utils/blockdev.c b/disk-utils/blockdev.c
index eb347b79b53ea8fa67e7a8bfa1a758964f8d40f9..4543818bd4f90dedcc9a4e6c19e7865afc1d7741 100644 (file)
--- a/disk-utils/blockdev.c
+++ b/disk-utils/blockdev.c
@@ -229,8 +229,7 @@ int main(int argc, char **argv)
 
        /* -V not together with commands */
        if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-               printf(_("%s from %s\n"), program_invocation_short_name,
-                      PACKAGE_STRING);
+               printf(UTIL_LINUX_VERSION);
                return EXIT_SUCCESS;
        }
        if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))

diff --git a/disk-utils/elvtune.c b/disk-utils/elvtune.c
index 6aa01a2909776ff05fa5550d0928960dc6f9ccb0..aa13c063a254e85721d0492868ba042d03a0e16d 100644 (file)
--- a/disk-utils/elvtune.c
+++ b/disk-utils/elvtune.c
@@ -64,8 +64,7 @@ usage(void) {
 
 static void
 version(void) {
-       fprintf(stderr, _("%s from %s\n"),
-                       program_invocation_short_name, PACKAGE_STRING);
+       fprintf(stderr, UTIL_LINUX_VERSION);
 }
 
 int

diff --git a/disk-utils/fdformat.c b/disk-utils/fdformat.c
index e937a8ed51c8f5681474c5881ef3e9672b8e4040..509a6055b996c9036a7c55380870a2feb166626d 100644 (file)
--- a/disk-utils/fdformat.c
+++ b/disk-utils/fdformat.c
@@ -128,8 +128,7 @@ int main(int argc, char **argv)
                        verify = 0;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                case 'h':
                        usage(stdout);

diff --git a/disk-utils/fsck.c b/disk-utils/fsck.c
index 28a1d706b302870fd4c658dfd0d719ef4ca4abb7..16746ab14f3520e22c0cc5a84af11e8d81501750 100644 (file)
--- a/disk-utils/fsck.c
+++ b/disk-utils/fsck.c
@@ -1504,7 +1504,7 @@ int main(int argc, char *argv[])
        parse_argv(argc, argv);
 
        if (!notitle)
-               printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+               printf(UTIL_LINUX_VERSION);
 
        load_fs_info();
 

diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
index d83f9e0828fd873cae49fee970810bbcc531cc86..0a296f32ada76be21383acfa5cb06151b051ef56 100644 (file)
--- a/disk-utils/mkfs.bfs.c
+++ b/disk-utils/mkfs.bfs.c
@@ -86,7 +86,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 
 static void __attribute__ ((__noreturn__)) print_version(void)
 {
-       printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+       printf(UTIL_LINUX_VERSION);
        exit(EXIT_SUCCESS);
 }
 

diff --git a/disk-utils/mkfs.c b/disk-utils/mkfs.c
index 1929a9072a34d1165239cc714a3bac9bb81150d2..55506c0559c6ff43097e42b474b0d3c5beaea6e6 100644 (file)
--- a/disk-utils/mkfs.c
+++ b/disk-utils/mkfs.c
@@ -57,8 +57,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out)
 
 static void __attribute__ ((__noreturn__)) print_version(void)
 {
-       printf(_("%s from %s\n"),
-              program_invocation_short_name, PACKAGE_STRING);
+       printf(UTIL_LINUX_VERSION);
        exit(EXIT_SUCCESS);
 }
 
@@ -128,8 +127,7 @@ int main(int argc, char **argv)
        argv[--optind] = progname;
 
        if (verbose) {
-               printf(_("%s from %s\n"),
-                      program_invocation_short_name, PACKAGE_STRING);
+               printf(UTIL_LINUX_VERSION);
                i = optind;
                while (argv[i])
                        printf("%s ", argv[i++]);

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index f504a32360be6d601e23b9f2995c52f34c7c1fde..8abc0455ddc7a561cffba58b3d16e2b0e7ed0112 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -760,8 +760,7 @@ int main(int argc, char **argv)
                        /* old option, ignored */
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name, PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(MKFS_EX_OK);
                case 'v':
                        verbose = 1;

diff --git a/fdisks/sfdisk.c b/fdisks/sfdisk.c
index e59d52a2b15efd256be25dd1df979bbf9e13a2bb..d98df9a96aaad76de7d7aeb8284502c4f1510460 100644 (file)
--- a/fdisks/sfdisk.c
+++ b/fdisks/sfdisk.c
@@ -2623,8 +2623,7 @@ main(int argc, char **argv) {
            set_format(*optarg);
            break;
        case 'v':
-           printf(_("%s from %s\n"), program_invocation_short_name,
-                  PACKAGE_STRING);
+           printf(UTIL_LINUX_VERSION);
            return EXIT_SUCCESS;
        case 'h':
            usage(stdout);

diff --git a/misc-utils/cal.c b/misc-utils/cal.c
index 0e204b99f30f026a00dc6a63b21f7dfd7386de7b..3a82c81aca96a2a6009622e35c5767e72c701031 100644 (file)
--- a/misc-utils/cal.c
+++ b/misc-utils/cal.c
@@ -350,8 +350,7 @@ main(int argc, char **argv) {
                        yflag = 1;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c
index 8de469b1b2661f8469a5b366424f81bf986f5155..9e94452e7840a7f21521015741e66662be46a885 100644 (file)
--- a/misc-utils/getopt.c
+++ b/misc-utils/getopt.c
@@ -428,9 +428,7 @@ int main(int argc, char *argv[])
                        quote = 0;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case '?':
                case ':':

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 6abfd24a11942d8e9daa596cf023911e744193e7..8c06a456ad051f7efc50338858d7b6b3d514f4e6 100644 (file)
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -190,7 +190,7 @@ int main (int argc, char *argv[])
        }
        if (! strcmp (arg, "-v") || ! strcmp (arg, "-V") ||
            ! strcmp (arg, "--version")) {
-           printf(_("%s from %s\n"), progname, PACKAGE_STRING);
+           printf(UTIL_LINUX_VERSION);
            return 0;
        }
        if (! strcmp (arg, "-a")) {

diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index ecdbfe372ad2353ba72f1e966f5013644ac09f0e..63cd35598ab76c8876a5af3aced587b1c4f9220f 100644 (file)
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -261,8 +261,7 @@ main(int argc, char **argv) {
                        udpport = optarg;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/look.c b/misc-utils/look.c
index 7bbec1b206f443dd9c58ff5ae63cc59518ac4368..83a4ee9c2389cd333e17766f8fe8c2f0e36e19ef 100644 (file)
--- a/misc-utils/look.c
+++ b/misc-utils/look.c
@@ -123,9 +123,7 @@ main(int argc, char *argv[])
                        termchar = *optarg;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                               program_invocation_short_name,
-                               PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 8ee69748f1d68ca73dcd374143a0ac7d5e7396fd..26d7f505a5c05416b469f8aec79e47507a51c61b 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -1506,8 +1506,7 @@ int main(int argc, char *argv[])
                        columns[ncolumns++] = COL_TRANSPORT;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                               PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
                        help(stderr);

diff --git a/misc-utils/mcookie.c b/misc-utils/mcookie.c
index b7b1762dc5ce7d6e94c537c317e334ff95a45135..e9fdfd1a1008f517e866039a34709e121630f865 100644 (file)
--- a/misc-utils/mcookie.c
+++ b/misc-utils/mcookie.c
@@ -116,9 +116,7 @@ int main(int argc, char **argv)
                        file = optarg;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/namei.c b/misc-utils/namei.c
index 97c5d43d26f470f15c42cbacf4e465728c404de7..048ac42b38d02a0bd2f8cfada2a65078c0d6abec 100644 (file)
--- a/misc-utils/namei.c
+++ b/misc-utils/namei.c
@@ -463,8 +463,7 @@ main(int argc, char **argv)
                        usage(EXIT_SUCCESS);
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'l':
                        flags |= (NAMEI_OWNERS | NAMEI_MODES | NAMEI_VERTICAL);

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 3dde49e1b7d8fd66acabd3f48649003bd48af92e..668aac7a3f796102065da3bcf405e06a30d04f0a 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -577,9 +577,7 @@ int main(int argc, char **argv)
                        }
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 6c22fce64efbf45bee81a693c345b9f0371109df..450e26a0535b9dca220fb976649565c07eac4d21 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -74,9 +74,7 @@ main (int argc, char *argv[])
                        do_type = DO_TYPE_RANDOM;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"),
-                               program_invocation_short_name,
-                               PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        usage(stdout);

diff --git a/misc-utils/whereis.c b/misc-utils/whereis.c
index 095ca6282d01b976e1560085d7128ba9140ef643..3528d62664b923f7f097d7b2b5aa7196c80cbacb 100644 (file)
--- a/misc-utils/whereis.c
+++ b/misc-utils/whereis.c
@@ -464,9 +464,7 @@ main(int argc, char **argv)
                                mflag++;
                                continue;
                        case 'V':
-                               printf(_("%s from %s\n"),
-                                       program_invocation_short_name,
-                                       PACKAGE_STRING);
+                               printf(UTIL_LINUX_VERSION);
                                return EXIT_SUCCESS;
                        case 'h':
                                usage(stdout);

diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c
index a29f3ccf8004e0f73c8b40354e786c4c3ba9fbcd..9fbfda9960f4cc01848862b0806cdc13424e6c5f 100644 (file)
--- a/misc-utils/wipefs.c
+++ b/misc-utils/wipefs.c
@@ -445,8 +445,7 @@ main(int argc, char **argv)
                        type_pattern = optarg;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                               PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
                        usage(stderr);

diff --git a/mount-deprecated/umount.c b/mount-deprecated/umount.c
index da3b05b819266c649876e793a1cb83dbed102d34..97a76811d989e9a02f97562a0f5f592942645101 100644 (file)
--- a/mount-deprecated/umount.c
+++ b/mount-deprecated/umount.c
@@ -811,8 +811,7 @@ main (int argc, char *argv[]) {
                        ++verbose;
                        break;
                case 'V':               /* version */
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name, PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit (0);
                case 't':               /* specify file system type */
                        types = optarg;