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 <kzak@redhat.com>
---
 sys-utils/unshare.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sys-utils/unshare.c')

diff --git a/sys-utils/unshare.c b/sys-utils/unshare.c
index e9ddb09de..21910a4ee 100644
--- a/sys-utils/unshare.c
+++ b/sys-utils/unshare.c
@@ -335,18 +335,13 @@ int main(int argc, char *argv[])
 	setlocale(LC_ALL, "");
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	textdomain(PACKAGE);
-	atexit(close_stdout);
+	close_stdout_atexit();
 
 	while ((c = getopt_long(argc, argv, "+fhVmuinpCUrR:w:S:G:", longopts, NULL)) != -1) {
 		switch (c) {
 		case 'f':
 			forkit = 1;
 			break;
-		case 'h':
-			usage();
-		case 'V':
-			printf(UTIL_LINUX_VERSION);
-			return EXIT_SUCCESS;
 		case 'm':
 			unshare_flags |= CLONE_NEWNS;
 			if (optarg)
@@ -420,6 +415,11 @@ int main(int argc, char *argv[])
 		case 'w':
 			newdir = optarg;
 			break;
+
+		case 'h':
+			usage();
+		case 'V':
+			print_version(EXIT_SUCCESS);
 		default:
 			errtryhelp(EXIT_FAILURE);
 		}
-- 
cgit v1.2.3-55-g7522