h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-02 22:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up and correct O_SEARCH definitions

Browse Source 
Correct the FreeBSD constant and simplify some of the cfg() logic.
This commit is contained in:
ridiculousfish
2024-04-29 12:08:44 -07:00
parent 4606b02d44
commit 172fb22692
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fds.rs
View File

@@ -267,18 +267,23 @@ pub fn open_cloexec(path: &CStr, flags: OFlag, mode: nix::sys::stat::Mode) -> ni
mod o_search { mod o_search {
use super::OFlag; use super::OFlag;
/// On FreeBSD or MacOS we have O_SEARCH. /// On macOS we have O_SEARCH, which is defined as O_EXEC | O_DIRECTORY,
#[cfg(any(target_os = "freebsd", target_os = "macos"))] /// where O_EXEC is 0x40000000. This is only on macOS 12.0+ or later; however
pub const BEST_O_SEARCH: OFlag = unsafe { OFlag::from_bits_unchecked(libc::O_SEARCH) }; /// prior macOS versions ignores O_EXEC so it is treated the same as O_RDONLY.
#[cfg(target_os = "macos")]
pub const BEST_O_SEARCH: OFlag =
unsafe { OFlag::from_bits_unchecked(libc::O_DIRECTORY | 0x40000000) };
/// On FreeBSD, we have O_SEARCH = 0x00040000.
#[cfg(target_os = "freebsd")]
pub const BEST_O_SEARCH: OFlag = unsafe { OFlag::from_bits_unchecked(0x00040000) };
/// On Linux we can use O_PATH, it has nearly the same semantics. we can use the fd for openat / fchdir, with only requiring /// On Linux we can use O_PATH, it has nearly the same semantics. we can use the fd for openat / fchdir, with only requiring
/// x permission on the directory. /// x permission on the directory.
#[cfg(all( #[cfg(any(target_os = "linux", target_os = "android"))]
not(any(target_os = "macos", target_os = "freebsd")),
any(target_os = "linux", target_os = "android")
))]
pub const BEST_O_SEARCH: OFlag = unsafe { OFlag::from_bits_unchecked(libc::O_PATH) }; pub const BEST_O_SEARCH: OFlag = unsafe { OFlag::from_bits_unchecked(libc::O_PATH) };
/// Fall back to O_RDONLY, this is what fish did before. /// Fall back to O_RDONLY.
#[cfg(not(any( #[cfg(not(any(
target_os = "linux", target_os = "linux",
target_os = "android", target_os = "android",