commit f1ae4a4bb2745d65d006392212599b8b8f146820
author Elliott Hughes <enh@google.com> Sat Jul 18 10:47:59 2015 -0700
committer Elliott Hughes <enh@google.com> Sat Jul 18 10:47:59 2015 -0700
tree 98b61a37e4e07d2194d20cf3b639348fc2e35384
parent 4589f4fa210549b77bb91037147ad795944c8ad3

Fix the Mac libcutils build.

The stupid Mac doesn't have SOCK_NONBLOCK.

Bug: http://b/22559299
Change-Id: I476dadd0ba0076f5e61a4cd9b1f39cf3508f4188

libcutils/socket_network_client.c

diff --git a/libcutils/socket_network_client.c b/libcutils/socket_network_client.c
index e9cf362..2610254 100644
--- a/libcutils/socket_network_client.c
+++ b/libcutils/socket_network_client.c
@@ -29,17 +29,12 @@
 
 #include <cutils/sockets.h>
 
-static int fix_O_NONBLOCK(int s, int type) {
-    // If the caller actually wanted a non-blocking socket, fine.
-    if ((type & SOCK_NONBLOCK)) return s;
-
-    // Otherwise clear the O_NONBLOCK flag.
+static int toggle_O_NONBLOCK(int s) {
     int flags = fcntl(s, F_GETFL);
-    if (flags == -1 || fcntl(s, F_SETFL, flags & ~O_NONBLOCK) == -1) {
+    if (flags == -1 || fcntl(s, F_SETFL, flags ^ O_NONBLOCK) == -1) {
         close(s);
         return -1;
     }
-
     return s;
 }
 
@@ -69,12 +64,13 @@
 
     freeaddrinfo(addrs);
 
-    int s = socket(family, type | SOCK_NONBLOCK, protocol);
-    if (s == -1) return -1;
+    // The Mac doesn't have SOCK_NONBLOCK.
+    int s = socket(family, type, protocol);
+    if (s == -1 || toggle_O_NONBLOCK(s) == -1) return -1;
 
     int rc = connect(s, (const struct sockaddr*) &addr, addr_len);
     if (rc == 0) {
-        return fix_O_NONBLOCK(s, type);
+        return toggle_O_NONBLOCK(s);
     } else if (rc == -1 && errno != EINPROGRESS) {
         close(s);
         return -1;
@@ -116,7 +112,7 @@
         return -1;
     }
 
-    return fix_O_NONBLOCK(s, type);
+    return toggle_O_NONBLOCK(s);
 }
 
 int socket_network_client(const char* host, int port, int type) {