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

Commit cbe30fb9 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

macOS build fix: no SOCK_CLOEXEC on darwin. 

We can't use the sysdeps.h copy of this code, so for now add yet
another copy & paste. We should come up with something better in
libbase, but let's get the macOS build fixed first.

Test: builds on mac
Change-Id: Ifb059990d7091f3d91b54e684f4ee14afe69c28b
parent 00c2625f

adb/libs/adbconnection/adbconnection_client.cpp

+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;