misc: consolidate version printing and close_stdout()

[thirdparty/util-linux.git] / sys-utils / nsenter.c

diff --git a/sys-utils/nsenter.c b/sys-utils/nsenter.c
index fbfcf983181e4cbe24225106891eaaab4e36ab9f..f294b12579243ef29b5b42aa215f090a406a1398 100644 (file)
--- a/sys-utils/nsenter.c
+++ b/sys-utils/nsenter.c
@@ -245,17 +245,12 @@ 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, "+ahVt:m::u::i::n::p::C::U::S:G:r::w::FZ",
                            longopts, NULL)) != -1) {
                switch (c) {
-               case 'h':
-                       usage();
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'a':
                        do_all = true;
                        break;
@@ -336,6 +331,10 @@ int main(int argc, char *argv[])
                        selinux = 1;
                        break;
 #endif
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }