misc: fix more strutils related exit codes

Found by grep:

grep -l "\bEXIT_\|exit *( *[0-9][0-9] *)\|strutils\.h" $(grep -L \
    strutils_set_exitcode  $(git grep -l "_EX_\|FINDFS_\|BLKID_EXIT\|EX_USAGE" -- "*.c"))

The Command shows also some false positives (fstrim.c,
context_mount.c, ...)

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/disk-utils/fsck.cramfs.c b/disk-utils/fsck.cramfs.c
index 952f15332e31d63f40dad2e0a258804985bf8624..1dba95eb5824cabf67a5386bb4385ec88d0566bd 100644 (file)
--- a/disk-utils/fsck.cramfs.c
+++ b/disk-utils/fsck.cramfs.c
@@ -660,6 +660,8 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(FSCK_EX_USAGE);
+
        /* command line options */
        while ((c = getopt_long(argc, argv, "ayvVhb:", longopts, NULL)) != EOF)
                switch (c) {

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index dea3436d439b230545b614006fb00c145a5ff39d..bff810ec3b28f8532e93da5a7e3ea86363a69b4a 100644 (file)
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -1293,6 +1293,8 @@ main(int argc, char **argv) {
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(FSCK_EX_USAGE);
+
        if (INODE_SIZE * MINIX_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)
                die(_("bad inode size"));
        if (INODE2_SIZE * MINIX2_INODES_PER_BLOCK != MINIX_BLOCK_SIZE)

diff --git a/disk-utils/mkfs.cramfs.c b/disk-utils/mkfs.cramfs.c
index 041c6d74ee5f608c121646004e0eed71350f4362..6a6d9a10a6e06b6625200061769d6ef97e113886 100644 (file)
--- a/disk-utils/mkfs.cramfs.c
+++ b/disk-utils/mkfs.cramfs.c
@@ -717,6 +717,8 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(MKFS_EX_USAGE);
+
        /* command line options */
        while ((c = getopt(argc, argv, "hb:Ee:i:n:N:psVvz")) != EOF) {
                switch (c) {

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index 47a155c557b62f9aee142ec8ace9b02b9a41421a..96d36b034eaba3b03a38c8e7a49cdd0ba5e602b3 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -758,6 +758,8 @@ int main(int argc, char ** argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(MKFS_EX_USAGE);
+
        while ((i = getopt_long(argc, argv, "1v23n:i:cl:Vh", longopts, NULL)) != -1)
                switch (i) {
                case '1':

diff --git a/sys-utils/flock.c b/sys-utils/flock.c
index 50194bdb93e84399524f6715a69a57a6bde2125f..003a126187f9b1e58baa784c5d0474191afa6216 100644 (file)
--- a/sys-utils/flock.c
+++ b/sys-utils/flock.c
@@ -170,6 +170,8 @@ int main(int argc, char *argv[])
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(EX_USAGE);
+
        if (argc < 2)
                usage(EX_USAGE);
 

diff --git a/sys-utils/hwclock.c b/sys-utils/hwclock.c
index 5433cd000b43363ea87813f01ff5343748dc0f5b..325106afcf91d6299771fd6773da1f384fa389a6 100644 (file)
--- a/sys-utils/hwclock.c
+++ b/sys-utils/hwclock.c
@@ -1326,6 +1326,8 @@ int main(int argc, char **argv)
        };
        int excl_st[ARRAY_SIZE(excl)] = UL_EXCL_STATUS_INIT;
 
+       strutils_set_exitcode(EX_USAGE);
+
        /* Remember what time we were invoked */
        gettimeofday(&startup_time, NULL);
 

diff --git a/sys-utils/mount.c b/sys-utils/mount.c
index 4d7a5fc73f31787269b8837a2734f4c89ddcd368..0f7fa90979f95ee25ed55e846299714041184a9f 100644 (file)
--- a/sys-utils/mount.c
+++ b/sys-utils/mount.c
@@ -534,6 +534,8 @@ int main(int argc, char **argv)
        textdomain(PACKAGE);
        atexit(close_stdout);
 
+       strutils_set_exitcode(MNT_EX_USAGE);
+
        mnt_init_debug(0);
        cxt = mnt_new_context();
        if (!cxt)