[ViewVC] Diff of: cvs/gvpe/src/util.C

Comparing gvpe/src/util.C (file contents):
Revision 1.17 by pcg, Fri Mar 18 01:53:05 2005 UTC vs.
Revision 1.19 by pcg, Wed Mar 23 21:55:39 2005 UTC

 #include <unistd.h>
 #include <time.h>
 #include "netcompat.h"
+#include "gettext.h"
 #include "pidfile.h"
 #include "dropin.h"
 #include "global.h"
 #include "conf.h"
   slog (L_INFO, _("gvpe daemon %s (%s %s) starting"), VERSION, __DATE__, __TIME__);
   return 0;
 }
-void run_script (const run_script_cb &cb, bool wait)
+bool run_script (const run_script_cb &cb, bool wait)
 {
   int pid;
   if ((pid = fork ()) == 0)
     {
-      char *filename;
+      execl ("/bin/sh", "/bin/sh", "-c", cb (), (char *) 0);
-      asprintf (&filename, "%s/%s", confbase, cb());
+      exit (EXIT_FAILURE);
-      execl (filename, filename, (char *) 0);
-      exit (126);
     }
   else if (pid > 0)
     {
       if (wait)
         {
+          int status;
-          waitpid (pid, 0, 0);
+          if (waitpid (pid, &status, 0) < 0)
-          /* TODO: check status */
+            {
+              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;
+            }
         }
     }
+  return true;
 }
 #if ENABLE_HTTP_PROXY
 // works like strdup
 u8 *

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines