From: Craig Small <csmall@users.sourceforge.net>
Date: Fri, 28 Oct 2011 23:42:43 +0000 (+1100)
Subject: waitpid for fuser to stop zombies
X-Git-Tag: v22.15~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b655f1ec99b86de0336bdabdaaf425e1570c88a;p=psmisc

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.
---

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;