Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

2 files changed, 4 insertions, 4 deletions

diff --git a/shell/ash.c b/shell/ash.c
index ad1e5ba7e..09659c1da 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -6132,7 +6132,7 @@ openhere(union node *redir)
                 ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN);
                 signal(SIGPIPE, SIG_DFL);
                 xwrite(pip[1], p, len);
-                _exit(EXIT_SUCCESS);
+                _exit_SUCCESS();
         }
 #endif
  out:
@@ -15860,7 +15860,7 @@ forkshell_openhere(struct forkshell *fs)
         ignoresig(SIGTSTP); //signal(SIGTSTP, SIG_IGN);
         signal(SIGPIPE, SIG_DFL);
         xwrite(pip[1], p, len);
-        _exit(EXIT_SUCCESS);
+        _exit_SUCCESS();
 }
 
 static void
diff --git a/shell/hush.c b/shell/hush.c
index 6a27b1634..982fc356a 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8587,7 +8587,7 @@ static NOINLINE void pseudo_exec_argv(nommu_save_t *nommu_save,
                  * expand_assignments(): think about ... | var=`sleep 1` | ...
                  */
                 free_strings(new_env);
-                _exit(EXIT_SUCCESS);
+                _exit_SUCCESS();
         }
 
         sv_shadowed = G.shadowed_vars_pp;
@@ -8768,7 +8768,7 @@ static void pseudo_exec(nommu_save_t *nommu_save,
 
         /* Case when we are here: ... | >file */
         debug_printf_exec("pseudo_exec'ed null command\n");
-        _exit(EXIT_SUCCESS);
+        _exit_SUCCESS();
 }
 
 #if ENABLE_HUSH_JOB