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

Zombie Killer ;)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 768a064629
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-20 (Thu, 20 Sep 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2012-09-20 22:43:00 +02:00
parent 8a739e79e6
commit 37d588eb51
1 changed files with 4 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/gui/plugins.cpp
View File

@@ -50,6 +50,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
#include <errno.h> #include <errno.h>
#include <sys/wait.h>
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
@@ -308,52 +309,6 @@ void CPlugins::startPlugin(const char * const name)
} }
FILE* popen2( pid_t& pid, const char *cmdstring, const char *type) {
int pfd[2] ={-1,-1};
FILE *fp = NULL;
/* only allow "r" or "w" */
if ((type[0] != 'r' && type[0] != 'w') || type[1] != 0) {
errno = EINVAL; /* required by POSIX */
return(NULL);
}
if (pipe(pfd) < 0)
return(NULL); /* errno set by pipe() */
if ((pid = vfork()) < 0) {
return(NULL); /* errno set by vfork() */
} else if (pid == 0) { /* child */
if (*type == 'r') {
close(pfd[0]);
if (pfd[1] != STDOUT_FILENO) {
dup2(pfd[1], STDOUT_FILENO);
close(pfd[1]);
}
} else {
close(pfd[1]);
if (pfd[0] != STDIN_FILENO) {
dup2(pfd[0], STDIN_FILENO);
close(pfd[0]);
}
}
execl("/bin/sh", "sh", "-c", cmdstring, (char *)0);
exit(0);
}
/* parent continues... */
if (*type == 'r') {
close(pfd[1]);
if ((fp = fdopen(pfd[0], type)) == NULL)
return(NULL);
} else {
close(pfd[0]);
if ((fp = fdopen(pfd[1], type)) == NULL)
return(NULL);
}
return(fp);
}
void CPlugins::startScriptPlugin(int number) void CPlugins::startScriptPlugin(int number)
{ {
const char *script = plugin_list[number].pluginfile.c_str(); const char *script = plugin_list[number].pluginfile.c_str();
@@ -375,8 +330,10 @@ void CPlugins::startScriptPlugin(int number)
{ {
scriptOutput += output; scriptOutput += output;
} }
kill(pid, SIGINT );
pclose(f); pclose(f);
int s;
while (waitpid(pid,&s,WNOHANG)>0);
kill(pid,SIGTERM);
if(output) if(output)
free(output); free(output);
} }