--- gvpe/src/util.C	2004/01/29 18:55:10	1.12
+++ gvpe/src/util.C	2008/08/07 17:54:27	1.22
@@ -1,22 +1,34 @@
 /*
     util.C -- process management and other utility functions
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
     
     Some of these are taken from tinc, see the AUTHORS file.
  
-    This program 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 this program; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    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 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"
@@ -48,16 +60,16 @@
 {
   int pid;
 
-  pid = check_pid (pidfilename);
+  pid = check_pid (conf.pidfilename);
 
   if (pid)
     {
-      fprintf (stderr, _("A vped is already running with pid %d.\n"), pid);
+      fprintf (stderr, _("A gvpe daemon is already running with pid %d.\n"), pid);
       return 1;
     }
 
   /* if it's locked, write-protected, or whatever */
-  if (!write_pid (pidfilename))
+  if (!write_pid (conf.pidfilename))
     return 1;
 
   return 0;
@@ -68,11 +80,11 @@
 {
   int pid;
 
-  pid = read_pid (pidfilename);
+  pid = read_pid (conf.pidfilename);
 
   if (!pid)
     {
-      fprintf (stderr, _("No other vped is running.\n"));
+      fprintf (stderr, _("No other gvpe daemon is running.\n"));
       return 1;
     }
 
@@ -81,10 +93,10 @@
   /* ESRCH is returned when no process with that pid is found */
   if (kill (pid, signal) && errno == ESRCH)
     {
-      fprintf (stderr, _("The vped is no longer running. "));
+      fprintf (stderr, _("The gvpe daemon is no longer running. "));
 
       fprintf (stderr, _("Removing stale lock file.\n"));
-      remove_pid (pidfilename);
+      remove_pid (conf.pidfilename);
     }
 
   return 0;
@@ -114,7 +126,7 @@
 
       /* Now UPDATE the pid in the pidfile, because we changed it... */
 
-      if (!write_pid (pidfilename))
+      if (!write_pid (conf.pidfilename))
         return -1;
 
       log_to (LOGTO_SYSLOG);
@@ -122,40 +134,53 @@
   else
     log_to (LOGTO_SYSLOG | LOGTO_STDERR);
 
-  slog (L_INFO, _("vped %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
+  slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
 
   return 0;
 }
 
-void
-make_names (void)
+bool run_script (const run_script_cb &cb, bool wait)
 {
-  if (!pidfilename)
-    pidfilename = LOCALSTATEDIR "/run/vped.pid";
+  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.
 
-  if (!confbase)
-    asprintf (&confbase, "%s/vpe", CONFDIR);
-}
-
-void run_script (const run_script_cb &cb, bool wait)
-{
-  int pid;
+  int pid = fork ();
 
-  if ((pid = fork ()) == 0)
+  if (pid == 0)
     {
-      char *filename;
-      asprintf (&filename, "%s/%s", confbase, cb());
-      execl (filename, filename, (char *) 0);
-      exit (126);
+      execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
+      exit (EXIT_FAILURE);
     }
   else if (pid > 0)
     {
       if (wait)
         {
-          waitpid (pid, 0, 0);
-          /* TODO: check status */
+          int status;
+          int res = waitpid (pid, &status, 0);
+
+          signal (SIGCHLD, SIG_IGN);
+
+          if (res < 0)
+            {
+              slog (L_WARN, _("waiting for an external command failed: %s."),
+                    strerror (errno));
+              return false;
+            }
+          else if (!WIFEXITED (status) || WEXITSTATUS (status) != EXIT_SUCCESS)
+            {
+              slog (L_WARN, _("external command returned with exit status %d (%04x)."),
+                    WEXITSTATUS (status), status);
+              return false;
+            }
         }
     }
+  else
+    {
+      slog (L_ERR, _("unable to fork, exiting: %s"), strerror (errno));
+      exit (EXIT_FAILURE);
+    }
+
+  return true;
 }
 
 #if ENABLE_HTTP_PROXY