Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / stglibs / scriptexecuter.lib / scriptexecuter.c

diff --git a/stglibs/scriptexecuter.lib/scriptexecuter.c b/stglibs/scriptexecuter.lib/scriptexecuter.c
index bf45105a8332652d31df6b850d9eefc05afe1afd..bdf60230f3530a72225fd62920ba6af8375f089d 100644 (file)
--- a/stglibs/scriptexecuter.lib/scriptexecuter.c
+++ b/stglibs/scriptexecuter.lib/scriptexecuter.c
@@ -40,13 +40,12 @@ if (msgsnd(msgid, (void *)&sd, MAX_SCRIPT_LEN, 0) < 0)
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

 void Executer(int msgID, pid_t pid, char * procName)
 #else
 void Executer(int msgID, pid_t pid)
 #endif
 {
 void Executer(int msgID, pid_t pid, char * procName)
 #else
 void Executer(int msgID, pid_t pid)
 #endif
 {

-int ret;

 struct SCRIPT_DATA sd;
 struct sigaction newsa, oldsa;
 sigset_t sigmask;
 struct SCRIPT_DATA sd;
 struct sigaction newsa, oldsa;
 sigset_t sigmask;


@@ -56,7 +55,7 @@ if (pid)
     return;
 nonstop = 1;
 
     return;
 nonstop = 1;
 

-#ifdef LINUX
+#if defined(LINUX) || defined(DARWIN)

 memset(procName, 0, strlen(procName));
 strcpy(procName, "stg-exec");
 #else
 memset(procName, 0, strlen(procName));
 strcpy(procName, "stg-exec");
 #else


@@ -94,7 +93,7 @@ sigaction(SIGUSR1, &newsa, &oldsa);
 while (nonstop)
     {
     sd.mtype = 1;
 while (nonstop)
     {
     sd.mtype = 1;

-    ret = msgrcv(msgid, &sd, MAX_SCRIPT_LEN, 0, 0);
+    int ret = msgrcv(msgid, &sd, MAX_SCRIPT_LEN, 0, 0);

 
     if (ret < 0)
         {
 
     if (ret < 0)
         {