Merge busybox into merge

Fix merge conflict in miscutils/less.c.

Use exit_SUCCESS() where possible.

6 files changed, 7 insertions, 7 deletions

diff --git a/networking/arping.c b/networking/arping.c
index d44d7d697..86f0221ed 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -159,7 +159,7 @@ static void finish(void)
         if (option_mask32 & DAD)
                 exit(!!received);
         if (option_mask32 & UNSOLICITED)
-                exit(EXIT_SUCCESS);
+                exit_SUCCESS();
         exit(!received);
 }
 
diff --git a/networking/httpd.c b/networking/httpd.c
index c9daa0638..5f7b3a4dd 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -2865,7 +2865,7 @@ static void mingw_daemonize(char **argv)
         close(fd);
 
         if (mingw_spawn_detach(new_argv))
-                exit(EXIT_SUCCESS); /* parent */
+                exit_SUCCESS(); /* parent */
         exit(EXIT_FAILURE); /* parent */
 }
 #endif
diff --git a/networking/inetd.c b/networking/inetd.c
index e5352a555..e71be51c3 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1208,7 +1208,7 @@ static void clean_up_and_exit(int sig UNUSED_PARAM)
                         close(sep->se_fd);
         }
         remove_pidfile_std_path_and_ext("inetd");
-        exit(EXIT_SUCCESS);
+        exit_SUCCESS();
 }
 
 int inetd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/networking/nc.c b/networking/nc.c
index 5525e41f9..d039e2055 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -287,7 +287,7 @@ int nc_main(int argc, char **argv)
                                 nread = safe_read(pfds[fdidx].fd, iobuf, COMMON_BUFSIZE);
                                 if (fdidx != 0) {
                                         if (nread < 1)
-                                                exit(EXIT_SUCCESS);
+                                                exit_SUCCESS();
                                         ofd = STDOUT_FILENO;
                                 } else {
                                         if (nread < 1) {
@@ -324,7 +324,7 @@ int nc_main(int argc, char **argv)
                                 nread = safe_read(fd, iobuf, COMMON_BUFSIZE);
                                 if (fd == cfd) {
                                         if (nread < 1)
-                                                exit(EXIT_SUCCESS);
+                                                exit_SUCCESS();
                                         ofd = STDOUT_FILENO;
                                 } else {
                                         if (nread < 1) {
diff --git a/networking/route.c b/networking/route.c
index ff5daa8a7..26146f8e9 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -702,7 +702,7 @@ int route_main(int argc UNUSED_PARAM, char **argv)
 #endif
                         bb_displayroutes(noresolve, opt & ROUTE_OPT_e);
 
-                fflush_stdout_and_exit(EXIT_SUCCESS);
+                fflush_stdout_and_exit_SUCCESS();
         }
 
         /* Check verb.  At the moment, must be add, del, or delete. */
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 581da1924..0805e464f 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -582,7 +582,7 @@ free_session(struct tsession *ts)
         struct tsession *t;
 
         if (option_mask32 & OPT_INETD)
-                exit(EXIT_SUCCESS);
+                exit_SUCCESS();
 
         /* Unlink this telnet session from the session list */
         t = G.sessions;