d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

daemon: simplify if/else chain

Browse Source 
Reviewed by:	kevans
Pull Request:	https://github.com/freebsd/freebsd-src/pull/672
This commit is contained in:
Ihor Antonov 2023-03-02 23:17:02 -06:00 committed by Kyle Evans
parent bc43a9a715
commit cd1e6e70d0
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
usr.sbin/daemon/daemon.c
View File

@ -452,22 +452,16 @@ main(int argc, char *argv[])
*/ */
if (child_gone && child_eof) { if (child_gone && child_eof) {
break; break;
} else if (terminate) { }
if (terminate) {
goto exit; goto exit;
} else if (!child_eof) { }
if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) {
warn("sigprocmask"); if (child_eof) {
goto exit;
}
child_eof = !listen_child(pfd[0], &logparams);
if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) {
warn("sigprocmask");
goto exit;
}
} else {
if (sigprocmask(SIG_BLOCK, &mask_susp, NULL)) { if (sigprocmask(SIG_BLOCK, &mask_susp, NULL)) {
warn("sigprocmask"); warn("sigprocmask");
goto exit; goto exit;
} }
while (!terminate && !child_gone) while (!terminate && !child_gone)
sigsuspend(&mask_orig); sigsuspend(&mask_orig);
@ -475,7 +469,21 @@ main(int argc, char *argv[])
warn("sigprocmask"); warn("sigprocmask");
goto exit; goto exit;
} }
continue;
} }
if (sigprocmask(SIG_BLOCK, &mask_read, NULL)) {
warn("sigprocmask");
goto exit;
}
child_eof = !listen_child(pfd[0], &logparams);
if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) {
warn("sigprocmask");
goto exit;
}
} }
if (restart && !terminate) { if (restart && !terminate) {
daemon_sleep(restart, 0); daemon_sleep(restart, 0);