summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao2018-05-22 15:32:33 -0500
committerJosh Gao2018-05-22 16:55:36 -0500
commit948b3e1068470cda390566452ccbaeb526a56e4e (patch)
treeeea2df628bc8f19745a999a6f337fce4cf3b602c
parent3b37fa256f00abc6a6414984cabbb3dd9e0a0ad1 (diff)
downloadplatform-system-core-948b3e1068470cda390566452ccbaeb526a56e4e.tar.gz
platform-system-core-948b3e1068470cda390566452ccbaeb526a56e4e.tar.xz
platform-system-core-948b3e1068470cda390566452ccbaeb526a56e4e.zip
adb: add support for O_CLOEXEC to unique_fd pipe wrapper.
Change-Id: I8fd22fe55db4d3dbcbb7318cf4a364eb07323ed0
-rw-r--r--adb/adb_unique_fd.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/adb/adb_unique_fd.h b/adb/adb_unique_fd.h
index 9c02cbeec..0dd86872d 100644
--- a/adb/adb_unique_fd.h
+++ b/adb/adb_unique_fd.h
@@ -28,9 +28,9 @@ struct AdbCloser {
28using unique_fd = android::base::unique_fd_impl<AdbCloser>; 28using unique_fd = android::base::unique_fd_impl<AdbCloser>;
29 29
30#if !defined(_WIN32) 30#if !defined(_WIN32)
31inline bool Pipe(unique_fd* read, unique_fd* write) { 31inline bool Pipe(unique_fd* read, unique_fd* write, int flags = 0) {
32 int pipefd[2]; 32 int pipefd[2];
33 if (pipe(pipefd) != 0) { 33 if (pipe2(pipefd, flags) != 0) {
34 return false; 34 return false;
35 } 35 }
36 read->reset(pipefd[0]); 36 read->reset(pipefd[0]);