tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Even more fixes.

This commit is contained in:
Gunnar Beutner 2012-06-24 16:39:49 +02:00
parent 1cffed4b43
commit ba4d550fec
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
icinga/i2-icinga.h
View File

@ -31,10 +31,6 @@
#include <i2-jsonrpc.h>
#include <set>
#ifndef _MSC_VER
# include "popen_noshell.h"
#endif /* _MSC_VER */
#include <boost/thread/future.hpp>
using boost::packaged_task;
using boost::unique_future;

16
icinga/nagioschecktask.cpp
View File

@ -1,5 +1,9 @@
#include "i2-icinga.h"
#ifndef _MSC_VER
# include "popen_noshell.h"
#endif /* _MSC_VER */
using namespace icinga;
boost::mutex NagiosCheckTask::m_Mutex;
@ -108,7 +112,9 @@ bool NagiosCheckTask::InitTask(void)
m_FP = _popen(m_Command.c_str(), "r");
#else /* _MSC_VER */
if (!m_UsePopen) {
m_FP = popen_noshell_compat(m_Command.c_str(), "r", &m_PCloseArg);
m_PCloseArg = new popen_noshell_pass_to_pclose;
m_FP = popen_noshell_compat(m_Command.c_str(), "r", (popen_noshell_pass_to_pclose *)m_PCloseArg);
if (m_FP == NULL) // TODO: add check for valgrind
m_UsePopen = true;
@ -139,10 +145,12 @@ bool NagiosCheckTask::RunTask(void)
#ifdef _MSC_VER
status = _pclose(m_FP);
#else /* _MSC_VER */
if (m_UsePopen)
if (m_UsePopen) {
status = pclose(m_FP);
else
status = pclose_noshell(&m_PCloseArg);
} else {
status = pclose_noshell((popen_noshell_pass_to_pclose *)m_PCloseArg);
delete (popen_noshell_pass_to_pclose *)m_PCloseArg;
}
#endif /* _MSC_VER */
#ifndef _MSC_VER

2
icinga/nagioschecktask.h
View File

@ -28,7 +28,7 @@ private:
stringstream m_OutputStream;
bool m_UsePopen;
#ifndef _MSC_VER
popen_noshell_pass_to_pclose m_PCloseArg;
void *m_PCloseArg;
#endif /* _MSC_VER */
static boost::mutex m_Mutex;