Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

1 files changed, 10 insertions, 0 deletions

diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 102b5a227..388b246ca 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -427,3 +427,13 @@ int FAST_FUNC wait4pid(pid_t pid)
                 return WTERMSIG(status) + 0x180;
         return 0;
 }
+
+void FAST_FUNC exit_SUCCESS(void)
+{
+        exit(EXIT_SUCCESS);
+}
+
+void FAST_FUNC _exit_SUCCESS(void)
+{
+        _exit(EXIT_SUCCESS);
+}