Merge branch 'busybox' into merge

26 files changed, 211 insertions, 67 deletions

diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index badc63a6a..1fb6ef2d0 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -39,7 +39,7 @@ int cksum_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cksum_main(int argc UNUSED_PARAM, char **argv)
 {
         uint32_t *crc32_table = crc32_filltable(NULL, IS_CKSUM);
-        int exit_code = EXIT_SUCCESS;
+        exitcode_t exit_code = EXIT_SUCCESS;
 
 #if ENABLE_DESKTOP
         getopt32(argv, ""); /* cksum coreutils 6.9 compat */
diff --git a/coreutils/cut.c b/coreutils/cut.c
index 25b16d1a8..d129f9b9d 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -311,7 +311,7 @@ int cut_main(int argc UNUSED_PARAM, char **argv)
         }
 
         {
-                int retval = EXIT_SUCCESS;
+                exitcode_t retval = EXIT_SUCCESS;
 
                 if (!*argv)
                         *--argv = (char *)"-";
diff --git a/coreutils/dd.c b/coreutils/dd.c
index 51f3adf24..a9ef68fbc 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -395,7 +395,7 @@ int dd_main(int argc UNUSED_PARAM, char **argv)
                 OP_oflag_direct,
 #endif
         };
-        smallint exitcode = EXIT_FAILURE;
+        exitcode_t exitcode = EXIT_FAILURE;
         int i;
         size_t ibs = 512;
         char *ibuf;
diff --git a/coreutils/df.c b/coreutils/df.c
index 76e9cefbf..03aa78148 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -113,7 +113,7 @@ int df_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int df_main(int argc UNUSED_PARAM, char **argv)
 {
         unsigned long df_disp_hr = 1024;
-        int status = EXIT_SUCCESS;
+        exitcode_t status = EXIT_SUCCESS;
         unsigned opt;
         FILE *mount_table;
         struct mntent *mount_entry;
diff --git a/coreutils/expand.c b/coreutils/expand.c
index 47693e144..c4db26055 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -192,7 +192,7 @@ int expand_main(int argc UNUSED_PARAM, char **argv)
         FILE *file;
         unsigned tab_size;
         unsigned opt;
-        int exit_status = EXIT_SUCCESS;
+        exitcode_t exit_status = EXIT_SUCCESS;
 
         init_unicode();
 
diff --git a/coreutils/fold.c b/coreutils/fold.c
index 2839c8c68..8112fe911 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -77,7 +77,7 @@ int fold_main(int argc UNUSED_PARAM, char **argv)
         char *line_out = NULL;
         const char *w_opt = "80";
         unsigned width;
-        smallint exitcode = EXIT_SUCCESS;
+        exitcode_t exitcode = EXIT_SUCCESS;
 
         init_unicode();
 
diff --git a/coreutils/ln.c b/coreutils/ln.c
index 34eec398a..080ba142e 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -52,7 +52,7 @@
 int ln_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ln_main(int argc, char **argv)
 {
-        int status = EXIT_SUCCESS;
+        exitcode_t status = EXIT_SUCCESS;
         int opts;
         char *last;
         char *src_name;
diff --git a/coreutils/touch.c b/coreutils/touch.c
index 8fde70e12..ced596c89 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -77,7 +77,7 @@ int touch_main(int argc UNUSED_PARAM, char **argv)
 {
         int fd;
         int opts;
-        smalluint status = EXIT_SUCCESS;
+        exitcode_t status = EXIT_SUCCESS;
 #if ENABLE_FEATURE_TOUCH_SUSV3
         char *reference_file;
         char *date_str;
diff --git a/include/libbb.h b/include/libbb.h
index ae10c3bf0..61c75791c 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1508,6 +1508,13 @@ void bb_verror_msg(const char *s, va_list p, const char *strerr) FAST_FUNC;
 void bb_die_memory_exhausted(void) NORETURN FAST_FUNC;
 void bb_logenv_override(void) FAST_FUNC;
 
+/* x86 benefits from narrow exit code variables
+ * (because it has no widening MOV imm8,word32 insn, has to use MOV imm32,w
+ * for "exitcode = EXIT_FAILURE" and similar. The downside is that sometimes
+*  gcc widens the variable to int in various ugly suboptimal ways).
+ */
+typedef smalluint exitcode_t;
+
 #if ENABLE_FEATURE_SYSLOG_INFO
 void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC;
 void bb_simple_info_msg(const char *s) FAST_FUNC;
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index d6394fe27..80fe8fef0 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -45,11 +45,11 @@ lib-y += lineedit.o lineedit_ptr_hack.o
 lib-y += llist.o
 lib-y += make_directory.o
 lib-y += hash_md5_sha.o
-lib-y += hash_md5_sha_x86-64.o
-lib-y += hash_md5_sha_x86-64_shaNI.o
-lib-y += hash_md5_sha_x86-32_shaNI.o
-lib-y += hash_md5_sha256_x86-64_shaNI.o
-lib-y += hash_md5_sha256_x86-32_shaNI.o
+lib-y += hash_sha1_x86-64.o
+lib-y += hash_sha1_hwaccel_x86-64.o
+lib-y += hash_sha1_hwaccel_x86-32.o
+lib-y += hash_sha256_hwaccel_x86-64.o
+lib-y += hash_sha256_hwaccel_x86-32.o
 # Alternative (disabled) MD5 implementation
 #lib-y += hash_md5prime.o
 lib-y += messages.o
diff --git a/libbb/hash_md5_sha_x86-32_shaNI.S b/libbb/hash_sha1_hwaccel_x86-32.S
index 7455a29f0..7455a29f0 100644
--- a/libbb/hash_md5_sha_x86-32_shaNI.S
+++ b/libbb/hash_sha1_hwaccel_x86-32.S
diff --git a/libbb/hash_md5_sha_x86-64_shaNI.S b/libbb/hash_sha1_hwaccel_x86-64.S
index 2f03e1ce4..2f03e1ce4 100644
--- a/libbb/hash_md5_sha_x86-64_shaNI.S
+++ b/libbb/hash_sha1_hwaccel_x86-64.S
diff --git a/libbb/hash_md5_sha_x86-64.S b/libbb/hash_sha1_x86-64.S
index 2cdd22015..b1968fff6 100644
--- a/libbb/hash_md5_sha_x86-64.S
+++ b/libbb/hash_sha1_x86-64.S
@@ -1,4 +1,4 @@
-### Generated by hash_md5_sha_x86-64.S.sh ###
+### Generated by hash_sha1_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
 #ifdef __linux__
diff --git a/libbb/hash_md5_sha_x86-64.S.sh b/libbb/hash_sha1_x86-64.S.sh
index 653fe4989..3fc125d51 100755
--- a/libbb/hash_md5_sha_x86-64.S.sh
+++ b/libbb/hash_sha1_x86-64.S.sh
@@ -4,7 +4,7 @@
 # The reason is that the changes to generated code are difficult
 # to visualize by looking only at this script, it helps when the commit
 # also contains the diff of the generated file.
-exec >hash_md5_sha_x86-64.S
+exec >hash_sha1_x86-64.S
 
 # Based on http://arctic.org/~dean/crypto/sha1.html.
 # ("This SHA1 implementation is public domain.")
@@ -124,7 +124,7 @@ INTERLEAVE() {
 # ...but pshufb is a SSSE3 insn. Can't use it.
 
 echo \
-"### Generated by hash_md5_sha_x86-64.S.sh ###
+"### Generated by hash_sha1_x86-64.S.sh ###
 
 #if CONFIG_SHA1_SMALL == 0 && defined(__GNUC__) && defined(__x86_64__)
 #ifdef __linux__
diff --git a/libbb/hash_md5_sha256_x86-32_shaNI.S b/libbb/hash_sha256_hwaccel_x86-32.S
index a0e4a571a..a0e4a571a 100644
--- a/libbb/hash_md5_sha256_x86-32_shaNI.S
+++ b/libbb/hash_sha256_hwaccel_x86-32.S
diff --git a/libbb/hash_md5_sha256_x86-64_shaNI.S b/libbb/hash_sha256_hwaccel_x86-64.S
index 172c2eae2..172c2eae2 100644
--- a/libbb/hash_md5_sha256_x86-64_shaNI.S
+++ b/libbb/hash_sha256_hwaccel_x86-64.S
diff --git a/miscutils/getfattr.c b/miscutils/getfattr.c
new file mode 100644
index 000000000..cb42fdac0
--- /dev/null
+++ b/miscutils/getfattr.c
@@ -0,0 +1,136 @@
+/*
+ * getfattr - get extended attributes of filesystem objects.
+ *
+ * Copyright (C) 2023 by LoveSy <lovesykun@gmail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config GETFATTR
+//config:       bool "getfattr (12.3 kb)"
+//config:       default y
+//config:       help
+//config:       Get extended attributes on files
+
+//applet:IF_GETFATTR(APPLET_NOEXEC(getfattr, getfattr, BB_DIR_USR_BIN, BB_SUID_DROP, getfattr))
+
+//kbuild:lib-$(CONFIG_GETFATTR) += getfattr.o
+
+#include <stdio.h>
+#include <sys/xattr.h>
+#include "libbb.h"
+
+//usage:#define getfattr_trivial_usage
+//usage:       "[-h] {-d|-n ATTR} FILE...\n"
+//usage:#define getfattr_full_usage "\n\n"
+//usage:       "Get extended attributes"
+//usage:     "\n"
+//usage:     "\n        -h              Do not follow symlinks"
+//usage:     "\n        -d              Dump all attributes"
+//usage:     "\n        -n ATTR         Get attribute ATTR"
+
+enum {
+        OPT_h = (1 << 0),
+        OPT_d = (1 << 1),
+        OPT_n = (1 << 2),
+};
+
+static int print_attr(const char *file, const char *name, char **buf, size_t *bufsize)
+{
+        ssize_t len;
+
+        if (*bufsize == 0)
+                goto grow;
+ again:
+        len = ((option_mask32 &  OPT_h) ? lgetxattr: getxattr)(file, name, *buf, *bufsize);
+        if (len < 0) {
+                if (errno != ERANGE)
+                        return len;
+ grow:
+                *bufsize = (*bufsize * 2) + 1024;
+                *buf = xrealloc(*buf, *bufsize);
+                goto again;
+        }
+        printf("%s=\"%.*s\"\n", name, len, *buf);
+        return 0;
+}
+
+static ssize_t list_attr(const char *file, char **list, size_t *listsize)
+{
+        ssize_t len;
+
+        if (*listsize == 0)
+                goto grow;
+ again:
+        len = ((option_mask32 &  OPT_h) ? llistxattr : listxattr)(file, *list, *listsize);
+        if (len < 0) {
+                if (errno != ERANGE)
+                        return len;
+ grow:
+                *listsize = (*listsize * 2) + 1024;
+                *list = xrealloc(*list, *listsize);
+                goto again;
+        }
+        return len;
+}
+
+int getfattr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int getfattr_main(int argc UNUSED_PARAM, char **argv)
+{
+        const char *name;
+        exitcode_t status;
+        int opt;
+        char *buf = NULL;
+        size_t bufsize = 0;
+        char *list = NULL;
+        size_t listsize = 0;
+
+        opt = getopt32(argv, "^"
+                "hdn:"
+                /* Min one arg; -d and -n are exclusive */
+                "\0" "-1:n--d:d--n"
+                        //getfattr 2.5.1 does not enforce this: ":d:n" /* exactly one of -n or -d is required */
+                , &name
+        );
+        argv += optind;
+        status = EXIT_SUCCESS;
+
+        do {
+                int r;
+//getfattr 2.5.1 with no -n/-d defaults to -d
+                if (!(opt & OPT_n)) {
+                        ssize_t len = list_attr(*argv, &list, &listsize);
+                        if (len < 0)
+                                goto err;
+                        if (len > 0) {
+                                char *key;
+                                printf("# file: %s\n", *argv);
+                                key = list;
+                                while (len > 0) {
+                                        ssize_t keylen;
+                                        r = print_attr(*argv, key, &buf, &bufsize);
+                                        if (r)
+                                                goto err;
+                                        keylen = strlen(key) + 1;
+                                        key += keylen;
+                                        len -= keylen;
+                                }
+                                bb_putchar('\n');
+                        }
+                } else {
+                        printf("# file: %s\n", *argv);
+                        r = print_attr(*argv, name, &buf, &bufsize);
+                        if (r) {
+ err:
+                                bb_simple_perror_msg(*argv);
+                                status = EXIT_FAILURE;
+                                continue;
+                        }
+                        bb_putchar('\n');
+                }
+        } while (*++argv);
+
+        if (ENABLE_FEATURE_CLEAN_UP)
+                free(buf);
+
+        fflush_stdout_and_exit(status);
+}
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 48be91875..999a3b976 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -181,7 +181,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv)
 {
         parser_t *parser;
         char *line = (char *)"-";
-        int ret = EXIT_SUCCESS;
+        exitcode_t ret = EXIT_SUCCESS;
 
         getopt32(argv, "^" "d:" "\0" "=1", &line);
         argv += optind;
diff --git a/miscutils/setfattr.c b/miscutils/setfattr.c
index 10d1840c9..b68bc9452 100644
--- a/miscutils/setfattr.c
+++ b/miscutils/setfattr.c
@@ -32,7 +32,7 @@ int setfattr_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *name;
         const char *value = "";
-        int status;
+        exitcode_t status;
         int opt;
         enum {
                 OPT_h = (1 << 0),
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 036df5c5d..bd1850cbb 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -40,7 +40,8 @@
 int strings_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int strings_main(int argc UNUSED_PARAM, char **argv)
 {
-        int n, c, status = EXIT_SUCCESS;
+        int n, c;
+        exitcode_t status = EXIT_SUCCESS;
         unsigned count;
         off_t offset;
         FILE *file;
diff --git a/networking/brctl.c b/networking/brctl.c
index 7b0270b51..0f8dc2f7a 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -538,7 +538,7 @@ int brctl_main(int argc UNUSED_PARAM, char **argv)
                 DIR *net;
                 struct dirent *ent;
                 int need_hdr = 1;
-                int exitcode = EXIT_SUCCESS;
+                exitcode_t exitcode = EXIT_SUCCESS;
 
                 if (*argv) {
                         /* "show BR1 BR2 BR3" */
diff --git a/networking/tc.c b/networking/tc.c
index 43187f7ee..3a79fd2d9 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -502,7 +502,7 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         };
         struct rtnl_handle rth;
         struct tcmsg msg;
-        int ret, obj, cmd, arg;
+        int obj, cmd, arg;
         char *dev = NULL;
 
         INIT_G();
@@ -510,7 +510,6 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         if (!*++argv)
                 bb_show_usage();
         xrtnl_open(&rth);
-        ret = EXIT_SUCCESS;
 
         obj = index_in_substrings(objects, *argv++);
         if (obj < 0)
@@ -625,5 +624,5 @@ int tc_main(int argc UNUSED_PARAM, char **argv)
         if (ENABLE_FEATURE_CLEAN_UP) {
                 rtnl_close(&rth);
         }
-        return ret;
+        return EXIT_SUCCESS;
 }
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index d78bfe374..e6f0043d0 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -9,6 +9,7 @@
 //config:config HWCLOCK
 //config:       bool "hwclock (5.9 kb)"
 //config:       default y
+//config:       select LONG_OPTS
 //config:       help
 //config:       The hwclock utility is used to read and set the hardware clock
 //config:       on a system. This is primarily used to set the current time on
@@ -409,89 +410,89 @@ static void set_rtc_param(const char **pp_rtcname, char *rtc_param)
 // -v, --verbose        display more details
 
 //usage:#define hwclock_trivial_usage
-//usage:        IF_LONG_OPTS(
-//usage:       "[-swul] [--systz] [--param-get PARAM] [--param-set PARAM=VAL] [-f DEV]"
-//usage:        )
-//usage:        IF_NOT_LONG_OPTS(
-//usage:       "[-swult] [-g PARAM] [-p PARAM=VAL] [-f DEV]"
-//usage:        )
+//usage:       "[-ul] [-f DEV] [-s|-w|--systz|--param-get PARAM|--param-set PARAM=VAL]"
 //usage:#define hwclock_full_usage "\n\n"
 //usage:       "Show or set hardware clock (RTC)\n"
+//usage:     "\n        -f DEV  Use this device (e.g. /dev/rtc2)"
+//usage:     "\n        -u      Assume RTC is kept in UTC"
+//usage:     "\n        -l      Assume RTC is kept in local time"
+//usage:     "\n                (if neither is given, read from "ADJTIME_PATH")"
 ///////:     "\n        -r      Show RTC time"
 ///////-r is default, don't bother showing it in help
 //usage:     "\n        -s      Set system time from RTC"
 //usage:     "\n        -w      Set RTC from system time"
-//usage:        IF_LONG_OPTS(
 //usage:     "\n        --systz Set in-kernel timezone, correct system time"
 //usage:     "\n                if RTC is kept in local time"
 //usage:     "\n        --param-get PARAM       Get RTC parameter"
 //usage:     "\n        --param-set PARAM=VAL   Set RTC parameter"
-//usage:        )
-//usage:     "\n        -f DEV  Use specified device (e.g. /dev/rtc2)"
-//usage:     "\n        -u      Assume RTC is kept in UTC"
-//usage:     "\n        -l      Assume RTC is kept in local time"
-//usage:     "\n                (if neither is given, read from "ADJTIME_PATH")"
-
-//TODO: get rid of incompatible -t alias to --systz?
-
-#define HWCLOCK_OPT_LOCALTIME   0x01
-#define HWCLOCK_OPT_UTC         0x02
-#define HWCLOCK_OPT_SHOW        0x04
-#define HWCLOCK_OPT_HCTOSYS     0x08
-#define HWCLOCK_OPT_SYSTOHC     0x10
-#define HWCLOCK_OPT_SYSTZ       0x20
-#define HWCLOCK_OPT_RTCFILE     0x40
-#define HWCLOCK_OPT_PARAM_GET   0x80
-#define HWCLOCK_OPT_PARAM_SET   0x100
 
 int hwclock_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hwclock_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *rtcname = NULL;
         char *param;
-        unsigned opt;
+        unsigned opt, exclusive;
         int utc;
-#if ENABLE_LONG_OPTS
+#define OPT_LOCALTIME   (1 << 0)
+#define OPT_UTC         (1 << 1)
+#define OPT_RTCFILE     (1 << 2)
+#define OPT_SHOW        (1 << 3)
+#define OPT_HCTOSYS     (1 << 4)
+#define OPT_SYSTOHC     (1 << 5)
+#define OPT_PARAM_GET   (1 << 6)
+#define OPT_PARAM_SET   (1 << 7)
+//#define OPT_VERBOSE   (1 << 8) UNUSED
+#define OPT_SYSTZ       (1 << 9)
         static const char hwclock_longopts[] ALIGN1 =
                 "localtime\0" No_argument "l"
                 "utc\0"       No_argument "u"
+                "rtc\0"       Required_argument "f"
                 "show\0"      No_argument "r"
                 "hctosys\0"   No_argument "s"
                 "systohc\0"   No_argument "w"
-                "systz\0"     No_argument "t" /* short opt is non-standard */
-                "rtc\0"       Required_argument "f"
-                "param-get\0" Required_argument "g"  /* short opt is non-standard */
-                "param-set\0" Required_argument "p"  /* short opt is non-standard */
+                "param-get\0" Required_argument "\xfd" /* no short equivalent */
+                "param-set\0" Required_argument "\xfe" /* no short equivalent */
+                "systz\0"     No_argument "\xff" /* no short equivalent */
                 ;
-#endif
         opt = getopt32long(argv,
-                "^""lurswtf:g:p:v" /* -v is accepted and ignored */
+                "^""luf:rsw\xfd:\xfe:v" /* -v is accepted and ignored */
                 "\0"
-                "r--wstgp:w--rstgp:s--wrtgp:t--rswgp:g--rswtp:p--rswtg:l--u:u--l",
+                "l--u:u--l",
                 hwclock_longopts,
                 &rtcname,
                 &param,
                 &param
         );
+#if 0 //DEBUG
+        bb_error_msg("opt:0x%x", opt);
+        if (opt & OPT_PARAM_GET) bb_error_msg("OPT_PARAM_GET %s", param);
+        if (opt & OPT_PARAM_SET) bb_error_msg("OPT_PARAM_SET %s", param);
+        if (opt & OPT_SYSTZ    ) bb_error_msg("OPT_SYSTZ");
+        return 0;
+#endif
+        /* All options apart from -luf are exclusive, enforce */
+        exclusive = opt >> 3;
+        if ((exclusive - 1) & exclusive) /* more than one bit set? */
+                bb_show_usage();
 
         /* If -u or -l wasn't given, check if we are using utc */
-        if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))
-                utc = (opt & HWCLOCK_OPT_UTC);
+        if (opt & (OPT_UTC | OPT_LOCALTIME))
+                utc = (opt & OPT_UTC);
         else
                 utc = rtc_adjtime_is_utc();
 
-        if (opt & HWCLOCK_OPT_HCTOSYS)
+        if (opt & OPT_HCTOSYS)
                 to_sys_clock(&rtcname, utc);
-        else if (opt & HWCLOCK_OPT_SYSTOHC)
+        else if (opt & OPT_SYSTOHC)
                 from_sys_clock(&rtcname, utc);
-        else if (opt & HWCLOCK_OPT_SYSTZ)
+        else if (opt & OPT_SYSTZ)
                 set_kernel_timezone_and_clock(utc, NULL);
-        else if (opt & HWCLOCK_OPT_PARAM_GET)
+        else if (opt & OPT_PARAM_GET)
                 get_rtc_param(&rtcname, param);
-        else if (opt & HWCLOCK_OPT_PARAM_SET)
+        else if (opt & OPT_PARAM_SET)
                 set_rtc_param(&rtcname, param);
         else
-                /* default HWCLOCK_OPT_SHOW */
+                /* default OPT_SHOW */
                 show_clock(&rtcname, utc);
 
         return 0;
diff --git a/util-linux/renice.c b/util-linux/renice.c
index 53f197cce..f2737f29b 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -45,7 +45,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
 {
         static const char Xetpriority_msg[] ALIGN1 = "%cetpriority";
 
-        int retval = EXIT_SUCCESS;
+        exitcode_t retval = EXIT_SUCCESS;
         int which = PRIO_PROCESS;  /* Default 'which' value. */
         int use_relative = 0;
         int adjustment, new_priority;
diff --git a/util-linux/rev.c b/util-linux/rev.c
index 36736359b..9a4b887e4 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -55,7 +55,7 @@ static void strrev(CHAR_T *s, int len)
 int rev_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int rev_main(int argc UNUSED_PARAM, char **argv)
 {
-        int retval;
+        exitcode_t retval;
         size_t bufsize;
         char *buf;
 
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 23da32868..f5c97a034 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -97,7 +97,7 @@ int umount_main(int argc UNUSED_PARAM, char **argv)
         struct mntent me;
         FILE *fp;
         char *fstype = NULL;
-        int status = EXIT_SUCCESS;
+        exitcode_t status = EXIT_SUCCESS;
         unsigned opt;
         struct mtab_list {
                 char *dir;