diff options
| author | Colin Cross <ccross@android.com> | 2012-07-23 14:16:20 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-07-23 14:16:21 -0700 |
| commit | ec7d9dc713322bd41b1e348c0ea3b1304a13dba9 (patch) | |
| tree | 24720e96c815f559897db50825eebab8844b76ae | |
| parent | f694ba5f7fa81f250045c107e919888661a734ae (diff) | |
| parent | 5a536efa5b5f5d973232846d5fe6818df84ab5dc (diff) | |
| download | system_core-ec7d9dc713322bd41b1e348c0ea3b1304a13dba9.zip system_core-ec7d9dc713322bd41b1e348c0ea3b1304a13dba9.tar.gz system_core-ec7d9dc713322bd41b1e348c0ea3b1304a13dba9.tar.bz2 | |
Merge "Avoid zombies on androidscreencast"
| -rw-r--r-- | adb/framebuffer_service.c | 5 |
1 files changed, 5 insertions, 0 deletions
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 @@ void framebuffer_service(int fd, void *cookie) 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); |