Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c933da92 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "macOS build fix: no SOCK_CLOEXEC on darwin." am: 8fbb0d8d

Change-Id: Ia6e3030492ce8d017c58a4d6f77a1496fab92343
parents 4644ebeb 8fbb0d8d
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -122,7 +122,16 @@ AdbConnectionClientContext* adbconnection_client_new(
    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;