woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to redirect log fd anymore

Browse Source
This commit is contained in:
Robert Swiecki 2016-03-15 20:42:03 +01:00
parent 969750c4c9
commit 3bc8cce90e
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contain.c
View File

@ -251,13 +251,8 @@ static bool containMakeFdsCOE(void)
return false;
}
bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err, int fd_log)
bool containSetupFD(struct nsjconf_t * nsjconf, int fd_in, int fd_out, int fd_err)
{
/* Make sure all logs go to the parent process from now on */
if (fd_log != -1) {
logRedirectLogFD(fd_log);
}
if (nsjconf->mode != MODE_LISTEN_TCP) {
if (nsjconf->is_silent == false) {
return true;

2
contain.h
View File

@ -26,7 +26,7 @@
#include "common.h"
bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err, int fd_log);
bool containSetupFD(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err);
bool containContain(struct nsjconf_t *nsjconf);
#endif /* NS_CONTAIN_H */

2
subproc.c
View File

@ -51,7 +51,7 @@ const char subprocDoneChar = 'D';
static int subprocNewProc(struct nsjconf_t *nsjconf, int fd_in, int fd_out, int fd_err, int pipefd)
{
if (containSetupFD(nsjconf, fd_in, fd_out, fd_err, pipefd) == false) {
if (containSetupFD(nsjconf, fd_in, fd_out, fd_err) == false) {
exit(1);
}
char doneChar;