From 2c308875a7fa1aaa44892c368f6b37bcfcb8879a Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 16 Apr 2019 15:14:13 +0200 Subject: misc: consolidate version printing and close_stdout() Signed-off-by: Karel Zak --- sys-utils/prlimit.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sys-utils/prlimit.c') diff --git a/sys-utils/prlimit.c b/sys-utils/prlimit.c index 6f806362d..607849066 100644 --- a/sys-utils/prlimit.c +++ b/sys-utils/prlimit.c @@ -516,7 +516,7 @@ int main(int argc, char **argv) setlocale(LC_ALL, ""); bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); - atexit(close_stdout); + close_stdout_atexit(); INIT_LIST_HEAD(&lims); @@ -584,8 +584,6 @@ int main(int argc, char **argv) errx(EXIT_FAILURE, _("option --pid may be specified only once")); pid = strtos32_or_err(optarg, _("invalid PID argument")); break; - case 'h': - usage(); case 'o': ncolumns = string_to_idarray(optarg, columns, ARRAY_SIZE(columns), @@ -593,10 +591,6 @@ int main(int argc, char **argv) if (ncolumns < 0) return EXIT_FAILURE; break; - case 'V': - printf(UTIL_LINUX_VERSION); - return EXIT_SUCCESS; - case NOHEADINGS_OPTION: no_headings = 1; break; @@ -606,6 +600,11 @@ int main(int argc, char **argv) case RAW_OPTION: raw = 1; break; + + case 'h': + usage(); + case 'V': + print_version(EXIT_SUCCESS); default: errtryhelp(EXIT_FAILURE); } -- cgit v1.2.3-55-g7522