summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenno Schulenberg2013-01-23 13:48:50 +0100
committerKarel Zak2013-01-30 15:24:00 +0100
commit0c6625a15d39047e008c1638679b6d9e82ff9554 (patch)
tree3d6f4876d6195bb9175c6270d3b0a8b53db91297
parentmkfs: indicate that specifying fs-type and fs-options are independent (diff)
downloadkernel-qcow2-util-linux-0c6625a15d39047e008c1638679b6d9e82ff9554.tar.gz
kernel-qcow2-util-linux-0c6625a15d39047e008c1638679b6d9e82ff9554.tar.xz
kernel-qcow2-util-linux-0c6625a15d39047e008c1638679b6d9e82ff9554.zip
textual: standardize the reporting of program name plus package version
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
-rw-r--r--disk-utils/fsck.minix.c2
-rw-r--r--sys-utils/flock.c3
-rw-r--r--text-utils/more.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 54e591872..fe920853d 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 11c44b6b6..6147e97ea 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 2c97950c6..b94ae49b1 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: