Wait no more than three seconds for reap_all()

1 files changed, 11 insertions, 3 deletions

diff --git a/scan.c b/scan.c
index fc6f877..1fe04fa 100644
--- a/scan.c
+++ b/scan.c
@@ -217,10 +217,18 @@ scan_svcdir(int dir_fd)
 void
 reap_all()
 {
-	int r;
+	int r, m = 0;
 
 	for (;;) {
-		r = wait(NULL);
+		r = waitpid(-1, NULL, WNOHANG);
+
+		if (r == 0) {
+			m++;
+			if (m >= 3)
+				break;
+			sleep(1);
+		}
+
 		if (r != -1)
 			continue;
 
@@ -484,7 +492,7 @@ end:
 	reset_signals();
 
 	fprintf(stderr, "Waiting for children to exit\n");
-	reap_all(); /* XXX: Maybe remove this for shorter shutdown? */
+	reap_all();
 
 	return 0;
 }