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

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

2 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 118fa6f2..9c7cadbb 100644
--- 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 03947cce..b39a75a7 100644
--- 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)
     {