hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added closing of file descriptors to piped process starter (gets rid of ffmpeg junk output), added some extra debugging output to DDV Controller.

Browse source
This commit is contained in:
Thulinma 2012-03-11 13:48:03 +01:00
parent b08ced33e8
commit dbd6cbc500
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
util/util.cpp
View file

@ -14,6 +14,7 @@
#include <errno.h> #include <errno.h>
#include <iostream> #include <iostream>
#include <sys/types.h> #include <sys/types.h>
#include <fcntl.h>
#include <pwd.h> #include <pwd.h>
#include <getopt.h> #include <getopt.h>
#include <stdlib.h> #include <stdlib.h>
@ -147,11 +148,14 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2){
return 0; return 0;
} }
int devnull = open("/dev/null", O_RDWR);
pid_t ret = fork(); pid_t ret = fork();
if (ret == 0){ if (ret == 0){
close(pfildes[0]); close(pfildes[0]);
dup2(pfildes[1],1); dup2(pfildes[1],STDOUT_FILENO);
close(pfildes[1]); close(pfildes[1]);
dup2(devnull, STDIN_FILENO);
dup2(devnull, STDERR_FILENO);
runCmd(cmd); runCmd(cmd);
}else{ }else{
if (ret > 0){ if (ret > 0){
@ -165,12 +169,14 @@ pid_t Util::Procs::Start(std::string name, std::string cmd, std::string cmd2){
return 0; return 0;
} }
} }
pid_t ret2 = fork(); pid_t ret2 = fork();
if (ret2 == 0){ if (ret2 == 0){
close(pfildes[1]); close(pfildes[1]);
dup2(pfildes[0],0); dup2(pfildes[0],STDIN_FILENO);
close(pfildes[0]); close(pfildes[0]);
dup2(devnull, STDOUT_FILENO);
dup2(devnull, STDERR_FILENO);
runCmd(cmd2); runCmd(cmd2);
}else{ }else{
if (ret2 > 0){ if (ret2 > 0){