textual: use version printing macro everywhere

Only mount, umount, and blkid remains not using the macro because they
are print also library references.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c
index e07278ffb8a652c32b18b4954a1a1158f903dd62..13e98b4b214df6a941382d524f56d4df0dda48cf 100644 (file)
--- a/disk-utils/cfdisk.c
+++ b/disk-utils/cfdisk.c
@@ -2065,8 +2065,7 @@ int main(int argc, char *argv[])
                                                _("unsupported color mode"));
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'z':
                        cf->zero_start = 1;

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 2dafc869fd9378fc05c8e051b585d9cb3770817c..81b7ae33783ef882bff8afdbecfc7126df274b61 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -665,7 +665,7 @@ int main(int argc, char ** argv) {
 
        if (argc == 2 &&
            (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))) {
-               printf(_("%s (%s)\n"), program_name, PACKAGE_STRING);
+               printf(UTIL_LINUX_VERSION);
                exit(MKFS_EX_OK);
        }
 

diff --git a/schedutils/chrt.c b/schedutils/chrt.c
index fec26fd55e1dee5cb5b972bb3facc042501fd84b..df115aaf6a84c0647210ab60cd2984a9e084768b 100644 (file)
--- a/schedutils/chrt.c
+++ b/schedutils/chrt.c
@@ -261,8 +261,7 @@ int main(int argc, char **argv)
                        verbose = 1;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'h':
                        ret = EXIT_SUCCESS;

diff --git a/schedutils/taskset.c b/schedutils/taskset.c
index 6ebca0636423791fcf9c3f8b6c0679e812bf53a4..4cda2ebe513a05c313e46702efe5fa1e5fe2f2f0 100644 (file)
--- a/schedutils/taskset.c
+++ b/schedutils/taskset.c
@@ -162,8 +162,7 @@ int main(int argc, char **argv)
                        ts.use_list = 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/sys-utils/chcpu.c b/sys-utils/chcpu.c
index ada0eaacca1ab9841e3c3f6940bd81408478f785..aba9d6bc84726f3c1df9cadaf64d25fc15c97baf 100644 (file)
--- a/sys-utils/chcpu.c
+++ b/sys-utils/chcpu.c
@@ -327,8 +327,7 @@ int main(int argc, char *argv[])
                        cmd = CMD_CPU_RESCAN;
                        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/sys-utils/dmesg.c b/sys-utils/dmesg.c
index 71e66325397651180d986c6a28fd716a65996b58..661aaa9d9889c43ad84f63a769b08098eb78c184 100644 (file)
--- a/sys-utils/dmesg.c
+++ b/sys-utils/dmesg.c
@@ -1332,8 +1332,7 @@ int main(int argc, char *argv[])
                                setbit(ctl.facilities, n);
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                case 'w':
                        ctl.follow = 1;

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index d0d422d2feeae461df805dccf5a6075f8f5769e6..9151d246ec443678cb6c0660a9dc2cdae5e33f49 100644 (file)
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1543,7 +1543,7 @@ static int compare_clock (const bool utc, const bool local_opt)
 
 static void out_version(void)
 {
-       printf(_("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING);
+       printf(UTIL_LINUX_VERSION);
 }
 
 /*

diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 8827424435aa66e0bcfaff0e2ce4ac4e5e26e48b..8ae702865bdc2a7efa4b5e28981b21d4bfe58dab 100644 (file)
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1724,8 +1724,7 @@ int main(int argc, char *argv[])
                        mod->hex = 1;
                        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/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
index 51ffb3c5a004698bb74c615e5696a43d9341e1bd..e1cd41d3a174409b184e5741cbbc14d2f18e142c 100644 (file)
--- a/sys-utils/rtcwake.c
+++ b/sys-utils/rtcwake.c
@@ -471,8 +471,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);
                        exit(EXIT_SUCCESS);
 
                case 'h':

diff --git a/sys-utils/tunelp.c b/sys-utils/tunelp.c
index 7beb8a721ab1573bd2445a53d67ccfea92a03097..08cef5c374e76401659e35dc92b5180a8613ea21 100644 (file)
--- a/sys-utils/tunelp.c
+++ b/sys-utils/tunelp.c
@@ -255,8 +255,7 @@ int main(int argc, char **argv)
 #endif
                case 'v':
                case 'V':
-                       printf(_("%s from %s\n"),
-                              program_invocation_short_name, PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        return EXIT_SUCCESS;
                default:
                        print_usage(stderr);

diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index a7044f0ff238071d50059cc33a8c36fe4340b43f..59012289957a639d65cb3a42730041097a88a15a 100644 (file)
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -770,8 +770,7 @@ static void parse_args(int argc, char **argv, struct options *op)
                        reload_agettys();
                        exit(EXIT_SUCCESS);
                case VERSION_OPTION:
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                              PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                case HELP_OPTION:
                        usage(stdout);

diff --git a/term-utils/script.c b/term-utils/script.c
index b9f87384a0a12d1130d2d0811146bf7542c2a7a1..ad16e7446056f539d30e83a6a42280e33db4610d 100644 (file)
--- a/term-utils/script.c
+++ b/term-utils/script.c
@@ -217,8 +217,7 @@ main(int argc, char **argv) {
                        tflg = 1;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                        break;
                case 'h':

diff --git a/term-utils/scriptreplay.c b/term-utils/scriptreplay.c
index ecea592e009d29a0be2dfe3a19efb7dfcdf02744..8e0cb971924756e7d8380d5349e0b9af5b1f5e64 100644 (file)
--- a/term-utils/scriptreplay.c
+++ b/term-utils/scriptreplay.c
@@ -174,8 +174,7 @@ main(int argc, char *argv[])
                        maxdelay = getnum(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/term-utils/write.c b/term-utils/write.c
index 146f4ba5e4c47fcd9a63c513eee8384e3cc318ea..4d217c4a566ff2270de74c3a840500fb289c83a6 100644 (file)
--- a/term-utils/write.c
+++ b/term-utils/write.c
@@ -110,9 +110,7 @@ int main(int argc, char **argv)
        while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (c) {
                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/text-utils/col.c b/text-utils/col.c
index 997f87b9139e7f69f399058156c937395f94e451..9b2f570caf29f973bcc56df5d69ab4ed7210836f 100644 (file)
--- a/text-utils/col.c
+++ b/text-utils/col.c
@@ -214,8 +214,7 @@ int main(int argc, char **argv)
                        compress_spaces = 0;
                        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/text-utils/colcrt.c b/text-utils/colcrt.c
index 6c7f6361d0ef9613f8554a9bff4d87f95bfc1db8..a5d597701e42cce4ee394c03dd1853b445c92fa6 100644 (file)
--- a/text-utils/colcrt.c
+++ b/text-utils/colcrt.c
@@ -115,9 +115,7 @@ int main(int argc, char **argv) {
                                printall = 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/text-utils/colrm.c b/text-utils/colrm.c
index 454085e7035e172139d51544ea8c7d2ab3632024..111033df79121ed9efabd1b6e2bf45c39c7a84f0 100644 (file)
--- a/text-utils/colrm.c
+++ b/text-utils/colrm.c
@@ -171,9 +171,7 @@ int main(int argc, char **argv)
                            NULL)) != -1)
                switch (opt) {
                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/text-utils/column.c b/text-utils/column.c
index 0ee5a9e894071ad9a4259b539fbfc448308ad295..e583dbafb90ae1c6fff61bf8120a4718bf42d5ab 100644 (file)
--- a/text-utils/column.c
+++ b/text-utils/column.c
@@ -149,9 +149,8 @@ int main(int argc, char **argv)
                        usage(EXIT_SUCCESS);
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                PACKAGE_STRING);
-                                return EXIT_SUCCESS;
+                       printf(UTIL_LINUX_VERSION);
+                       return EXIT_SUCCESS;
                case 'c':
                        termwidth = strtou32_or_err(optarg, _("invalid columns argument"));
                        break;

diff --git a/text-utils/rev.c b/text-utils/rev.c
index f1341cb3d297c764b33a05ab252a4bcb3c728c99..a661f0a434a268a8575fbf47ab5f7269776172f8 100644 (file)
--- a/text-utils/rev.c
+++ b/text-utils/rev.c
@@ -121,8 +121,7 @@ int main(int argc, char *argv[])
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch(ch) {
                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/text-utils/tailf.c b/text-utils/tailf.c
index d2366a6a009e8f6673da8485cdd753348868c910..94f999ea833fd1c5f945f6e777fdf23ff8d501cc 100644 (file)
--- a/text-utils/tailf.c
+++ b/text-utils/tailf.c
@@ -261,8 +261,7 @@ int main(int argc, char **argv)
                                        _("failed to parse number of lines"));
                        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/text-utils/ul.c b/text-utils/ul.c
index b3b3dc354c363bfc3011d68a2b0f10313bb4be9d..054f7b90ab7dcb8527df2ea6f0c800afb669c5e3 100644 (file)
--- a/text-utils/ul.c
+++ b/text-utils/ul.c
@@ -193,8 +193,7 @@ int main(int argc, char **argv)
                        iflag = 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);