]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
misc: consolidate version printing and close_stdout()
authorKarel Zak <kzak@redhat.com>
Tue, 16 Apr 2019 13:14:13 +0000 (15:14 +0200)
committerKarel Zak <kzak@redhat.com>
Tue, 16 Apr 2019 13:14:13 +0000 (15:14 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
116 files changed:
Documentation/boilerplate.c
disk-utils/addpart.c
disk-utils/blockdev.c
disk-utils/cfdisk.c
disk-utils/delpart.c
disk-utils/fdformat.c
disk-utils/fdisk.c
disk-utils/fsck.c
disk-utils/fsck.cramfs.c
disk-utils/fsck.minix.c
disk-utils/isosize.c
disk-utils/mkfs.bfs.c
disk-utils/mkfs.c
disk-utils/mkfs.cramfs.c
disk-utils/mkfs.minix.c
disk-utils/mkswap.c
disk-utils/partx.c
disk-utils/raw.c
disk-utils/resizepart.c
disk-utils/sfdisk.c
disk-utils/swaplabel.c
include/c.h
login-utils/chfn.c
login-utils/chsh.c
login-utils/islocal.c
login-utils/last.c
login-utils/login.c
login-utils/logindefs.c
login-utils/lslogins.c
login-utils/newgrp.c
login-utils/nologin.c
login-utils/su-common.c
login-utils/sulogin.c
login-utils/utmpdump.c
login-utils/vipw.c
misc-utils/blkid.c
misc-utils/cal.c
misc-utils/fincore.c
misc-utils/findfs.c
misc-utils/findmnt.c
misc-utils/getopt.c
misc-utils/hardlink.c
misc-utils/kill.c
misc-utils/logger.c
misc-utils/look.c
misc-utils/lsblk.c
misc-utils/lslocks.c
misc-utils/mcookie.c
misc-utils/namei.c
misc-utils/rename.c
misc-utils/uuidd.c
misc-utils/uuidgen.c
misc-utils/uuidparse.c
misc-utils/whereis.c
misc-utils/wipefs.c
schedutils/chrt.c
schedutils/ionice.c
schedutils/taskset.c
sys-utils/blkdiscard.c
sys-utils/blkzone.c
sys-utils/chcpu.c
sys-utils/chmem.c
sys-utils/choom.c
sys-utils/ctrlaltdel.c
sys-utils/dmesg.c
sys-utils/eject.c
sys-utils/fallocate.c
sys-utils/flock.c
sys-utils/fsfreeze.c
sys-utils/fstrim.c
sys-utils/hwclock.c
sys-utils/ipcmk.c
sys-utils/ipcrm.c
sys-utils/ipcs.c
sys-utils/ldattach.c
sys-utils/losetup.c
sys-utils/lscpu.c
sys-utils/lsipc.c
sys-utils/lsmem.c
sys-utils/lsns.c
sys-utils/mount.c
sys-utils/mountpoint.c
sys-utils/nsenter.c
sys-utils/pivot_root.c
sys-utils/prlimit.c
sys-utils/readprofile.c
sys-utils/renice.c
sys-utils/rfkill.c
sys-utils/rtcwake.c
sys-utils/setarch.c
sys-utils/setpriv.c
sys-utils/setsid.c
sys-utils/swapoff.c
sys-utils/swapon.c
sys-utils/switch_root.c
sys-utils/tunelp.c
sys-utils/umount.c
sys-utils/unshare.c
sys-utils/wdctl.c
sys-utils/zramctl.c
term-utils/mesg.c
term-utils/script.c
term-utils/scriptreplay.c
term-utils/setterm.c
term-utils/wall.c
term-utils/write.c
text-utils/col.c
text-utils/colcrt.c
text-utils/colrm.c
text-utils/column.c
text-utils/hexdump.c
text-utils/line.c
text-utils/more.c
text-utils/pg.c
text-utils/rev.c
text-utils/ul.c

index a92f7f097bb3c97eb35cb25d841becb6e031350e..535e85c387c1850948039e748d7ee0b2dd7c4c88 100644 (file)
@@ -84,7 +84,7 @@ 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, "nr:zelfVh", longopts, NULL)) != -1)
                switch (c) {
@@ -98,8 +98,7 @@ int main(int argc, char **argv)
                case 'f':
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 018c99585f667bb204dde534f7280d1143830b5c..33abb36cab7b487beaf1878c310d04ff09efb709 100644 (file)
@@ -41,8 +41,7 @@ int main(int argc, char **argv)
        while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 5122460f0947d065e65c9ae0f18901f9f24a16a5..f1067c8152b2390345f673a39ffeb40e90f27f52 100644 (file)
@@ -238,7 +238,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc < 2) {
                warnx(_("not enough arguments"));
@@ -246,10 +246,8 @@ int main(int argc, char **argv)
        }
 
        /* -V not together with commands */
-       if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version")) {
-               printf(UTIL_LINUX_VERSION);
-               return EXIT_SUCCESS;
-       }
+       if (!strcmp(argv[1], "-V") || !strcmp(argv[1], "--version"))
+               print_version(EXIT_SUCCESS);
        if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help"))
                usage();
 
index ff1bc44c1d635a9632a45d697674f38b2d756847..376809974f053c1e063d488f3ee1d81c6268b5cb 100644 (file)
@@ -2667,7 +2667,7 @@ 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, "L::hVz", longopts, NULL)) != -1) {
                switch(c) {
@@ -2681,8 +2681,7 @@ int main(int argc, char *argv[])
                                                _("unsupported color mode"));
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'z':
                        cf->zero_start = 1;
                        break;
index dc069970d2bf2caf6f8b7ada9ec80454167f38d9..7ee0c525f0531c5429c757b376d425370854afa0 100644 (file)
@@ -41,8 +41,7 @@ int main(int argc, char **argv)
        while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index f461c82e1c60ed1f182dd74bf09d1881bb03e50c..c10776f76eac785cf43bd0e2025a1a01a7ceb90b 100644 (file)
@@ -186,7 +186,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "f:t:r:nVh", longopts, NULL)) != -1)
                switch (ch) {
@@ -204,8 +204,7 @@ int main(int argc, char **argv)
                        verify = 0;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 3e8ebf4a30d4cc04d6473f7ae57ef1e66665a2c4..c27485af2790d8e61edccc1281b5355a4fed371b 100644 (file)
@@ -891,7 +891,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        fdisk_init_debug(0);
        scols_init_debug(0);
@@ -990,8 +990,7 @@ int main(int argc, char **argv)
                        break;
                case 'V': /* preferred for util-linux */
                case 'v': /* for backward compatibility only */
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'w':
                        wipemode = wipemode_from_string(optarg);
                        if (wipemode < 0)
index 3afc88600d35d5faa59edde858aa7639ba9557cd..be25f9c95ff7112b9f72b1fcf0865672835491bd 100644 (file)
@@ -1450,10 +1450,8 @@ static void parse_argv(int argc, char *argv[])
                /* the only two longopts to satisfy UL standards */
                if (!opts_for_fsck && !strcmp(arg, "--help"))
                        usage();
-               if (!opts_for_fsck && !strcmp(arg, "--version")) {
-                       printf(UTIL_LINUX_VERSION);
-                       exit(FSCK_EX_OK);
-               }
+               if (!opts_for_fsck && !strcmp(arg, "--version"))
+                       print_version(FSCK_EX_OK);
 
                if ((arg[0] == '/' && !opts_for_fsck) || strchr(arg, '=')) {
                        if (num_devices >= MAX_DEVICES)
@@ -1621,7 +1619,7 @@ int main(int argc, char *argv[])
        setlocale(LC_CTYPE, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(FSCK_EX_USAGE);
        mnt_init_debug(0);              /* init libmount debug mask */
index ee9c20ab267f4722bf80112c4c30b08212791116..e1b964b64cad334fc4b0552fec4c27d081bb86ad 100644 (file)
@@ -660,7 +660,7 @@ int main(int argc, char **argv)
        setlocale(LC_CTYPE, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(FSCK_EX_USAGE);
 
@@ -674,8 +674,7 @@ int main(int argc, char **argv)
                        usage();
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return FSCK_EX_OK;
+                       print_version(FSCK_EX_OK);
                case 'x':
                        opt_extract = 1;
                        if(optarg)
index b978684a83cb8d99f1ed58d6786acd8ba6802e5b..246f254f3be6c7ccd2fd72ffb05b116015d3518f 100644 (file)
@@ -1291,7 +1291,7 @@ main(int argc, char **argv) {
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(FSCK_EX_USAGE);
 
@@ -1326,8 +1326,7 @@ main(int argc, char **argv) {
                        force = 1;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return FSCK_EX_OK;
+                       print_version(FSCK_EX_OK);
                case 'h':
                        usage();
                default:
index 85a549a1891905d86ffb594e1326ca16931a62b6..3c8d40f3caf30550cc6e7ca4668b9aac34f2c2d9 100644 (file)
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((opt = getopt_long(argc, argv, "d:xVh", longopts, NULL)) != -1) {
                switch (opt) {
@@ -190,8 +190,7 @@ int main(int argc, char **argv)
                        xflag = 1;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 77f253f1ed6b684b1b39c497a7926238f6084203..54d261b293d5de7dd75e79bc0130fafe61c3cebd 100644 (file)
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc < 2) {
                warnx(_("not enough arguments"));
index fbd575e7e0f349cbc347ab0e7a1b5304dc1c6305..8ba28c2f579c69729365c17be1d94c28fdf13324 100644 (file)
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc == 2 && !strcmp(argv[1], "-V"))
                print_version(EXIT_SUCCESS);
index bf07f8c67b61dce185a10d5103405da38995d3de..71320a0a9e63c816aa32ecde02c25182acfde670 100644 (file)
@@ -714,14 +714,14 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc > 1) {
                /* first arg may be one of our standard longopts */
                if (!strcmp(argv[1], "--help"))
                        usage();
                if (!strcmp(argv[1], "--version")) {
-                       printf(UTIL_LINUX_VERSION);
+                       print_version(EXIT_SUCCESS);
                        exit(MKFS_EX_OK);
                }
        }
@@ -770,8 +770,7 @@ int main(int argc, char **argv)
                        /* old option, ignored */
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(MKFS_EX_OK);
+                       print_version(MKFS_EX_OK);
                case 'v':
                        verbose = 1;
                        break;
index 8e6811f49d956f9b29d9ccbf5e8f1bcaa165e37d..ed03f4a42d04a989c9a08242d7c522bc884c96ce 100644 (file)
@@ -758,7 +758,7 @@ int main(int argc, char ** argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(MKFS_EX_USAGE);
 
@@ -792,8 +792,7 @@ int main(int argc, char ** argv)
                        listfile = optarg;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return MKFS_EX_OK;
+                       print_version(MKFS_EX_OK);
                case 'h':
                        usage();
                default:
index 28a139d4550cf65742791031e3d8fd046c580f28..659ebf0d712d1f07883a5992ab37a571a87b959a 100644 (file)
@@ -369,7 +369,7 @@ 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, "cfp:L:v:U:Vh", longopts, NULL)) != -1) {
                switch (c) {
@@ -400,8 +400,7 @@ int main(int argc, char **argv)
 #endif
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index e10efa96af64bdb567df86f5e9b0c07fb456faf7..949278eb79854bb00588268115efde477903ca4a 100644 (file)
@@ -832,7 +832,7 @@ 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,
                                "abdglrsuvn:t:o:PS:hV", long_opts, NULL)) != -1) {
@@ -901,8 +901,7 @@ int main(int argc, char **argv)
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 8abcbb747f282fd8a4446eb2b949e20f2c674965..b44a581a2d9599a59f6d8df300c0b8a76a65a47b 100644 (file)
@@ -108,7 +108,7 @@ 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, "qaVh", longopts, NULL)) != -1)
                switch (c) {
@@ -119,8 +119,7 @@ int main(int argc, char *argv[])
                        do_query_all = 1;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 527517f242f22a6e2a5fc991e96a6ffa14c1e83c..b2738271e25da14c3cf4f82d234f6c123c9ebc5d 100644 (file)
@@ -80,13 +80,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, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 2427cef5b3430f75640fdc24320de20c3fc281db..8166137c5407b92c33ce5c73db69d891c32460e8 100644 (file)
@@ -1994,7 +1994,7 @@ 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, "aAbcdfFgGhJlLo:O:nN:qrsTu:vVX:Y:w:W:",
                                        longopts, &longidx)) != -1) {
@@ -2079,9 +2079,7 @@ int main(int argc, char *argv[])
                                errx(EXIT_FAILURE, _("unsupported unit '%c'"), *optarg);
                        break;
                case 'v':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                                                 PACKAGE_STRING);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'V':
                        sf->verify = 1;
                        break;
index ccc226a02dccbbee5306569fa945cd4b5996a2e2..e6ba7d66d7f12f57e87f158decc659276cb5f4cc 100644 (file)
@@ -152,7 +152,7 @@ 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, "hVL:U:", longopts, NULL)) != -1) {
                switch (c) {
@@ -160,8 +160,7 @@ int main(int argc, char *argv[])
                        usage();
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'L':
                        label = optarg;
                        break;
index fb683525318211375c7568d5354ce3738409dbc6..fc69b910b7f9b586e541e3825341d550be732a7c 100644 (file)
@@ -351,6 +351,11 @@ static inline int xusleep(useconds_t usec)
 
 #define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING
 
+#define print_version(eval) __extension__ ({ \
+               printf(UTIL_LINUX_VERSION); \
+               exit(eval); \
+})
+
 /*
  * scanf modifiers for "strings allocation"
  */
index c5312fa0c4750e8e2b5ecdc10724e1f3581e5c43..a2e6e099e0fce484586301b0af5016fbc1f35a0e 100644 (file)
@@ -176,8 +176,7 @@ static void parse_argv(struct chfn_control *ctl, int argc, char **argv)
                        status += check_gecos_string(_("Home Phone"), optarg);
                        break;
                case 'v':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'u':
                        usage();
                default:
@@ -412,7 +411,8 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");  /* both for messages and for iscntrl() below */
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
+
        uid = getuid();
 
        /* check /etc/login.defs CHFN_RESTRICT */
index c267c727283fc15e85e1000df6eeb49568d70966..9b2761157342aaffaaf67a61d4a3eb69d9a7bd1b 100644 (file)
@@ -166,8 +166,7 @@ static void parse_argv(int argc, char **argv, struct sinfo *pinfo)
        while ((c = getopt_long(argc, argv, "s:lhuv", long_options, NULL)) != -1) {
                switch (c) {
                case 'v':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'u': /* deprecated */
                case 'h':
                        usage();
@@ -264,7 +263,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        parse_argv(argc, argv, &info);
        if (!info.username) {
index 7c4e775c1ac9fa43c7afbc2057f2e4d7e363b708..469bc5629de222caf1d047ecc3402a4c77009823 100644 (file)
@@ -91,7 +91,7 @@ int is_local(const char *user)
 #ifdef TEST_PROGRAM
 int main(int argc, char *argv[])
 {
-       atexit(close_stdout);
+       close_stdout_atexit();
        if (argc <= 2) {
                fprintf(stderr, _("Usage: %s <passwordfile> <username>...\n"),
                        argv[0]);
index 303adeacd8988255ebf1275cf40de0d4bdd8561f..2f7d9d48f5d0dcb2ea2f8239b73858807866c84e 100644 (file)
@@ -939,7 +939,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
        /*
         * Which file do we want to read?
         */
@@ -954,8 +954,7 @@ int main(int argc, char **argv)
                        usage(&ctl);
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'R':
                        ctl.showhost = 0;
                        break;
index ab819f16ff432cbd841c2b143841a23976a94296..a2d2725a6216b9ec0ab0efa25c35d53ce0980f6d 100644 (file)
@@ -1196,8 +1196,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case HELP_OPTION:
                        usage();
                default:
index 07a977660bbbc5e85a0d9ba6bb7e7c2b85c1d75e..2b505d255d564be365bbb812677e1f918a5778e9 100644 (file)
@@ -403,7 +403,7 @@ int get_hushlogin_status(struct passwd *pwd, int force_check)
 int main(int argc, char *argv[])
 {
        char *name, *type;
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc <= 1)
                errx(EXIT_FAILURE, "usage: %s <filename> "
index c913cf2d845f41e94e5ac5ecebc4ae88a77f0477..efb20a4f7c6b420364632fad82e4c6683e3f5a49 100644 (file)
@@ -1425,7 +1425,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        ctl->time_mode = TIME_SHORT;
 
@@ -1528,8 +1528,7 @@ int main(int argc, char *argv[])
                        ctl->time_mode = parse_time_mode(optarg);
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'Z':
                {
 #ifdef HAVE_LIBSELINUX
index 4538831480f5d24c1c2f67973b6547d489a161ae..5e4b4caa025ebfe2f301b3fa1f2b3513047c3177 100644 (file)
@@ -196,13 +196,12 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (ch) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index b0b6a721c16f9e5e337e0d6e4e46448ab5745f0b..14a091715e14fee51835c20531188d0ceb6a0e43 100644 (file)
@@ -54,10 +54,8 @@ int main(int argc, char *argv[])
                switch (c) {
                case 'h':
                        usage();
-                       break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_FAILURE;
+                       print_version(EXIT_FAILURE);    /* yes FAILURE! */
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 94289898d44c0e02e82855fb57cd99c47f513922..86beab99ca780be0b31edc1bc65cad8b64d436c6 100644 (file)
@@ -1321,7 +1321,7 @@ int su_main(int argc, char **argv, int mode)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        su_init_debug();
        su->conv.appdata_ptr = (void *) su;
@@ -1392,9 +1392,7 @@ int su_main(int argc, char **argv, int mode)
                        usage(mode);
 
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 5f09bd48e4ab9ddc8b7ab7deb703f25d24a3bd89..549870d224418ea2e0958953a4b4ed84b42dde19 100644 (file)
@@ -815,6 +815,8 @@ static void usage(void)
        fputs(USAGE_SEPARATOR, out);
        printf(USAGE_HELP_OPTIONS(26));
        printf(USAGE_MAN_TAIL("sulogin(8)"));
+
+       exit(EXIT_SUCCESS);
 }
 
 int main(int argc, char **argv)
@@ -853,7 +855,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout); /* XXX */
+       close_stdout_atexit();
 
        /*
         * See if we have a timeout flag.
@@ -870,11 +872,9 @@ int main(int argc, char **argv)
                        opt_e = 1;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
-                       return EXIT_SUCCESS;
                default:
                        /* Do not exit! getopt prints a warning. */
                        break;
index 5cc87834aef32e0897859cdda364363986891bd4..f1a3607dc0f240c9ea11c6ad8561b7404e0822a9 100644 (file)
@@ -334,7 +334,7 @@ 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, "fro:hV", longopts, NULL)) != -1) {
                switch (c) {
@@ -355,10 +355,8 @@ int main(int argc, char **argv)
 
                case 'h':
                        usage();
-                       break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 2502fcb4eab540814ce6c5d3dd9f8f4102d7d01c..2b35036e618e5de152043f2175f20e5d9cad9b6c 100644 (file)
@@ -325,7 +325,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (!strcmp(program_invocation_short_name, "vigr")) {
                program = VIGR;
@@ -338,8 +338,7 @@ int main(int argc, char *argv[])
        while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index c03e1bb8d3aa037cf5064aefe899331d71aa60fb..2b13f71c0fb019ac1ebb9465c12087a400016132 100644 (file)
@@ -686,7 +686,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(BLKID_EXIT_OTHER);
 
index bbb22505e70bd9cbaec5ac1f06d4c58b1d07eccc..c7e8d9511ec592f27da61bd981ba88105fd90bbb 100644 (file)
@@ -332,7 +332,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        term = getenv("TERM");
        if (term) {
@@ -435,8 +435,7 @@ int main(int argc, char **argv)
                        ctl.reform_year = ISO;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 6bad2c04012128fcd2a96920d50b49cffc7a91d7..0fb1a759a0f66f51a0af4768e37bca25c01cd387 100644 (file)
@@ -310,7 +310,7 @@ 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, "bno:JrVh", longopts, NULL)) != -1) {
                switch (c) {
@@ -330,8 +330,7 @@ int main(int argc, char ** argv)
                        ctl.raw = 1;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index a437bda84a691c7e7201bbf800f3b93590e0d55a..0997e1b49bd64f6670df31532a29ef061500928d 100644 (file)
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc != 2) {
                /* we return '2' for backward compatibility
@@ -62,8 +62,7 @@ int main(int argc, char **argv)
        while ((c = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return FINDFS_SUCCESS;
+                       print_version(FINDFS_SUCCESS);
                case 'h':
                        usage();
                default:
index 331460bd18651757945d54645caab62e944aa29a..eea772f0e6d5cf228b301ec3b50b0e6fd0cc828e 100644 (file)
@@ -1348,7 +1348,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        /* default output format */
        flags |= FL_TREE;
@@ -1391,9 +1391,6 @@ int main(int argc, char *argv[])
                case 'e':
                        flags |= FL_EVALUATE;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        flags |= FL_INVERT;
                        break;
@@ -1490,9 +1487,6 @@ int main(int argc, char *argv[])
                case 'w':
                        timeout = strtos32_or_err(optarg, _("invalid timeout argument"));
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'x':
                        verify = 1;
                        break;
@@ -1508,6 +1502,11 @@ int main(int argc, char *argv[])
                case FINDMNT_OPT_REAL:
                        flags |= FL_REAL;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 9b4f352795f5f006ba0645d4f09698f489015055..3fa158eb3bed57d78a7a4e1ae487e9ef1b2563a5 100644 (file)
@@ -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."));
                }
index f7cfc961bbe02a5fc37ba9f659fb1e4c7828b518..2a1e216a21737fda2ad565bcc0bdca0ff75f0590 100644 (file)
@@ -413,7 +413,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "cnvfx:Vh", longopts, NULL)) != -1) {
                switch (ch) {
@@ -438,8 +438,7 @@ int main(int argc, char **argv)
 #endif
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 726768bd192c8ac31e286ae4d5ecdcaebc159f9a..1ac61cf5a696acc61acf219f491cf4df104b8061 100644 (file)
@@ -213,10 +213,8 @@ static char **parse_arguments(int argc, char **argv, struct kill_control *ctl)
                        break;
                }
                if (!strcmp(arg, "-v") || !strcmp(arg, "-V") ||
-                   !strcmp(arg, "--version")) {
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-               }
+                   !strcmp(arg, "--version"))
+                       print_version(EXIT_SUCCESS);
                if (!strcmp(arg, "-h") || !strcmp(arg, "--help"))
                        usage();
                if (!strcmp(arg, "--verbose")) {
@@ -343,7 +341,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        argv = parse_arguments(argc, argv, &ctl);
 
index d6cee8287b0f3088f3099259e564eaa7e95616b9..a99a0c96cdf5e93d2a36c94361c75deee0ce88aa 100644 (file)
@@ -1155,7 +1155,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        INIT_LIST_HEAD(&ctl.user_sds);
        INIT_LIST_HEAD(&ctl.reserved_sds);
@@ -1212,11 +1212,6 @@ int main(int argc, char **argv)
                case 'P':
                        ctl.port = optarg;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-               case 'h':
-                       usage();
                case OPT_OCTET_COUNT:
                        ctl.octet_count = 1;
                        break;
@@ -1263,6 +1258,11 @@ int main(int argc, char **argv)
                                errx(EXIT_FAILURE, _("invalid structured data parameter: '%s'"), optarg);
                        add_structured_data_param(get_user_structured_data(&ctl), optarg);
                        break;
+
+               case 'V':
+                       print_version(EXIT_SUCCESS);
+               case 'h':
+                       usage();
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index d2699bfdd695c2dc963c23601f08a94e7a62c226..d3f0622c346517d446d8ec218150643b2ba572d8 100644 (file)
@@ -100,7 +100,7 @@ main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        setlocale(LC_ALL, "");
 
@@ -127,8 +127,7 @@ main(int argc, char *argv[])
                        termchar = *optarg;
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 915a062baa0f2dd95c7793e3fda79e9d1280fb16..c8683854c6d5760b22d218aaa9b2195dca6e1a5c 100644 (file)
@@ -1814,7 +1814,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        lsblk = &_ls;
 
@@ -1849,9 +1849,6 @@ int main(int argc, char *argv[])
                case 'e':
                        parse_excludes(optarg);
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'J':
                        lsblk->flags |= LSBLK_JSON;
                        break;
@@ -1939,9 +1936,6 @@ int main(int argc, char *argv[])
                case OPT_SYSROOT:
                        lsblk->sysroot = optarg;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'E':
                        lsblk->dedup_id = column_name_to_id(optarg, strlen(optarg));
                        if (lsblk->dedup_id >= 0)
@@ -1953,7 +1947,13 @@ int main(int argc, char *argv[])
                        lsblk->sort_id = column_name_to_id(optarg, strlen(optarg));
                        if (lsblk->sort_id >= 0)
                                break;
-                       /* fallthrough */
+                       errtryhelp(EXIT_FAILURE);
+                       break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index f83fb76f2dcc36a647f8a0323f6b566ab5accadb..18922e546868284c8a4e7930464f9fd7a276604f 100644 (file)
@@ -585,7 +585,7 @@ 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,
                                "biJp:o:nruhV", long_opts, NULL)) != -1) {
@@ -612,11 +612,6 @@ int main(int argc, char *argv[])
                        for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++)
                                columns[ncolumns] = ncolumns;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
-               case 'h':
-                       usage();
                case 'n':
                        no_headings = 1;
                        break;
@@ -626,6 +621,11 @@ int main(int argc, char *argv[])
                case 'u':
                        disable_columns_truncate();
                        break;
+
+               case 'V':
+                       print_version(EXIT_SUCCESS);
+               case 'h':
+                       usage();
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 8598ac3452dffedd398f21d2b6f687fff94ded21..ea29a8209f4a2161b87b24284377fabc54b1e8cf 100644 (file)
@@ -147,7 +147,7 @@ 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, "f:m:vVh", longopts, NULL)) != -1) {
                switch (c) {
@@ -163,9 +163,9 @@ int main(int argc, char **argv)
                        ctl.maxsz = strtosize_or_err(optarg,
                                                     _("failed to parse length"));
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 60171f60028225f3b616ad6145ba7f0884413254..9c5f5fa4ac3952423c1c5f9e4b4d3ae4b157c148 100644 (file)
@@ -372,16 +372,10 @@ 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, "hVlmnovx", longopts, NULL)) != -1) {
                switch(c) {
-               case 'h':
-                       usage();
-                       break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'l':
                        flags |= (NAMEI_OWNERS | NAMEI_MODES | NAMEI_VERTICAL);
                        break;
@@ -400,6 +394,11 @@ main(int argc, char **argv)
                case 'v':
                        flags |= NAMEI_VERTICAL;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 1d9315793ac1f767b75afdb2cccda8c114f7e068..a9378af59be687a144efb8ba7d08430d645ee9c5 100644 (file)
@@ -243,7 +243,7 @@ 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, "vsVhnoi", longopts, NULL)) != -1)
                switch (c) {
@@ -264,9 +264,9 @@ int main(int argc, char **argv)
                case 's':
                        do_rename = do_symlink;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 0382bac47d0b9f001d7de44f7f5d94619a7fe308..af24efc14f9d8882ff8b2300d1dfa8f685c7722b 100644 (file)
@@ -576,7 +576,7 @@ 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, "p:s:T:krtn:PFSdqVh", longopts,
@@ -629,9 +629,9 @@ int main(int argc, char **argv)
                        uuidd_cxt.timeout = strtou32_or_err(optarg,
                                                _("failed to parse --timeout"));
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index c1970695389cdf6c17eba99e57891c80b7069b4c..fa148abae6fac673e5a563cdb2a047e281e3414b 100644 (file)
@@ -104,7 +104,7 @@ 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, "rtVhn:N:msx", longopts, NULL)) != -1)
                switch (c) {
@@ -114,9 +114,6 @@ main (int argc, char *argv[])
                case 'r':
                        do_type = UUID_TYPE_DCE_RANDOM;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'n':
                        namespace = optarg;
                        break;
@@ -132,8 +129,11 @@ main (int argc, char *argv[])
                case 'x':
                        is_hex = 1;
                        break;
+
                case 'h':
                        usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 6a13f2a2b91bd2d648671488f9165e68e6f573d7..eae0b71a15cad495881ee4db62899b2e4b8dacc1 100644 (file)
@@ -304,7 +304,7 @@ 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, "Jno:rVh", longopts, NULL)) != -1) {
                err_exclusive_options(c, longopts, excl, excl_st);
@@ -321,9 +321,9 @@ int main(int argc, char **argv)
                case 'r':
                        ctrl.raw = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 2d4c58125a672d9a5346a7e8c5eae7f845a4fbb4..21f381321bc88e19065142228ddff92fd302ee5a 100644 (file)
@@ -512,7 +512,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc <= 1) {
                warnx(_("not enough arguments"));
@@ -521,10 +521,8 @@ int main(int argc, char **argv)
                /* first arg may be one of our standard longopts */
                if (!strcmp(argv[1], "--help"))
                        usage();
-               if (!strcmp(argv[1], "--version")) {
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-               }
+               if (!strcmp(argv[1], "--version"))
+                       print_version(EXIT_SUCCESS);
        }
 
        whereis_init_debug();
@@ -628,9 +626,9 @@ int main(int argc, char **argv)
                        case 'l':
                                list_dirlist(ls);
                                break;
+
                        case 'V':
-                               printf(UTIL_LINUX_VERSION);
-                               return EXIT_SUCCESS;
+                               print_version(EXIT_SUCCESS);
                        case 'h':
                                usage();
                        default:
index 13a720e85fbce8fa04878e8636bc4ba926002fb8..78e5ac376ecb5da63daca41834b6ab3d7c6cc170 100644 (file)
@@ -700,7 +700,7 @@ 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, "abfhiJnO:o:pqt:V", longopts, NULL)) != -1) {
 
@@ -716,9 +716,6 @@ main(int argc, char **argv)
                case 'f':
                        ctl.force = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'J':
                        ctl.json = 1;
                        break;
@@ -745,9 +742,11 @@ main(int argc, char **argv)
                case 't':
                        ctl.type_pattern = optarg;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index b08c78ed8ae90f7c6b8a0b3b1710736801b8724f..cc3a8c2f0e8945be43b487c046c051b3c9107cfb 100644 (file)
@@ -434,7 +434,7 @@ 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, "+abdD:fiphmoP:T:rRvV", longopts, NULL)) != -1)
        {
@@ -489,9 +489,9 @@ int main(int argc, char **argv)
                case 'D':
                        ctl->deadline = strtou64_or_err(optarg, _("invalid deadline argument"));
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index b4c6a82a2e1b02e80d99c9ec6e59a43f406447ce..ae2c73ea5b5b2f928bebbee52e26644f3c4a8a74 100644 (file)
@@ -149,7 +149,7 @@ 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, "+n:c:p:P:u:tVh", longopts, NULL)) != EOF)
                switch (c) {
@@ -197,9 +197,9 @@ int main(int argc, char **argv)
                case 't':
                        tolerant = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index fe79cd63145d8ef937be38685f7d118474cedc8c..56db817924dcb268c456618930de18f228b7f550 100644 (file)
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        memset(&ts, 0, sizeof(ts));
 
@@ -173,12 +173,11 @@ int main(int argc, char **argv)
                case 'c':
                        ts.use_list = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
-                       break;
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index c19b67bf4d9d13bdd7b94d4fd532a3abcdd4b46d..f9ba5e468e38be2d4f69f7d88a2a322fdd6ef8a5 100644 (file)
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        range[0] = 0;
        range[1] = ULLONG_MAX;
@@ -135,12 +135,6 @@ int main(int argc, char **argv)
 
        while ((c = getopt_long(argc, argv, "hVsvo:l:p:z", longopts, NULL)) != -1) {
                switch(c) {
-               case 'h':
-                       usage();
-                       break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'l':
                        range[1] = strtosize_or_err(optarg,
                                        _("failed to parse length"));
@@ -162,6 +156,11 @@ int main(int argc, char **argv)
                case 'z':
                        act = ACT_ZEROOUT;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 1dcbdf500422f192137538cefe849b288f785017..5fd5da7a368b3accec6e89460853164bba41317c 100644 (file)
@@ -357,7 +357,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc >= 2 && *argv[1] != '-') {
                ctl.command = name_to_command(argv[1]);
@@ -372,9 +372,6 @@ int main(int argc, char **argv)
                err_exclusive_options(c, longopts, excl, excl_st);
 
                switch (c) {
-               case 'h':
-                       usage();
-                       break;
                case 'c':
                        ctl.count = strtou32_or_err(optarg,
                                        _("failed to parse number of zones"));
@@ -390,9 +387,11 @@ int main(int argc, char **argv)
                case 'v':
                        ctl.verbose = 1;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 4060a4ca4ac7d75527b546a87c0e51dc95c7fdef..c4e5bc7e297d98152b62c4216c41035ccb12a4b1 100644 (file)
@@ -288,7 +288,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        ul_path_init_debug();
        sys = ul_new_path(_PATH_SYS_CPU);
@@ -329,8 +329,6 @@ int main(int argc, char *argv[])
                        cmd = CMD_CPU_DECONFIGURE;
                        cpu_parse(argv[optind - 1], cpu_set, setsize);
                        break;
-               case 'h':
-                       usage();
                case 'p':
                        if (strcmp("horizontal", argv[optind - 1]) == 0)
                                cmd = CMD_CPU_DISPATCH_HORIZONTAL;
@@ -343,9 +341,11 @@ int main(int argc, char *argv[])
                case 'r':
                        cmd = CMD_CPU_RESCAN;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 861f6cfd22906de43eb08d560bcaadf0bec2c72e..b3645be19d5113a5a7aea39813a6fab5dedab291 100644 (file)
@@ -379,7 +379,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        ul_path_init_debug();
        desc->sysmem = ul_new_path(_PATH_SYS_MEMORY);
@@ -402,18 +402,17 @@ int main(int argc, char **argv)
                case 'b':
                        desc->use_blocks = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'v':
                        desc->verbose = 1;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'z':
                        zone = xstrdup(optarg);
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index eff95b6bf718e75af008f63bb7e4142695670a5a..1096ab1863ed13fcbebfc8e20c4bee6e9b0c0ee2 100644 (file)
@@ -94,7 +94,7 @@ 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, "hn:p:V", longopts, NULL)) != -1) {
                switch (c) {
@@ -105,9 +105,9 @@ int main(int argc, char **argv)
                        adj = strtos32_or_err(optarg, _("invalid adjust argument"));
                        has_adj = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index ea662c4868f5ead0e24797fb701ca963e50ac618..9ead946213579c80efe062b01690057b6ffbccdb 100644 (file)
@@ -93,13 +93,12 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (ch) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index ba4e2252837d717171e5f3e26bceb4824b7b326f..f96e5bdf7e52a1c2c26a086d87adb415f91f3ac0 100644 (file)
@@ -1354,7 +1354,7 @@ 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, "CcDdEeF:f:HhkL::l:n:iPprSs:TtuVwx",
                                longopts, NULL)) != -1) {
@@ -1395,9 +1395,6 @@ int main(int argc, char *argv[])
                        colormode = UL_COLORMODE_AUTO;
                        ctl.pager = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'k':
                        ctl.fltr_fac = 1;
                        setbit(ctl.facilities, FAC_BASE(LOG_KERN));
@@ -1447,9 +1444,6 @@ int main(int argc, char *argv[])
                        for (n = 1; (size_t) n < ARRAY_SIZE(facility_names); n++)
                                setbit(ctl.facilities, n);
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'w':
                        ctl.follow = 1;
                        break;
@@ -1459,6 +1453,11 @@ int main(int argc, char *argv[])
                case OPT_TIME_FORMAT:
                        ctl.time_fmt = which_time_format(optarg);
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 81cd2bcff6a78b094f64ccd2d491d7b22536cae2..d2e76d2ffeabbb5c488582c4b6249f0845f1c3e6 100644 (file)
@@ -222,9 +222,6 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
                case 'F':
                        ctl->F_option = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        ctl->i_option = 1;
                        ctl->i_arg = parse_switch(optarg, _("argument error"),
@@ -263,10 +260,11 @@ static void parse_args(struct eject_control *ctl, int argc, char **argv)
                case 'v':
                        ctl->v_option = 1;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-                       break;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                        break;
@@ -849,7 +847,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL,"");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        /* parse the command line arguments */
        parse_args(&ctl, argc, argv);
index ba3867cae8e07334a77b63b32b518155986fd030..04a3eaff53b77d8575725f9990396633d0416956 100644 (file)
@@ -312,7 +312,7 @@ 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, "hvVncpdizxl:o:", longopts, NULL))
                        != -1) {
@@ -320,9 +320,6 @@ int main(int argc, char **argv)
                err_exclusive_options(c, longopts, excl, excl_st);
 
                switch(c) {
-               case 'h':
-                       usage();
-                       break;
                case 'c':
                        mode |= FALLOC_FL_COLLAPSE_RANGE;
                        break;
@@ -357,9 +354,11 @@ int main(int argc, char **argv)
                case 'v':
                        verbose++;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 57153c8d9af0a2d3884410aca5fe47955f696a03..8dddebefd57734c362dd4789352e12edb42db181 100644 (file)
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(EX_USAGE);
 
@@ -216,9 +216,9 @@ int main(int argc, char *argv[])
                case OPT_VERBOSE:
                        verbose = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EX_OK);
+                       print_version(EX_OK);
                case 'h':
                        usage();
                default:
index 401ab5c980c3f9078fdb56b8fff78db7381d7665..4da1a6fa3cf284c53f64af4dc117230c09909814 100644 (file)
@@ -84,18 +84,17 @@ int main(int argc, char **argv)
                err_exclusive_options(c, longopts, excl, excl_st);
 
                switch(c) {
-               case 'h':
-                       usage();
-                       break;
                case 'f':
                        action = FREEZE;
                        break;
                case 'u':
                        action = UNFREEZE;
                        break;
+
+               case 'h':
+                       usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 830556458a7f392daf1ed49150b0aeaa63177d4e..87a9031b7f146cba9cf02f914594a645728b4668 100644 (file)
@@ -381,7 +381,7 @@ 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, "Aahl:m:no:Vv", longopts, NULL)) != -1) {
                switch(c) {
@@ -394,12 +394,6 @@ int main(int argc, char **argv)
                case 'n':
                        ctl.dryrun = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'l':
                        ctl.range.len = strtosize_or_err(optarg,
                                        _("failed to parse length"));
@@ -415,9 +409,13 @@ int main(int argc, char **argv)
                case 'v':
                        ctl.verbose = 1;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
-                       break;
                }
        }
 
index 5f4c014fc54d999c6c8cf6f23f212f640b6a0f24..9512f696ef9de7357d828d1f5c6ed0daab2df644 100644 (file)
@@ -1259,7 +1259,7 @@ int main(int argc, char **argv)
 #endif
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((c = getopt_long(argc, argv,
                                "hvVDd:alrsuwf:", longopts, NULL)) != -1) {
@@ -1359,9 +1359,9 @@ int main(int argc, char **argv)
                        ctl.rtc_dev_name = optarg;      /* --rtc */
                        break;
 #endif
+
                case 'V':                       /* --version */
-                       out_version();
-                       return 0;
+                       print_version(EXIT_SUCCESS);
                case 'h':                       /* --help */
                        usage();
                default:
index df836525a1a743b417a57df4b6beb110168e9990..8aadffbbbacd69b3a8378eb24a80f202b0e0b2dd 100644 (file)
@@ -102,7 +102,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while((opt = getopt_long(argc, argv, "hM:QS:p:Vh", longopts, NULL)) != -1) {
                switch(opt) {
@@ -120,12 +120,11 @@ int main(int argc, char **argv)
                case 'p':
                        permission = strtoul(optarg, NULL, 8);
                        break;
+
                case 'h':
                        usage();
-                       break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index a9f2d1b9ada28723a7d0f61d3034eddd862ba923..5a27b7d2099e7654689983f31d82f5d24c48414a 100644 (file)
@@ -328,7 +328,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        /* check to see if the command is being invoked in the old way if so
         * then remove argument list */
@@ -400,11 +400,11 @@ int main(int argc, char **argv)
                case 'v':
                        verbose = 1;
                        break;
+
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 73cf28ab1c123c76aec7f09a0b94eb508f02098d..2d18a13cced6db1640b86f2febf28e2fa4f408ec 100644 (file)
@@ -108,7 +108,7 @@ int main (int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((opt = getopt_long(argc, argv, options, longopts, NULL)) != -1) {
                switch (opt) {
@@ -149,11 +149,11 @@ int main (int argc, char **argv)
                case 'b':
                        unit = IPC_UNIT_BYTES;
                        break;
+
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index fb50711eb5eb75994a0580fd61cdd1208f0e8151..3019e5a9fd2f71396b510ba4b6a3d5608114068d 100644 (file)
@@ -354,9 +354,9 @@ int main(int argc, char **argv)
                case 'i':
                        parse_iflag(optarg, &set_iflag, &clr_iflag);
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 3dbbcdd3ebc14df28ca9b603f48e9c6094886521..d862fd8e733755cd1883c2a6967833ba9547be39 100644 (file)
@@ -683,9 +683,6 @@ int main(int argc, char **argv)
                case 'f':
                        act = A_FIND_FREE;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'J':
                        json = 1;
                        break;
@@ -730,13 +727,15 @@ int main(int argc, char **argv)
                        break;
                case 'v':
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case OPT_SIZELIMIT:                     /* --sizelimit */
                        sizelimit = strtosize_or_err(optarg, _("failed to parse size"));
                        flags |= LOOPDEV_FL_SIZELIMIT;
                         break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 774a27b3a0b309c5f81de5d550f5da6beb2e7172..9a5a1aa5b5376d112f63aa0329a41c1429d70c7a 100644 (file)
@@ -2280,8 +2280,6 @@ int main(int argc, char *argv[])
                        }
                        mod->mode = OUTPUT_CACHES;
                        break;
-               case 'h':
-                       usage();
                case 'J':
                        mod->json = 1;
                        break;
@@ -2308,12 +2306,14 @@ int main(int argc, char *argv[])
                case 'y':
                        mod->physical = 1;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case OPT_OUTPUT_ALL:
                        all = 1;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index e8ada571e784aa7f214153e28298dca4807736df..5ba9cd7bfe0a9717638a7dd3cdc8381a5f2c3175 100644 (file)
@@ -1232,11 +1232,11 @@ int main(int argc, char *argv[])
                case 'c':
                        show_creat = 1;
                        break;
+
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 86383360ac5c18aeccaf4b3ea7e033c650d25ed9..a1272ae6098e4c1626eca4c860c25ce07290e90c 100644 (file)
@@ -518,7 +518,7 @@ static void __attribute__((__noreturn__)) usage(void)
 
        printf(USAGE_MAN_TAIL("lsmem(1)"));
 
-       exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+       exit(EXIT_SUCCESS);
 }
 
 int main(int argc, char **argv)
@@ -563,7 +563,7 @@ 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, "abhJno:PrS:s:V", longopts, NULL)) != -1) {
 
@@ -576,9 +576,6 @@ int main(int argc, char **argv)
                case 'b':
                        lsmem->bytes = 1;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'J':
                        lsmem->json = 1;
                        lsmem->want_summary = 0;
@@ -607,9 +604,6 @@ int main(int argc, char **argv)
                case 'S':
                        splitarg = optarg;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return 0;
                case LSMEM_OPT_SUMARRY:
                        if (optarg) {
                                if (strcmp(optarg, "never") == 0)
@@ -623,6 +617,11 @@ int main(int argc, char **argv)
                        } else
                                lsmem->want_table = 0;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 38ea2e00989ec430a3555ca208e4520ea97380a5..c298d6a3cd0b647144f925589727702139fd96e5 100644 (file)
@@ -960,7 +960,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        lsns_init_debug();
        memset(&ls, 0, sizeof(ls));
@@ -988,14 +988,9 @@ int main(int argc, char *argv[])
                        for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++)
                                columns[ncolumns] = ncolumns;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'p':
                        ls.fltr_pid = strtos32_or_err(optarg, _("invalid PID argument"));
                        break;
-               case 'h':
-                       usage();
                case 'n':
                        ls.no_headings = 1;
                        break;
@@ -1019,6 +1014,11 @@ int main(int argc, char *argv[])
                case 'W':
                        ls.no_wrap = 1;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index b1b43251e73bf0b4833ac0137f1c0266388c372e..b391347fc6119112d98b137e91d40a86c16faa2b 100644 (file)
@@ -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);
                }
index 00a74daf03f6ec0e1939a377a9808d96e36dc5c4..985130cba279e02469f81ce375d499cf5c986083 100644 (file)
@@ -149,7 +149,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        mnt_init_debug(0);
 
@@ -165,12 +165,11 @@ int main(int argc, char **argv)
                case 'x':
                        ctl.dev_devno = 1;
                        break;
+
                case 'h':
                        usage();
-                       break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index fbfcf983181e4cbe24225106891eaaab4e36ab9f..f294b12579243ef29b5b42aa215f090a406a1398 100644 (file)
@@ -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);
                }
index ea76d94bfe02fbabf27bc75f7eaaef1a3982b0da..aef1b12bb9db51eb33edf50786692b14734421f5 100644 (file)
@@ -55,13 +55,12 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (ch) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 6f806362d1f0662e9930b071fb22b85b8b348dcf..607849066fc293380b994e3ddd7b6fa374751fc3 100644 (file)
@@ -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);
                }
index ca0037529c220df8d65553a83ffb94e4c3459392..1d484252ac3efd3449509a7592cfcbad46f8f399 100644 (file)
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        proFile = defaultpro;
        mapFile = defaultmap;
@@ -206,9 +206,9 @@ int main(int argc, char **argv)
                case 'v':
                        optVerbose++;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 3ae71f9c1dd7e9c0ef04ad27427adfab1aa62362..5efecdfd00b432137ced7540dedd338cc1539f68 100644 (file)
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        argc--;
        argv++;
@@ -131,10 +131,8 @@ int main(int argc, char **argv)
 
                if (strcmp(*argv, "-v") == 0 ||
                    strcmp(*argv, "-V") == 0 ||
-                   strcmp(*argv, "--version") == 0) {
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
-               }
+                   strcmp(*argv, "--version") == 0)
+                       print_version(EXIT_SUCCESS);
        }
 
        if (*argv && (strcmp(*argv, "-n") == 0 || strcmp(*argv, "--priority") == 0)) {
index a93e8ba83fb3bd9871c691f1b3a77393fff7d16b..b00bf753e379f668d436fdc32e3fffe6285c64f8 100644 (file)
@@ -637,7 +637,7 @@ 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, "Jno:rVh", longopts, NULL)) != -1) {
                err_exclusive_options(c, longopts, excl, excl_st);
@@ -657,9 +657,9 @@ int main(int argc, char **argv)
                case 'r':
                        ctrl.raw = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 029f00f9b5e6e2d4844602f09b0fb38bb00d1d32..1058e8af9c73a13a53f265a7b89504cf1ec99850 100644 (file)
@@ -457,7 +457,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((t = getopt_long(argc, argv, "A:ahd:lm:ns:t:uVv",
                                        long_options, NULL)) != EOF) {
@@ -511,9 +511,9 @@ int main(int argc, char **argv)
                case 'v':
                        ctl.verbose = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index fb4c4d333e47d1e782bfbf310b96c7fc4f2bac34..f84e90b5bf5c172aca2c55de5fad7e26d7836c46 100644 (file)
@@ -315,7 +315,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc < 1) {
                warnx(_("Not enough arguments"));
@@ -343,12 +343,6 @@ int main(int argc, char *argv[])
 
        while ((c = getopt_long(argc, argv, "+hVv3BFILRSTXZ", longopts, NULL)) != -1) {
                switch (c) {
-               case 'h':
-                       usage(archwrapper);
-                       break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'v':
                        verbose = 1;
                        break;
@@ -394,8 +388,13 @@ int main(int argc, char *argv[])
                        } else
                                warnx(_("unrecognized option '--list'"));
                        /* fallthrough */
+
                default:
                        errtryhelp(EXIT_FAILURE);
+               case 'h':
+                       usage(archwrapper);
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                }
        }
 
index 828ddc12fd1cd6ab8cb8d6120110e579c0fbdf9e..717031d94a36bdab36429c1ac2cb941bbc6caf78 100644 (file)
@@ -837,7 +837,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        memset(&opts, 0, sizeof(opts));
 
@@ -971,11 +971,11 @@ int main(int argc, char **argv)
                case RESET_ENV:
                        opts.reset_env = 1;
                        break;
+
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 8b4f83dd2ef06b9c00221d3a9bee27014ebdd61b..5725e80090f9d515c2a70079bfda03de3f5882c9 100644 (file)
@@ -66,13 +66,10 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "+Vhcfw", longopts, NULL)) != -1)
                switch (ch) {
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'c':
                        ctty=1;
                        break;
@@ -82,8 +79,11 @@ int main(int argc, char **argv)
                case 'w':
                        status = 1;
                        break;
+
                case 'h':
                        usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 0a3807fdac15e52cee6a90da7f0bb1e290f454dc..a13d4f1e582385af7f2bd44e9fadd3e914720d9f 100644 (file)
@@ -197,7 +197,7 @@ 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, "ahvVL:U:",
                                 long_opts, NULL)) != -1) {
@@ -205,21 +205,20 @@ int main(int argc, char *argv[])
                case 'a':               /* all */
                        ++all;
                        break;
-               case 'h':               /* help */
-                       usage();
-                       break;
                case 'v':               /* be chatty */
                        ++verbose;
                        break;
-               case 'V':               /* version */
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'L':
                        add_label(optarg);
                        break;
                case 'U':
                        add_uuid(optarg);
                        break;
+
+               case 'h':               /* help */
+                       usage();
+               case 'V':               /* version */
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 357dcb3f741ce9acc2d02c124602eb6fa124ec84..7e3135c729f3bac50f36b3a91d0a9eb692f9e293 100644 (file)
@@ -883,7 +883,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        memset(&ctl, 0, sizeof(struct swapon_ctl));
        ctl.props.priority = -1;
@@ -900,9 +900,6 @@ int main(int argc, char *argv[])
                case 'a':               /* all */
                        ctl.all = 1;
                        break;
-               case 'h':               /* help */
-                       usage();
-                       break;
                case 'o':
                        options = optarg;
                        break;
@@ -966,11 +963,13 @@ int main(int argc, char *argv[])
                case BYTES_OPTION:
                        ctl.bytes = 1;
                        break;
-               case 'V':               /* version */
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 0:
                        break;
+
+               case 'h':               /* help */
+                       usage();
+               case 'V':               /* version */
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index a85ce24b9338abc01b0ebddf165d19464cb6bc57..a42bceca31507390c53e13f0c5d69144472da59b 100644 (file)
@@ -225,13 +225,12 @@ int main(int argc, char *argv[])
                {NULL, 0, NULL, 0}
        };
 
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((c = getopt_long(argc, argv, "+Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index fe261f393c849ceb8e65ce352676afd12466f552..b1e7f75df5655f73890d0fd95a2de4028eafe1ef 100644 (file)
@@ -144,7 +144,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        strutils_set_exitcode(EXIT_LP_BADVAL);
 
@@ -159,9 +159,6 @@ int main(int argc, char **argv)
        show_irq = 1;
        while ((c = getopt_long(argc, argv, "t:c:w:a:i:ho:C:sq:rT:vV", longopts, NULL)) != -1) {
                switch (c) {
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        cmds->op = LPSETIRQ;
                        cmds->val = strtol_or_err(optarg, _("argument error"));
@@ -229,10 +226,12 @@ int main(int argc, char **argv)
                        cmds = cmds->next;
                        cmds->next = NULL;
                        break;
+
+               case 'h':
+                       usage();
                case 'v':
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 929da8d91b5c79d55831afa1a8deb106092895c9..e3734b0ec20cd7b16adaf5c36bcc81a500e122d4 100644 (file)
@@ -479,7 +479,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        mnt_init_debug(0);
        cxt = mnt_new_context();
@@ -517,9 +517,6 @@ int main(int argc, char **argv)
                case 'f':
                        mnt_context_enable_force(cxt, TRUE);
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        mnt_context_disable_helpers(cxt, TRUE);
                        break;
@@ -548,9 +545,6 @@ int main(int argc, char **argv)
                case 'v':
                        mnt_context_enable_verbose(cxt, TRUE);
                        break;
-               case 'V':
-                       umount_print_version();
-                       break;
                case 'N':
                {
                        char path[PATH_MAX];
@@ -563,6 +557,13 @@ int main(int argc, char **argv)
                                err(MNT_EX_SYSERR, _("failed to set target namespace to %s"), pid ? path : optarg);
                        break;
                }
+
+               case 'h':
+                       mnt_free_context(cxt);
+                       usage();
+               case 'V':
+                       mnt_free_context(cxt);
+                       umount_print_version();
                default:
                        errtryhelp(MNT_EX_USAGE);
                }
index e9ddb09de3d23cd595452bc915c83a5d1a426389..21910a4ee8c94616a22b9ec866d9d7e73770a289 100644 (file)
@@ -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);
                }
index 642db85d221d93592f48e0c1eae3877733a2f143..4574e10da8e3880c4ff694ccc1da3c101681f347 100644 (file)
@@ -505,7 +505,7 @@ 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,
                                "d:f:hFnITo:s:OrVx", long_opts, NULL)) != -1) {
@@ -527,11 +527,6 @@ int main(int argc, char *argv[])
                        if (string_to_bitmask(optarg, (unsigned long *) &wanted, name2bit) != 0)
                                return EXIT_FAILURE;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
-               case 'h':
-                       usage();
                case 'F':
                        noflags = 1;
                        break;
@@ -554,6 +549,11 @@ int main(int argc, char *argv[])
                        noident = 1;
                        notimeouts = 1;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 69267c860c3fe15410e15ac42ab7c3f0b87a35f7..dedfa345e9caa85b125004328301e168da52eede 100644 (file)
@@ -616,7 +616,7 @@ 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, "a:bfho:nrs:t:V", longopts, NULL)) != -1) {
 
@@ -659,9 +659,9 @@ int main(int argc, char **argv)
                case 'n':
                        no_headings = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 608f3cf61ace1133f93fab3c6daca5ce9cd62ec8..57d53379f2d7ad785a92ff9090c9cd3823cb28db 100644 (file)
@@ -102,16 +102,16 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "vVh", longopts, NULL)) != -1)
                switch (ch) {
                case 'v':
                        verbose = TRUE;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 7692f91e2b33acae4c3ba97e4bc6bc8cd09d8b41..c7bc1d6f27d74d243d06d52b709368b365263100 100644 (file)
@@ -793,7 +793,7 @@ int main(int argc, char **argv)
        setlocale(LC_NUMERIC, "C");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        script_init_debug();
 
@@ -825,13 +825,11 @@ int main(int argc, char **argv)
                                ctl.tname = optarg;
                        ctl.timing = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-                       break;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
-                       break;
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 7b59b6e244b425d787c57b71f655bf9a53a2cb9f..926e56f11c73716f9186418d17b2b23ded3076da 100644 (file)
@@ -151,7 +151,7 @@ main(int argc, char *argv[])
 
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "t:s:d:m:Vh", longopts, NULL)) != -1)
                switch(ch) {
@@ -169,9 +169,9 @@ main(int argc, char *argv[])
                        maxdelayopt = TRUE;
                        maxdelay = getnum(optarg);
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 0d4b81292a497a148024022d9e71723dd73bd4ac..14fbafb1073d255b648989687b1fc5e7c3b9bd13 100644 (file)
@@ -673,9 +673,9 @@ static void parse_option(struct setterm_control *ctl, int ac, char **av)
                        ctl->opt_bfreq = set_opt_flag(ctl->opt_bfreq);
                        ctl->opt_bfreq_f = parse_bfreq(av, optarg, &optind);
                        break;
+
                case OPT_VERSION:
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case OPT_HELP:
                        usage();
                default:
@@ -1173,7 +1173,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc < 2) {
                warnx(_("bad usage"));
index ce5363c7e71130e5503bc5e18760b1cf8985ed52..c606e634744fe0df95a9e35a2b646ab1e4afdef6 100644 (file)
@@ -202,7 +202,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((ch = getopt_long(argc, argv, "nt:g:Vh", longopts, NULL)) != -1) {
                switch (ch) {
@@ -220,9 +220,9 @@ int main(int argc, char **argv)
                case 'g':
                        group_buf = init_group_workspace(optarg);
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index bd64fc281a0872650f3141908bb864f959d8e879..3436fbda20fdc8f1e1d374b486da266952ecaa0a 100644 (file)
@@ -308,13 +308,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, "Vh", longopts, NULL)) != -1)
                switch (c) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 1ba195e246ad1a3ec6713b95a24dc919e303e922..5ad38bc97f4941afbc4f43b4eea594069f19dbc4 100644 (file)
@@ -190,7 +190,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        max_bufd_lines = 128 * 2;
        compress_spaces = 1;            /* compress spaces into tabs */
@@ -220,9 +220,9 @@ int main(int argc, char **argv)
                case 'x':               /* do not compress spaces into tabs */
                        compress_spaces = 0;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'H':
                        usage();
                default:
index 6113880e40a9044fa2e1161b77485fa797cf667c..798f5bd7b8d9d1fba19c342533cc1dda568ae273 100644 (file)
@@ -239,7 +239,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        /* Take care of lonely hyphen option. */
        for (opt = 0; opt < argc; opt++) {
@@ -260,9 +260,9 @@ int main(int argc, char **argv)
                case '2':
                        ctl.half_lines = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 8bb0ee9cce08209edbc6cb887b8da7fb9bba817d..d0ef2eb662fd4227f585cee543a4dcb573a42931 100644 (file)
@@ -173,8 +173,7 @@ int main(int argc, char **argv)
                            NULL)) != -1)
                switch (opt) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 8961bd38b63e07808f7ec0b646e6bfff2e7f40e8..78eeddb8e45ffd7637097827c9d42436b5db1d8a 100644 (file)
@@ -706,7 +706,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        ctl.output_separator = "  ";
        ctl.input_separator = mbs_to_wcs("\t ");
@@ -731,9 +731,6 @@ int main(int argc, char **argv)
                case 'H':
                        ctl.tab_colhide = optarg;
                        break;
-               case 'h':
-                       usage();
-                       break;
                case 'i':
                        ctl.tree_id = optarg;
                        break;
@@ -776,15 +773,17 @@ int main(int argc, char **argv)
                case 't':
                        ctl.mode = COLUMN_MODE_TABLE;
                        break;
-               case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
                case 'W':
                        ctl.tab_colwrap = optarg;
                        break;
                case 'x':
                        ctl.mode = COLUMN_MODE_FILLROWS;
                        break;
+
+               case 'h':
+                       usage();
+               case 'V':
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
index 94c53b8e520e0aba103d811987ca9153e0ee55d3..cbd593e5f97d14fa50f0aa9a4ff5a51b61436288 100644 (file)
@@ -130,12 +130,11 @@ parse_args(int argc, char **argv, struct hexdump *hex)
                        add_fmt(hex_offt, hex);
                        add_fmt("\"%07.7_ax \" 8/2 \"   %04x \" \"\\n\"", hex);
                        break;
+
                case 'h':
                        usage();
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-                       break;
+                       print_version(EXIT_SUCCESS);
                default:
                        errtryhelp(EXIT_FAILURE);
                }
@@ -193,7 +192,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        argv += parse_args(argc, argv, hex);
 
index 63c001261d91ca7c30dc75db4165b0b76021fb79..e8940761891739007e975817722bd65e718f9864 100644 (file)
@@ -54,13 +54,12 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        while ((opt = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch (opt) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index 8d394bc304285fdbefd5d8d58fe59842a945fa13..6e1ca569c9c768bca409641493b0d720499220fc 100644 (file)
@@ -275,7 +275,7 @@ static void arg_parser(struct more_control *ctl, char *s)
                case '\t':
                        break;
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
+                       print_version(EXIT_SUCCESS);
                        exit(EXIT_SUCCESS);
                        break;
                default:
@@ -1920,16 +1920,14 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (argc > 1) {
                /* first arg may be one of our standard longopts */
                if (!strcmp(argv[1], "--help"))
                        usage();
-               if (!strcmp(argv[1], "--version")) {
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
-               }
+               if (!strcmp(argv[1], "--version"))
+                       print_version(EXIT_SUCCESS);
        }
 
        ctl.num_files = argc;
index f441c04f012e1a3026cb0dc29eacaaae125d3976..7eef9b88be0dcf1d102da4ff5f13235b2d369fb1 100644 (file)
@@ -1544,7 +1544,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        if (tcgetattr(STDOUT_FILENO, &otio) == 0) {
                ontty = 1;
@@ -1570,7 +1570,7 @@ int main(int argc, char **argv)
                }
 
                if (!strcmp(argv[arg], "--version")) {
-                   printf(UTIL_LINUX_VERSION);
+                   print_version(EXIT_SUCCESS);
                    return EXIT_SUCCESS;
                }
 
@@ -1621,11 +1621,11 @@ int main(int argc, char **argv)
                        case 's':
                                sflag = 1;
                                break;
+
                        case 'h':
                                usage();
                        case 'V':
-                               printf(UTIL_LINUX_VERSION);
-                               return EXIT_SUCCESS;
+                               print_version(EXIT_SUCCESS);
                        default:
                                invopt(&argv[arg][i]);
                        }
index 13a41f633e36d74db9dce9d445ae1248548f7bff..57624e6fb117d5783b73365a035156ebc77e0a37 100644 (file)
@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        signal(SIGINT, sig_handler);
        signal(SIGTERM, sig_handler);
@@ -121,8 +121,7 @@ int main(int argc, char *argv[])
        while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
                switch(ch) {
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       exit(EXIT_SUCCESS);
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default:
index b5ce4db845f9621437ed815ad33c44ddf2ca0514..3a9e31bc7b23a3cfacad6ca99138a1c202c0aa8d 100644 (file)
@@ -172,7 +172,7 @@ int main(int argc, char **argv)
        setlocale(LC_ALL, "");
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-       atexit(close_stdout);
+       close_stdout_atexit();
 
        signal(SIGINT, sig_handler);
        signal(SIGTERM, sig_handler);
@@ -191,9 +191,9 @@ int main(int argc, char **argv)
                case 'i':
                        iflag = 1;
                        break;
+
                case 'V':
-                       printf(UTIL_LINUX_VERSION);
-                       return EXIT_SUCCESS;
+                       print_version(EXIT_SUCCESS);
                case 'h':
                        usage();
                default: