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

spawn: another cleanups in spawn_and_give_stdout()

Browse source
This commit is contained in:
Jaroslav Kysela 2014-11-17 23:17:19 +01:00
parent 2cee0bfeb6
commit 29ccb30ff6
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/spawn.c
View file

@ -340,11 +340,6 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
close(fd[0]);
dup2(fd[1], 1);
close(fd[1]);
if (redir_stderr)
dup2(spawn_pipe_error.wr, 2);
for (f = 3; f < maxfd; f++)
close(f);
f = open("/dev/null", O_RDWR);
if(f == -1) {
@ -354,12 +349,14 @@ spawn_and_give_stdout(const char *prog, char *argv[], int *rd, int redir_stderr)
}
dup2(f, 0);
if (!redir_stderr)
dup2(f, 2);
dup2(redir_stderr ? spawn_pipe_error.wr : f, 2);
close(f);
spawn_info("Executing \"%s\"\n", prog);
for (f = 3; f < maxfd; f++)
close(f);
execve(prog, argv, environ);
spawn_error("pid %d cannot execute %s -- %s\n",
getpid(), prog, strerror(errno));