-do not abort waitpid just because of SIGCHLD

1 files changed, 7 insertions, 1 deletions

diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index b344cd862..f9683bd81 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -1399,9 +1399,15 @@ GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc)
 
 #ifndef MINGW
   pid_t pid = proc->pid;
+  pid_t ret;
 
-  if (pid != waitpid (pid, NULL, 0))
+  while ( (pid != (ret = waitpid (pid, NULL, 0))) &&
+          (EINTR == errno) ) ;
+  if (pid != ret) 
+  {
+    LOG_STRERROR (GNUNET_ERROR_TYPE_WARNING, "waitpid");
     return GNUNET_SYSERR;
+  }
   return GNUNET_OK;
 #else
   HANDLE h;