andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-21 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

openbsd: implement close_range workaround

Browse Source 
Since OpenBSD doesn't have close_range we have
to use close from and close the remaining
descriptors manually.
This commit is contained in:
Tobias Heider
2026-02-15 16:53:53 +00:00
committed by Ivan Molodetskikh
parent 8e3e93b624
commit 1fa0338a17
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/spawning.rs
+16 -3
View File
@@ -213,6 +213,8 @@ mod systemd {
pub fn do_spawn(command: &OsStr, mut process: Command) -> Option<Child> {
#[cfg(target_env = "gnu")]
use libc::close_range;
#[cfg(target_os = "openbsd")]
use libc::closefrom;
#[cfg(not(target_env = "gnu"))] // musl
pub fn close_range(first: libc::c_uint, last: libc::c_uint, flags: libc::c_uint) -> i64 {
@@ -295,9 +297,20 @@ mod systemd {
if let Some(pipe) = pipe_wait_read {
// We're going to exit afterwards. Close all other FDs to allow
// Command::spawn() to return in the parent process.
let raw = pipe.as_raw_fd() as u32;
let _ = close_range(0, raw - 1, 0);
let _ = close_range(raw + 1, !0, 0);
#[cfg(not(target_os = "openbsd"))]
{
let raw = pipe.as_raw_fd() as u32;
let _ = close_range(0, raw - 1, 0);
let _ = close_range(raw + 1, !0, 0);
}
#[cfg(target_os = "openbsd")]
{
let raw = pipe.as_raw_fd();
for fd in 0..raw {
close(fd);
}
closefrom(raw + 1);
}
let _ = read_all(pipe, &mut [0]);
}