From 095d821240bda94fa7fdd6fe4426deee06278157 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 25 Sep 2022 16:35:28 -0700
Subject: [PATCH] Don't use xopen in readlink

---
 native/src/base/files.rs | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/native/src/base/files.rs b/native/src/base/files.rs
index 8f79f86c5..df820655a 100644
--- a/native/src/base/files.rs
+++ b/native/src/base/files.rs
@@ -1,7 +1,7 @@
 use std::ffi::CStr;
 use std::os::unix::io::{AsRawFd, FromRawFd, OwnedFd, RawFd};
 
-use libc::{c_char, mode_t, EEXIST, ENOENT, O_CLOEXEC, O_PATH};
+use libc::{c_char, c_uint, mode_t, EEXIST, ENOENT, O_CLOEXEC, O_PATH};
 
 use crate::{bfmt_cstr, errno, xopen};
 
@@ -27,6 +27,17 @@ pub mod unsafe_impl {
     }
 }
 
+pub fn __open_fd_impl(path: &CStr, flags: i32, mode: mode_t) -> Option<OwnedFd> {
+    unsafe {
+        let fd = libc::open(path.as_ptr(), flags, mode as c_uint);
+        if fd >= 0 {
+            Some(OwnedFd::from_raw_fd(fd))
+        } else {
+            None
+        }
+    }
+}
+
 pub fn __xopen_fd_impl(path: &CStr, flags: i32, mode: mode_t) -> Option<OwnedFd> {
     let fd = xopen(path.as_ptr(), flags, mode);
     if fd >= 0 {
@@ -36,6 +47,16 @@ pub fn __xopen_fd_impl(path: &CStr, flags: i32, mode: mode_t) -> Option<OwnedFd>
     }
 }
 
+#[macro_export]
+macro_rules! open_fd {
+    ($path:expr, $flags:expr) => {
+        crate::__open_fd_impl($path, $flags, 0)
+    };
+    ($path:expr, $flags:expr, $mode:expr) => {
+        crate::__open_fd_impl($path, $flags, $mode)
+    };
+}
+
 #[macro_export]
 macro_rules! xopen_fd {
     ($path:expr, $flags:expr) => {
@@ -58,7 +79,7 @@ pub fn fd_path(fd: RawFd, buf: &mut [u8]) -> isize {
 
 // Inspired by https://android.googlesource.com/platform/bionic/+/master/libc/bionic/realpath.cpp
 pub fn realpath(path: &CStr, buf: &mut [u8]) -> isize {
-    if let Some(fd) = xopen_fd!(path, O_PATH | O_CLOEXEC) {
+    if let Some(fd) = open_fd!(path, O_PATH | O_CLOEXEC) {
         let mut st1: libc::stat;
         let mut st2: libc::stat;
         unsafe {