diff options
| author | Rob Austein <sra@hactrn.net> | 2011-06-07 08:21:09 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-06-07 08:21:09 +0000 |
| commit | 50528f74e7e4cbde89a076a17b0fb962590738a4 (patch) | |
| tree | 34bce9edbb341fc85f2ed578f435f85f469b8daf | |
| parent | c495c0885703cb0d5aa00daafdf62a30c8213461 (diff) | |
First kill() the subprocess, *then* wait for it to exit. Doh.
svn path=/rcynic/rcynic.c; revision=3855
| -rw-r--r-- | rcynic/rcynic.c | 3 |
1 files changed, 2 insertions, 1 deletions
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)) { |