ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mount: add info about libmount features to --version output 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2012-01-23 12:28:05 +01:00
parent df51de6b37
commit ac8ecab4be
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys-utils/mount.c
View File

@ -75,11 +75,21 @@ static void __attribute__((__noreturn__)) exit_non_root(const char *option)
static void __attribute__((__noreturn__)) print_version(void)
{
const char *ver = NULL;
const char **features = NULL, **p;
mnt_get_library_version(&ver);
mnt_get_library_features(&features);
printf(_("%s from %s (libmount %s)\n"),
program_invocation_short_name, PACKAGE_STRING, ver);
printf(_("%s from %s (libmount %s"),
program_invocation_short_name,
PACKAGE_STRING,
ver);
p = features;
while (p && *p) {
fputs(p == features ? ": " : ", ", stdout);
fputs(*p++, stdout);
}
fputs(")\n", stdout);
exit(MOUNT_EX_SUCCESS);
}

18
sys-utils/umount.c
View File

@ -44,17 +44,27 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__)
return 0;
}
static void __attribute__((__noreturn__)) print_version(void)
{
const char *ver = NULL;
const char **features = NULL, **p;
mnt_get_library_version(&ver);
mnt_get_library_features(&features);
printf(_("%s from %s (libmount %s)\n"),
program_invocation_short_name, PACKAGE_STRING, ver);
printf(_("%s from %s (libmount %s"),
program_invocation_short_name,
PACKAGE_STRING,
ver);
p = features;
while (p && *p) {
fputs(p == features ? ": " : ", ", stdout);
fputs(*p++, stdout);
}
fputs(")\n", stdout);
exit(MOUNT_EX_SUCCESS);
}
static void __attribute__((__noreturn__)) usage(FILE *out)
{
fputs(USAGE_HEADER, out);
@ -66,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out)
fputs(USAGE_OPTIONS, out);
fprintf(out, _(
" -a, --all mount all filesystems mentioned in fstab\n"
" -a, --all umount all filesystems\n"
" -c, --no-canonicalize don't canonicalize paths\n"
" -d, --detach-loop if mounted loop device, also free this loop device\n"
" --fake dry run; skip the umount(2) syscall\n"