2004-11-10 Colin Walters <walters@verbum.org>

	* dbus/dbus-spawn.c (check_babysit_events): Handle EINTR,
	for extra paranoia.

diff --git a/ChangeLog b/ChangeLog
index 118fa6f2cff8a97ce3aed8322637cd88c24f33c7..9c7cadbbcc891e2978346cf736a8563d183527cb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-10  Colin Walters  <walters@verbum.org>
+
+       * dbus/dbus-spawn.c (check_babysit_events): Handle EINTR,
+       for extra paranoia.
+
 2004-11-09  Colin Walters  <walters@verbum.org>
 
        * dbus/dbus-string.c (_dbus_string_get_length): New

diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 03947cce417f3db6b64ef4062019187b1ef0c0d2..b39a75a7547396137d3df6d1f2a474ae2b33cca4 100644 (file)
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -864,7 +864,11 @@ check_babysit_events (pid_t grandchild_pid,
   pid_t ret;
   int status;
   
-  ret = waitpid (grandchild_pid, &status, WNOHANG);
+  do
+    {
+      ret = waitpid (grandchild_pid, &status, WNOHANG);
+    }
+  while (ret < 0 && errno == EINTR);
 
   if (ret == 0)
     {