--- gvpe/src/util.C	2005/04/26 00:55:56	1.21
+++ gvpe/src/util.C	2008/08/07 19:07:03	1.23
@@ -1,24 +1,34 @@
 /*
     util.C -- process management and other utility functions
-    Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
     
     Some of these are taken from tinc, see the AUTHORS file.
  
     This file is part of GVPE.
 
-    GVPE is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    GVPE is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+   
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+    Public License for more details.
+   
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
 #include "config.h"
@@ -129,15 +139,25 @@
   return 0;
 }
 
-bool run_script (const run_script_cb &cb, bool wait)
+pid_t
+run_script (const run_script_cb &cb, bool wait)
 {
+  sigset_t oldset;
+
   if (wait)
-    signal (SIGCHLD, SIG_DFL); // this is extremely ugly, but I did not feel like implementing a complete wait() event logic. It's easier to write this long comment to make your editor happy.
+    {
+      sigset_t sigchld;
+      sigemptyset (&sigchld);
+      sigaddset (&sigchld, SIGCHLD);
+      sigprocmask (SIG_BLOCK, &sigchld, &oldset);
+    }
 
-  int pid = fork ();
+  pid_t pid = fork ();
 
   if (pid == 0)
     {
+      sigprocmask (SIG_SETMASK, &oldset, 0);
+
       execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
       exit (EXIT_FAILURE);
     }
@@ -148,19 +168,19 @@
           int status;
           int res = waitpid (pid, &status, 0);
 
-          signal (SIGCHLD, SIG_IGN);
+          sigprocmask (SIG_SETMASK, &oldset, 0);
 
           if (res < 0)
             {
               slog (L_WARN, _("waiting for an external command failed: %s."),
                     strerror (errno));
-              return false;
+              return 0;
             }
           else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
             {
               slog (L_WARN, _("external command returned with exit status %d (%04x)."),
                     WEXITSTATUS (status), status);
-              return false;
+              return 0;
             }
         }
     }
@@ -170,7 +190,7 @@
       exit (EXIT_FAILURE);
     }
 
-  return true;
+  return pid;
 }
 
 #if ENABLE_HTTP_PROXY