diff options
| author | Karel Zak | 2019-04-16 15:14:13 +0200 |
|---|---|---|
| committer | Karel Zak | 2019-04-16 15:14:13 +0200 |
| commit | 2c308875a7fa1aaa44892c368f6b37bcfcb8879a (patch) | |
| tree | 157ea7afca59059676dbcc25133dd196d1e45fb8 /misc-utils/findmnt.c | |
| parent | include/c: add print_version() macro (diff) | |
| download | kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.tar.gz kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.tar.xz kernel-qcow2-util-linux-2c308875a7fa1aaa44892c368f6b37bcfcb8879a.zip | |
misc: consolidate version printing and close_stdout()
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils/findmnt.c')
| -rw-r--r-- | misc-utils/findmnt.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index 331460bd1..eea772f0e 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -1348,7 +1348,7 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); /* default output format */ flags |= FL_TREE; @@ -1391,9 +1391,6 @@ int main(int argc, char *argv[]) case 'e': flags |= FL_EVALUATE; break; - case 'h': - usage(); - break; case 'i': flags |= FL_INVERT; break; @@ -1490,9 +1487,6 @@ int main(int argc, char *argv[]) case 'w': timeout = strtos32_or_err(optarg, _("invalid timeout argument")); break; - case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; case 'x': verify = 1; break; @@ -1508,6 +1502,11 @@ int main(int argc, char *argv[]) case FINDMNT_OPT_REAL: flags |= FL_REAL; break; + + case 'h': + usage(); + case 'V': + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |