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/getopt.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/getopt.c')
-rw-r--r-- | misc-utils/getopt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/misc-utils/getopt.c b/misc-utils/getopt.c index 9b4f35279..3fa158eb3 100644 --- a/misc-utils/getopt.c +++ b/misc-utils/getopt.c @@ -379,7 +379,7 @@ int main(int argc, char *argv[]) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); if (getenv("GETOPT_COMPATIBLE")) ctl.compatible = 1; @@ -413,8 +413,6 @@ int main(int argc, char *argv[]) case 'a': getopt_long_fp = getopt_long_only; break; - case 'h': - usage(); case 'o': free(ctl.optstr); ctl.optstr = xstrdup(optarg); @@ -441,12 +439,14 @@ int main(int argc, char *argv[]) case 'u': ctl.quote = 0; break; + case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; + print_version(EXIT_SUCCESS); case '?': case ':': parse_error(NULL); + case 'h': + usage(); default: parse_error(_("internal error, contact the author.")); } |