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 /sys-utils/lsns.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 'sys-utils/lsns.c')
| -rw-r--r-- | sys-utils/lsns.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c index 38ea2e009..c298d6a3c 100644 --- a/sys-utils/lsns.c +++ b/sys-utils/lsns.c @@ -960,7 +960,7 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); lsns_init_debug(); memset(&ls, 0, sizeof(ls)); @@ -988,14 +988,9 @@ int main(int argc, char *argv[]) for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++) columns[ncolumns] = ncolumns; break; - case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; case 'p': ls.fltr_pid = strtos32_or_err(optarg, _("invalid PID argument")); break; - case 'h': - usage(); case 'n': ls.no_headings = 1; break; @@ -1019,6 +1014,11 @@ int main(int argc, char *argv[]) case 'W': ls.no_wrap = 1; break; + + case 'h': + usage(); + case 'V': + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } |