init: fix logically inverted FEATURE_EXTRA_QUIET check

[oweals/busybox.git] / libbb / vfork_daemon_rexec.c

diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 50dc3affeef7877f77ed3c14046b46e5c972c776..9be90172290ef67bfd611c64371befa24c2e56b8 100644 (file)
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -15,7 +15,6 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <paths.h>
 #include "busybox.h" /* uses applet tables */
 
 /* This does a fork/exec in one call, using vfork().  Returns PID of new child,
@@ -26,7 +25,7 @@ pid_t FAST_FUNC spawn(char **argv)
        volatile int failed;
        pid_t pid;
 
-// Ain't it a good place to fflush(NULL)?
+       fflush_all();
 
        /* Be nice to nommu machines. */
        failed = 0;
@@ -42,6 +41,8 @@ pid_t FAST_FUNC spawn(char **argv)
                 * (but don't run atexit() stuff, which would screw up parent.)
                 */
                failed = errno;
+               /* mount, for example, does not want the message */
+               /*bb_perror_msg("can't execute '%s'", argv[0]);*/
                _exit(111);
        }
        /* parent */
@@ -251,35 +252,32 @@ void FAST_FUNC re_exec(char **argv)
        bb_perror_msg_and_die("exec %s", bb_busybox_exec_path);
 }
 
-void FAST_FUNC forkexit_or_rexec(char **argv)
+pid_t FAST_FUNC fork_or_rexec(char **argv)
 {
        pid_t pid;
        /* Maybe we are already re-execed and come here again? */
        if (re_execed)
-               return;
-
+               return 0;
        pid = vfork();
        if (pid < 0) /* wtf? */
                bb_perror_msg_and_die("vfork");
        if (pid) /* parent */
-               exit(EXIT_SUCCESS);
+               return pid;
        /* child - re-exec ourself */
        re_exec(argv);
 }
 #else
 /* Dance around (void)...*/
-#undef forkexit_or_rexec
-void FAST_FUNC forkexit_or_rexec(void)
+#undef fork_or_rexec
+pid_t FAST_FUNC fork_or_rexec(void)
 {
        pid_t pid;
        pid = fork();
        if (pid < 0) /* wtf? */
                bb_perror_msg_and_die("fork");
-       if (pid) /* parent */
-               exit(EXIT_SUCCESS);
-       /* child */
+       return pid;
 }
-#define forkexit_or_rexec(argv) forkexit_or_rexec()
+#define fork_or_rexec(argv) fork_or_rexec()
 #endif
 
 /* Due to a #define in libbb.h on MMU systems we actually have 1 argument -
@@ -310,7 +308,8 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
                fd = dup(fd); /* have 0,1,2 open at least to /dev/null */
 
        if (!(flags & DAEMON_ONLY_SANITIZE)) {
-               forkexit_or_rexec(argv);
+               if (fork_or_rexec(argv))
+                       exit(EXIT_SUCCESS); /* parent */
                /* if daemonizing, make sure we detach from stdio & ctty */
                setsid();
                dup2(fd, 0);