commit ade67fc2ff79c398edebed0e37aeda4ab4c3905d
author Elliott Hughes <enh@google.com> Tue Feb 23 18:46:31 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Feb 23 18:46:31 2016 +0000
tree 72a995ef668b5fad4f6a8bcc872260494504cb13
parent 253ce3f4e0f0ae28f47db1d21d059a185e9f91f8
parent 64823a7bf8833891d7fec55f8742225f5ae907b2

Merge "Clean up CLOEXEC in SocketListener."
am: ed83cfba68

* commit 'ed83cfba68d51e5de3a50a1ca5d471fd7244a17a':
  Clean up CLOEXEC in SocketListener.

libsysutils/src/SocketListener.cpp

diff --git a/libsysutils/src/SocketListener.cpp b/libsysutils/src/SocketListener.cpp
index 168899c..4d602a6 100644
--- a/libsysutils/src/SocketListener.cpp
+++ b/libsysutils/src/SocketListener.cpp
@@ -206,7 +206,7 @@
 
             do {
                 alen = sizeof(ss);
-                c = accept(mSock, addrp, &alen);
+                c = accept4(mSock, addrp, &alen, SOCK_CLOEXEC);
                 SLOGV("%s got %d from accept", mSocketName, c);
             } while (c < 0 && errno == EINTR);
             if (c < 0) {
@@ -214,7 +214,6 @@
                 sleep(1);
                 continue;
             }
-            fcntl(c, F_SETFD, FD_CLOEXEC);
             pthread_mutex_lock(&mClientsLock);
             mClients->push_back(new SocketClient(c, true, mUseCmdNum));
             pthread_mutex_unlock(&mClientsLock);