glibc wrapper only available on recent glibc releases

nix-rust · Oct 23, 2024 · 4c1f57d · 4c1f57d
1 parent dc3b011
commit 4c1f57d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/unistd.rs b/src/unistd.rs
@@ -4024,7 +4024,14 @@ pub fn close_range<F: std::os::fd::AsFd>(fdbegin: F, fdlast: F, flags: CloseRang
 
     let raw = unsafe {
         Errno::clear();
-        libc::close_range(fdbegin.as_fd().as_raw_fd() as u32, fdlast.as_fd().as_raw_fd() as u32, flags.bits() as i32)
+
+        cfg_if! {
+            if #[cfg(all(target_os = "linux", target_env = "gnu"))] {
+                libc::syscall(libc::SYS_close_range, fdbegin.as_fd().as_raw_fd() as u32, fdlast.as_fd().as_raw_fd() as u32, flags.bits() as i32)
+            } else {
+                libc::close_range(fdbegin.as_fd().as_raw_fd() as u32, fdlast.as_fd().as_raw_fd() as u32, flags.bits() as i32)
+            }
+        }
     };
     if raw == -1 {
         if Errno::last_raw() == 0 {
@@ -4033,6 +4040,8 @@ pub fn close_range<F: std::os::fd::AsFd>(fdbegin: F, fdlast: F, flags: CloseRang
             Err(Errno::last())
         }
     } else {
+        #[cfg(all(target_os = "linux", target_env = "gnu", target_pointer_width = "64"))]
+        let raw = raw as i32;
         Ok(Some(raw))
     }
 

diff --git a/test/test_unistd.rs b/test/test_unistd.rs
@@ -1397,6 +1397,7 @@ fn test_group_from() {
     all(target_os = "linux", target_env = "gnu"),
     target_os = "freebsd"
 ))]
+#[cfg_attr(qemu, ignore)]
 fn test_close_range() {
     use tempfile::NamedTempFile;
     const CONTENTS: &[u8] = b"abcdef123456";