From 5b655f1ec99b86de0336bdabdaaf425e1570c88a Mon Sep 17 00:00:00 2001 From: Craig Small Date: Sat, 29 Oct 2011 10:42:43 +1100 Subject: [PATCH] waitpid for fuser to stop zombies Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/php5/+bug/876387 Bug-Sourceforge: https://sourceforge.net/tracker/?func=detail&aid=3429674&group_id=15273&atid=115273 Patch by Peter Holik for using waitpid to stop zombies. --- ChangeLog | 5 ++++- src/fuser.c | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4217a09..9a953ff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,11 @@ Changes in 22.15 ================ * Really apply patch for SF#31110178 RH#651794 - * Conditionally use fork before stat calls + * Conditionally use fork before stat calls SF#3427522 * Patch from Corrina Vinschen for compiling on cygwin + * Use ENOENT not EBADE for FreeBSD Debian #631566 + * Fix prstat typos + * Stop zombies by using waitpid Ubuntu #876387 by Peter Holik Changes in 22.14 ================ diff --git a/src/fuser.c b/src/fuser.c index d687b1f..d5a50d8 100644 --- a/src/fuser.c +++ b/src/fuser.c @@ -1835,6 +1835,7 @@ timeout(stat_t func, const char *path, struct stat *buf, unsigned int seconds) (void) alarm(0); (void) signal(SIGALRM, SIG_DFL); close(pipes[0]); + waitpid(pid, NULL, 0); break; } return ret; -- 2.50.1