commit 8fbb0d8de0af7c6c730050b96ae1fddb9f280828
author Treehugger Robot <treehugger-gerrit@google.com> Wed Apr 15 23:38:53 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Apr 15 23:38:53 2020 +0000
tree d5f08fb926159bbf92e50b464542eb44f60603ca
parent a010dd7b50e6374f3fef2b7862fb1182056886a8
parent cbe30fb952fb35df815e97b5397eb3f912866ad4

Merge "macOS build fix: no SOCK_CLOEXEC on darwin."

adb/libs/adbconnection/adbconnection_client.cpp

diff --git a/adb/libs/adbconnection/adbconnection_client.cpp b/adb/libs/adbconnection/adbconnection_client.cpp
index c132342..b569421 100644
--- a/adb/libs/adbconnection/adbconnection_client.cpp
+++ b/adb/libs/adbconnection/adbconnection_client.cpp
@@ -122,7 +122,16 @@
     return nullptr;
   }
 
+#if defined(__APPLE__)
+  ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET, 0));
+  // TODO: find a better home for all these copies of the mac CLOEXEC workaround.
+  if (int fd = ctx->control_socket_.get(), flags = fcntl(fd, F_GETFD);
+      flags != -1 && (flags & FD_CLOEXEC) == 0) {
+    fcntl(fd, F_SETFD, flags | FD_CLOEXEC);
+  }
+#else
   ctx->control_socket_.reset(socket(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0));
+#endif
   if (ctx->control_socket_ < 0) {
     PLOG(ERROR) << "failed to create Unix domain socket";
     return nullptr;