Merge branch 'busybox' into merge

8 files changed, 8 insertions, 8 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;