mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- helpers.cpp: fix errorlevel of child-process; whitespace cleanup

Browse Source
This commit is contained in:
svenhoefer
2012-09-15 21:26:12 +02:00
parent bf1f9afc8d
commit acaf807bbb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/helpers.cpp
View File

@@ -69,7 +69,7 @@ int my_system(const char * cmd)
int my_system(const char * cmd, const char * arg1, const char * arg2, const char * arg3, const char * arg4, const char * arg5, const char * arg6) int my_system(const char * cmd, const char * arg1, const char * arg2, const char * arg3, const char * arg4, const char * arg5, const char * arg6)
{ {
int i=0 ,ret=0; int i=0 ,ret=0, childExit=0;
pid_t pid; pid_t pid;
int maxfd = getdtablesize();// sysconf(_SC_OPEN_MAX); int maxfd = getdtablesize();// sysconf(_SC_OPEN_MAX);
switch (pid = vfork()) switch (pid = vfork())
@@ -79,8 +79,8 @@ int my_system(const char * cmd, const char * arg1, const char * arg2, const char
return -1; return -1;
case 0: /* child process */ case 0: /* child process */
for(i = 3; i < maxfd; i++) for(i = 3; i < maxfd; i++)
close(i); close(i);
if(execlp(cmd, cmd, arg1, arg2, arg3, arg4, arg5, arg6, NULL)) if(execlp(cmd, cmd, arg1, arg2, arg3, arg4, arg5, arg6, NULL))
{ {
std::string txt = "ERROR: my_system \"" + (std::string) cmd + "\""; std::string txt = "ERROR: my_system \"" + (std::string) cmd + "\"";
perror(txt.c_str()); perror(txt.c_str());
@@ -90,7 +90,9 @@ int my_system(const char * cmd, const char * arg1, const char * arg2, const char
default: /* parent returns to calling process */ default: /* parent returns to calling process */
break; break;
} }
waitpid(pid, 0, 0); waitpid(pid, &childExit, 0);
if(childExit != 0)
ret = childExit;
return ret; return ret;
} }