stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

spawn: reshuffle code to get proper stdin for spawned process

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-17 23:26:18 +01:00
parent 29ccb30ff6
commit fc7e0f4a36
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/spawn.c
View file

@ -335,12 +335,6 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
}
if(p == 0) {
close(0);
close(2);
close(fd[0]);
dup2(fd[1], 1);
close(fd[1]);
f = open("/dev/null", O_RDWR);
if(f == -1) {
spawn_error("pid %d cannot open /dev/null for redirect %s -- %s",
@ -348,6 +342,11 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
exit(1);
}
close(0);
close(2);
close(fd[0]);
dup2(fd[1], 1);
close(fd[1]);
dup2(f, 0);
dup2(redir_stderr ? spawn_pipe_error.wr : f, 2);
close(f);