git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed stupid errors in cap_bpf.
[stg.git]
/
projects
/
rscriptd
/
main.cpp
diff --git
a/projects/rscriptd/main.cpp
b/projects/rscriptd/main.cpp
index 93e1d6050c416e2ac90684c01e2f8da65d2ac2b7..1acc06c7946402d3a1e7f6819655b0de3de62e78 100644
(file)
--- a/
projects/rscriptd/main.cpp
+++ b/
projects/rscriptd/main.cpp
@@
-73,7
+73,11
@@
while (pid != executersPid.end())
}
}
//-----------------------------------------------------------------------------
}
}
//-----------------------------------------------------------------------------
+#ifdef LINUX
int StartScriptExecuter(char * procName, int msgKey, int * msgID)
int StartScriptExecuter(char * procName, int msgKey, int * msgID)
+#else
+int StartScriptExecuter(char *, int msgKey, int * msgID)
+#endif
{
STG_LOGGER & WriteServLog = GetStgLogger();
{
STG_LOGGER & WriteServLog = GetStgLogger();
@@
-117,12
+121,20
@@
switch (executerPid)
//close(1);
//close(2);
//setsid();
//close(1);
//close(2);
//setsid();
+#ifdef LINUX
Executer(*msgID, executerPid, procName);
Executer(*msgID, executerPid, procName);
+#else
+ Executer(*msgID, executerPid);
+#endif
return 1;
default: // Parent
if (executersPid.empty())
return 1;
default: // Parent
if (executersPid.empty())
+#ifdef LINUX
Executer(*msgID, executerPid, NULL);
Executer(*msgID, executerPid, NULL);
+#else
+ Executer(*msgID, executerPid);
+#endif
executersPid.insert(executerPid);
}
return 0;
executersPid.insert(executerPid);
}
return 0;