misc: consolidate version printing and close_stdout()

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

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index b1b43251e73bf0b4833ac0137f1c0266388c372e..b391347fc6119112d98b137e91d40a86c16faa2b 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -655,7 +655,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(MNT_EX_USAGE);
 
@@ -691,9 +691,6 @@ int main(int argc, char **argv)
                case 'F':
                        mnt_context_enable_fork(cxt, TRUE);
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        mnt_context_disable_helpers(cxt, TRUE);
                        break;
@@ -707,9 +704,6 @@ int main(int argc, char **argv)
                case 'v':
                        mnt_context_enable_verbose(cxt, TRUE);
                        break;
-               case 'V':
-                       mount_print_version();
-                       break;
                case 'w':
                        append_option(cxt, "rw");
                        mnt_context_enable_rwonly_mount(cxt, TRUE);
@@ -829,6 +823,13 @@ int main(int argc, char **argv)
                case MOUNT_OPT_OPTSRC_FORCE:
                        optmode |= MNT_OMODE_FORCE;
                        break;
+
+               case 'h':
+                       mnt_free_context(cxt);
+                       usage();
+               case 'V':
+                       mnt_free_context(cxt);
+                       mount_print_version();
                default:
                        errtryhelp(MNT_EX_USAGE);
                }