commit 925b410c7f65f88f9483c68bfbdec64c31b92570
author Josh Gao <jmgao@google.com> Thu May 24 17:34:41 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 24 17:34:41 2018 +0000
tree 5cbf61d3d7bfc242d4afa564b89464d9a4eaaaa0
parent 05063a8715fd3483abcdd842eebff744582673d9
parent 99c27d3e99cb9524b63f02c3c4b1204daa5929d9

Merge "adb: fix mac build."

adb/adb_unique_fd.h

diff --git a/adb/adb_unique_fd.h b/adb/adb_unique_fd.h
index 7d2354d..d1dc9d1 100644
--- a/adb/adb_unique_fd.h
+++ b/adb/adb_unique_fd.h
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include <errno.h>
 #include <unistd.h>
 
 #include <android-base/unique_fd.h>
@@ -48,14 +49,18 @@
     if (flags & O_CLOEXEC) {
         if (fcntl(pipefd[0], F_SETFD, FD_CLOEXEC) != 0 ||
             fcntl(pipefd[1], F_SETFD, FD_CLOEXEC) != 0) {
-            PLOG(FATAL) << "failed to set FD_CLOEXEC on newly created pipe";
+            close(pipefd[0]);
+            close(pipefd[1]);
+            return false;
         }
     }
 
     if (flags & O_NONBLOCK) {
         if (fcntl(pipefd[0], F_SETFL, O_NONBLOCK) != 0 ||
             fcntl(pipefd[1], F_SETFL, O_NONBLOCK) != 0) {
-            PLOG(FATAL) << "failed to set O_NONBLOCK  on newly created pipe";
+            close(pipefd[0]);
+            close(pipefd[1]);
+            return false;
         }
     }
 #endif