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

daemon: add braces to while loop

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 cd1e6e70d0
commit d6c398d882
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ main(int argc, char *argv[])
const char *user = NULL; const char *user = NULL;
int ch = 0; int ch = 0;
int keep_cur_workdir = 1; int keep_cur_workdir = 1;
int pfd[2] = { -1, -1 }; int pipe_fd[2] = { -1, -1 };
int restart = 0; int restart = 0;
int stdmask = STDOUT_FILENO | STDERR_FILENO; int stdmask = STDOUT_FILENO | STDERR_FILENO;
struct log_params logparams = { struct log_params logparams = {
@ -360,7 +360,7 @@ main(int argc, char *argv[])
goto exit; goto exit;
} }
restart: restart:
if (pipe(pfd)) { if (pipe(pipe_fd)) {
err(1, "pipe"); err(1, "pipe");
} }
/* /*
@ -389,23 +389,23 @@ main(int argc, char *argv[])
* and dup'd pipes. * and dup'd pipes.
*/ */
if (supervision_enabled) { if (supervision_enabled) {
close(pfd[0]); close(pipe_fd[0]);
if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) { if (sigprocmask(SIG_SETMASK, &mask_orig, NULL)) {
err(1, "sigprogmask"); err(1, "sigprogmask");
} }
if (stdmask & STDERR_FILENO) { if (stdmask & STDERR_FILENO) {
if (dup2(pfd[1], STDERR_FILENO) == -1) { if (dup2(pipe_fd[1], STDERR_FILENO) == -1) {
err(1, "dup2"); err(1, "dup2");
} }
} }
if (stdmask & STDOUT_FILENO) { if (stdmask & STDOUT_FILENO) {
if (dup2(pfd[1], STDOUT_FILENO) == -1) { if (dup2(pipe_fd[1], STDOUT_FILENO) == -1) {
err(1, "dup2"); err(1, "dup2");
} }
} }
if (pfd[1] != STDERR_FILENO && if (pipe_fd[1] != STDERR_FILENO &&
pfd[1] != STDOUT_FILENO) { pipe_fd[1] != STDOUT_FILENO) {
close(pfd[1]); close(pipe_fd[1]);
} }
} }
execvp(argv[0], argv); execvp(argv[0], argv);
@ -424,8 +424,8 @@ main(int argc, char *argv[])
warn("sigprocmask"); warn("sigprocmask");
goto exit; goto exit;
} }
close(pfd[1]); close(pipe_fd[1]);
pfd[1] = -1; pipe_fd[1] = -1;
setproctitle("%s[%d]", title, (int)pid); setproctitle("%s[%d]", title, (int)pid);
/* /*
@ -463,8 +463,9 @@ main(int argc, char *argv[])
warn("sigprocmask"); warn("sigprocmask");
goto exit; goto exit;
} }
while (!terminate && !child_gone) while (!terminate && !child_gone) {
sigsuspend(&mask_orig); sigsuspend(&mask_orig);
}
if (sigprocmask(SIG_UNBLOCK, &mask_susp, NULL)) { if (sigprocmask(SIG_UNBLOCK, &mask_susp, NULL)) {
warn("sigprocmask"); warn("sigprocmask");
goto exit; goto exit;
@ -477,7 +478,7 @@ main(int argc, char *argv[])
goto exit; goto exit;
} }
child_eof = !listen_child(pfd[0], &logparams); child_eof = !listen_child(pipe_fd[0], &logparams);
if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) { if (sigprocmask(SIG_UNBLOCK, &mask_read, NULL)) {
warn("sigprocmask"); warn("sigprocmask");
@ -493,14 +494,14 @@ main(int argc, char *argv[])
goto exit; goto exit;
} }
if (restart && !terminate) { if (restart && !terminate) {
close(pfd[0]); close(pipe_fd[0]);
pfd[0] = -1; pipe_fd[0] = -1;
goto restart; goto restart;
} }
exit: exit:
close(logparams.output_fd); close(logparams.output_fd);
close(pfd[0]); close(pipe_fd[0]);
close(pfd[1]); close(pipe_fd[1]);
if (logparams.syslog_enabled) { if (logparams.syslog_enabled) {
closelog(); closelog();
} }