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

Move subprocReap to the front of the waiting loop

Browse Source
This commit is contained in:
Jagger 2016-03-04 02:19:52 +01:00
parent 1f4983290e
commit 6fc00951af
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nsjail.c
View File

@ -136,14 +136,16 @@ static void nsjailListenMode(struct nsjconf_t *nsjconf)
static int nsjailStandaloneMode(struct nsjconf_t *nsjconf)
{
int child_status = 0;
subprocRunChild(nsjconf, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO);
for (;;) {
int child_status = subprocReap(nsjconf);
if (subprocCount(nsjconf) == 0) {
if (nsjconf->mode == MODE_STANDALONE_ONCE) {
return child_status;
}
subprocRunChild(nsjconf, STDIN_FILENO, STDOUT_FILENO, STDERR_FILENO);
continue;
}
if (nsjailShowProc == true) {
nsjailShowProc = false;
@ -154,11 +156,10 @@ static int nsjailStandaloneMode(struct nsjconf_t *nsjconf)
logStop(nsjailSigFatal);
return -1;
}
pause();
child_status = subprocReap(nsjconf);
}
// not reached
return child_status;
}
int main(int argc, char *argv[])