Skip to content

Expose mknodat/mkfifoat on Apple targets #1625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattsu2020 wants to merge 4 commits into
base: main
Choose a base branch
from
+28 −11
Open

Expose mknodat/mkfifoat on Apple targets #1625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
47efde4
feat: expose mknodat/mkfifoat on Apple targets with weak-linking
mattsu2020 May 16, 2026
0617d58
refactor: remove macOS ≤ 13 fallback for mknodat/mkfifoat
mattsu2020 May 16, 2026
cbd365c
fix: import Dev and FileType on Apple targets
mattsu2020 May 16, 2026
a7f609f
fix: weak-link Apple mknodat
mattsu2020 May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions src/backend/libc/fs/syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ use crate::fs::StatFs;
#[cfg(not(any(target_os = "espidf", target_os = "vita")))]
use crate::fs::Timestamps;
#[cfg(not(any(
apple,
target_os = "espidf",
target_os = "redox",
target_os = "vita",
Expand Down Expand Up @@ -1196,7 +1195,6 @@ pub(crate) fn chownat(
}

#[cfg(not(any(
apple,
target_os = "espidf",
target_os = "horizon",
target_os = "redox",
Expand All @@ -1210,13 +1208,30 @@ pub(crate) fn mknodat(
mode: Mode,
dev: Dev,
) -> io::Result<()> {
let mode = (mode.bits() | file_type.as_raw_mode()) as c::mode_t;
let dev = dev.try_into().map_err(|_e| io::Errno::PERM)?;

// Older Apple platforms lack `mknodat`.
#[cfg(apple)]
unsafe {
ret(c::mknodat(
borrowed_fd(dirfd),
c_str(path),
(mode.bits() | file_type.as_raw_mode()) as c::mode_t,
dev.try_into().map_err(|_e| io::Errno::PERM)?,
))
weak! {
fn mknodat(
c::c_int,
*const ffi::c_char,
c::mode_t,
c::dev_t
) -> c::c_int
}
// If we have `mknodat`, use it.
if let Some(libc_mknodat) = mknodat.get() {
return ret(libc_mknodat(borrowed_fd(dirfd), c_str(path), mode, dev));
}
Err(io::Errno::NOSYS)
Comment on lines +1225 to +1229
Copy link
Copy Markdown
Contributor

@xtqqczze xtqqczze May 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// If we have `mknodat`, use it.
if let Some(libc_mknodat) = mknodat.get() {
return ret(libc_mknodat(borrowed_fd(dirfd), c_str(path), mode, dev));
}
Err(io::Errno::NOSYS)
let libc_mknodat = mknodat.get().ok_or(io::Errno::NOSYS)?;
ret(libc_mknodat(borrowed_fd(dirfd), c_str(path), mode, dev))

}

#[cfg(not(apple))]
unsafe {
ret(c::mknodat(borrowed_fd(dirfd), c_str(path), mode, dev))
}
}

Expand Down
8 changes: 5 additions & 3 deletions src/fs/at.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ use crate::fs::CloneFlags;
use crate::fs::RenameFlags;
#[cfg(not(target_os = "espidf"))]
use crate::fs::Stat;
#[cfg(not(any(apple, target_os = "espidf", target_os = "vita", target_os = "wasi")))]
#[cfg(not(any(target_os = "espidf", target_os = "vita", target_os = "wasi")))]
use crate::fs::{Dev, FileType};
#[cfg(not(any(target_os = "espidf", target_os = "wasi")))]
use crate::fs::{Gid, Uid};
Expand Down Expand Up @@ -460,11 +460,12 @@ pub fn fclonefileat<Fd: AsFd, DstFd: AsFd, P: path::Arg>(
/// # References
/// - [POSIX]
/// - [Linux]
/// - [Apple]
///
/// [POSIX]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/mknodat.html
/// [Linux]: https://man7.org/linux/man-pages/man2/mknodat.2.html
/// [Apple]: https://github.com/apple-oss-distributions/xnu/blob/main/bsd/man/man2/mknodat.2
#[cfg(not(any(
apple,
target_os = "espidf",
target_os = "horizon",
target_os = "vita",
Expand All @@ -488,10 +489,11 @@ pub fn mknodat<P: path::Arg, Fd: AsFd>(
///
/// # References
/// - [POSIX]
/// - [Apple]
///
/// [POSIX]: https://pubs.opengroup.org/onlinepubs/9799919799/functions/mkfifoat.html
/// [Apple]: https://github.com/apple-oss-distributions/xnu/blob/main/bsd/man/man2/mkfifoat.2
#[cfg(not(any(
apple,
target_os = "espidf",
target_os = "horizon",
target_os = "vita",
Expand Down
Loading