emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libbb: use _exit, not exit, in bb_daemonize_or_rexec()

Browse Source 
By the time we reach exit in parent, child already exited or execed.
We should not re-run libc cleanup code.

While at it, introduce bb_daemon_helper() and add a few comments.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2017-08-04 23:04:17 +02:00
parent 692eeb81a4
commit b182e9ad60
6 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libbb/vfork_daemon_rexec.c
View File

@ -209,6 +209,9 @@ pid_t FAST_FUNC fork_or_rexec(char **argv)
/* Maybe we are already re-execed and come here again? */
if (re_execed)
return 0;
/* fflush_all(); ? - so far all callers had no buffered output to flush */
pid = xvfork();
if (pid) /* parent */
return pid;
@ -245,8 +248,11 @@ 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)) {
/* fflush_all(); - add it in fork_or_rexec() if necessary */
if (fork_or_rexec(argv))
exit(EXIT_SUCCESS); /* parent */
_exit(EXIT_SUCCESS); /* parent */
/* if daemonizing, detach from stdio & ctty */
setsid();
dup2(fd, 0);
@ -258,7 +264,7 @@ void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
* Prevent this: stop being a session leader.
*/
if (fork_or_rexec(argv))
exit(EXIT_SUCCESS); /* parent */
_exit(EXIT_SUCCESS); /* parent */
}
}
while (fd > 2) {