commit c1db3bcba363992a8357d34f383a98e5500c0a79
author Maciej Żenczykowski <maze@google.com> Tue Nov 12 04:01:32 2019 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Nov 12 04:09:07 2019 -0800
tree 1840510a3839790b633d4aec779280c9d6e9c8eb
parent d78687ed63c2eb5bc51d5316c234949377ff30a7

fix 'adb shell'

fcntl uses FD_CLOEXEC not O_CLOEXEC

Test: adb shell now works on cuttlefish
Bug: 144313654
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5dbac5a46cbc9d24f8622076a3a553028ba648db

adb/sysdeps.h

diff --git a/adb/sysdeps.h b/adb/sysdeps.h
index 979413a..0c5a6b4 100644
--- a/adb/sysdeps.h
+++ b/adb/sysdeps.h
@@ -355,8 +355,8 @@
 
 static __inline__ void close_on_exec(borrowed_fd fd) {
     int flags = get_fd_flags(fd);
-    if (flags >= 0 && (flags & O_CLOEXEC) == 0) {
-        fcntl(fd.get(), F_SETFD, flags | O_CLOEXEC);
+    if (flags >= 0 && (flags & FD_CLOEXEC) == 0) {
+        fcntl(fd.get(), F_SETFD, flags | FD_CLOEXEC);
     }
 }