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/setarch.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/setarch.c')
| -rw-r--r-- | sys-utils/setarch.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys-utils/setarch.c b/sys-utils/setarch.c index fb4c4d333..f84e90b5b 100644 --- a/sys-utils/setarch.c +++ b/sys-utils/setarch.c @@ -315,7 +315,7 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); if (argc < 1) { warnx(_("Not enough arguments")); @@ -343,12 +343,6 @@ int main(int argc, char *argv[]) while ((c = getopt_long(argc, argv, "+hVv3BFILRSTXZ", longopts, NULL)) != -1) { switch (c) { - case 'h': - usage(archwrapper); - break; - case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; case 'v': verbose = 1; break; @@ -394,8 +388,13 @@ int main(int argc, char *argv[]) } else warnx(_("unrecognized option '--list'")); /* fallthrough */ + default: errtryhelp(EXIT_FAILURE); + case 'h': + usage(archwrapper); + case 'V': + print_version(EXIT_SUCCESS); } } |