wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-01 13:33:09 +07:00
Code Issues Packages Projects Releases Wiki Activity

Audit ec25051: service logging support

Browse Source 
- Must check return value from open(), found by Coverity Scan
- Minor refactor (and cleanup) to reduce code complexity

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2016-06-04 21:38:46 +02:00
parent f74a73be20
commit 00e5a8f5d9
1 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
service.c
+37 -18
View File
@@ -181,27 +181,46 @@ static int service_start(svc_t *svc)
dup2(STDIN_FILENO, STDERR_FILENO);
} else
#endif
if (svc->log) {
/* Open PTY to connect to logger (A pty isn't buffered like a pipe, and it eats newlines so they aren't logged) */
int fd = posix_openpt(O_RDWR);
int fd;
/*
* Open PTY to connect to logger. A pty isn't buffered
* like a pipe, and it eats newlines so they aren't logged
*/
fd = posix_openpt(O_RDWR);
if (fd == -1) {
svc->log = 0;
goto logger_err;
}
if (grantpt(fd) == -1 || unlockpt(fd) == -1) {
close(fd);
svc->log = 0;
goto logger_err;
}
/* SIGCHLD is still blocked for grantpt() and fork() */
sigprocmask(SIG_BLOCK, &nmask, NULL);
if (fd >= 0 && grantpt(fd) == 0 && unlockpt(fd) == 0) {
pid = fork();
if (pid == 0) {
int fds = open(ptsname(fd), O_RDONLY);
close(fd);
dup2(fds, STDIN_FILENO);
pid = fork();
if (pid == 0) {
int fds = open(ptsname(fd), O_RDONLY);
/* Reset signals */
sig_unblock();
exit(execlp("logger", "logger", "-t", strlen(svc->desc) > 0 ? svc->desc : svc->cmd, (char*)NULL));
}
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
close(fd);
if (fds == -1)
_exit(0);
dup2(fds, STDIN_FILENO);
/* Reset signals */
sig_unblock();
execlp("logger", "logger", "-t", strlen(svc->desc) > 0 ? svc->desc : svc->cmd, NULL);
_exit(0);
}
dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
close(fd);
} else if (debug) {
int fd;
@@ -212,7 +231,7 @@ static int service_start(svc_t *svc)
close(fd);
}
}
logger_err:
sig_unblock();
if (svc->inetd.cmd)
@@ -229,9 +248,9 @@ static int service_start(svc_t *svc)
}
} else
#endif
if (svc->log) {
if (svc->log)
waitpid(pid, NULL, 0);
}
exit(status);
} else if (debug) {
char buf[CMD_SIZE] = "";