commit 9630ca7dcefc9abfe456186758c1b91c43b1a3ff
author Colin Cross <ccross@android.com> Mon Jul 23 19:52:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 23 19:52:34 2012 -0700
tree 8c84021bc449c54a8e1e98ee07c1f17e6262e30a
parent 22bb8fc5fe7c10fb9c7b8c4cfeb244c837e3e0c7
parent d47255175ede1af31aee9132914e5d14549ba577

am d4725517: am ec7d9dc7: Merge "Avoid zombies on androidscreencast"

* commit 'd47255175ede1af31aee9132914e5d14549ba577':
  Avoid zombies on androidscreencast

adb/framebuffer_service.c

diff --git a/adb/framebuffer_service.c b/adb/framebuffer_service.c
index 862dd91..20c08d2 100644
--- a/adb/framebuffer_service.c
+++ b/adb/framebuffer_service.c
@@ -19,6 +19,9 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include "fdevent.h"
 #include "adb.h"
@@ -169,6 +172,8 @@
     if(writex(fd, buf, fbinfo.size % sizeof(buf))) goto done;
 
 done:
+    TEMP_FAILURE_RETRY(waitpid(pid, NULL, 0));
+
     close(fds[0]);
     close(fds[1]);
     close(fd);