Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

3 files changed, 5 insertions, 5 deletions

diff --git a/loginutils/getty.c b/loginutils/getty.c
index 6c6d409f4..cd6378d80 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -484,7 +484,7 @@ static char *get_logname(void)
                         if (read(STDIN_FILENO, &c, 1) < 1) {
                                 finalize_tty_attrs();
                                 if (errno == EINTR || errno == EIO)
-                                        exit(EXIT_SUCCESS);
+                                        exit_SUCCESS();
                                 bb_simple_perror_msg_and_die(bb_msg_read_error);
                         }
 
@@ -511,7 +511,7 @@ static char *get_logname(void)
                         case CTL('C'):
                         case CTL('D'):
                                 finalize_tty_attrs();
-                                exit(EXIT_SUCCESS);
+                                exit_SUCCESS();
                         case '\0':
                                 /* BREAK. If we have speeds to try,
                                  * return NULL (will switch speeds and return here) */
@@ -538,7 +538,7 @@ static char *get_logname(void)
 static void alarm_handler(int sig UNUSED_PARAM)
 {
         finalize_tty_attrs();
-        _exit(EXIT_SUCCESS);
+        _exit_SUCCESS();
 }
 
 static void sleep10(void)
diff --git a/loginutils/login.c b/loginutils/login.c
index ce87e318a..569053c12 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -312,7 +312,7 @@ static void alarm_handler(int sig UNUSED_PARAM)
         /* unix API is brain damaged regarding O_NONBLOCK,
          * we should undo it, or else we can affect other processes */
         ndelay_off(STDOUT_FILENO);
-        _exit(EXIT_SUCCESS);
+        _exit_SUCCESS();
 }
 
 int login_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 334b7d2ad..720835c4b 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -128,5 +128,5 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
         ioctl(STDIN_FILENO, VT_SETMODE, &ovtm);
 #endif
         tcsetattr_stdin_TCSANOW(&oterm);
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+        fflush_stdout_and_exit_SUCCESS();
 }