From 50528f74e7e4cbde89a076a17b0fb962590738a4 Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Tue, 7 Jun 2011 08:21:09 +0000
Subject: First kill() the subprocess, *then* wait for it to exit.  Doh.

svn path=/rcynic/rcynic.c; revision=3855
---
 rcynic/rcynic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'rcynic/rcynic.c')

diff --git a/rcynic/rcynic.c b/rcynic/rcynic.c
index 8c5015dd..84110c02 100644
--- a/rcynic/rcynic.c
+++ b/rcynic/rcynic.c
@@ -1450,9 +1450,10 @@ static int rsync(const rcynic_ctx_t *rc,
 
   assert(pid > 0);
   for (i = 0; i < KILL_MAX && wpid == 0; i++) {
-    if ((wpid = waitpid(pid, &pid_status, 0)) != 0 && WIFEXITED(pid_status))
+    if ((wpid = waitpid(pid, &pid_status, WNOHANG)) != 0 && WIFEXITED(pid_status))
       break;
     kill(pid, SIGTERM);
+    sleep(1);
   }
 
   if (WEXITSTATUS(pid_status)) {
-- 
cgit v1.2.3