CHANGELOG entry

Author: devnexen

CHANGELOG.md

@@ -49,6 +49,9 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Added `Icmp` and `IcmpV6` to `SockProtocol`.
   (#[2103](https://github.com/nix-rust/nix/pull/2103))
 
+- Added `F_GETPATH` FcntlFlags entry on Apple/NetBSD/DragonflyBSD for `::nix::fcntl`.
+  ([#2142](https://github.com/nix-rust/nix/pull/2142))
+
 ## [0.27.1] - 2023-08-28
 
 ### Fixed

src/fcntl.rs

@@ -1,5 +1,12 @@
 use crate::errno::Errno;
 use libc::{self, c_int, c_uint, size_t, ssize_t};
+#[cfg(any(
+    target_os = "netbsd",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "dragonfly",
+))]
+use std::ffi::CStr;
 use std::ffi::OsString;
 #[cfg(not(target_os = "redox"))]
 use std::os::raw;
@@ -561,13 +568,11 @@ pub fn fcntl(fd: RawFd, arg: FcntlArg) -> Result<c_int> {
             #[cfg(any(target_os = "dragonfly", target_os = "netbsd", target_os = "macos", target_os = "ios"))]
             F_GETPATH(path) => {
                 let mut buffer = vec![0; libc::PATH_MAX as usize];
-                let res = libc::fcntl(fd, libc::F_GETPATH, buffer.as_ptr());
+                let res = libc::fcntl(fd, libc::F_GETPATH, buffer.as_mut_ptr());
                 let ok_res = Errno::result(res)?;
-                let len = buffer.iter().position(|b| *b == 0).unwrap();
-                buffer.truncate(len as usize);
-                buffer.shrink_to_fit();
-                *path = PathBuf::from(OsString::from_vec(buffer));
-                ok_res
+                let optr = CStr::from_bytes_until_nul(&buffer).unwrap();
+                *path = PathBuf::from(OsString::from(optr.to_str().unwrap()));
+                return Ok(ok_res)
             },
         }
     };

test/test_fcntl.rs

@@ -568,20 +568,19 @@ mod test_posix_fallocate {
     target_os = "macos",
     target_os = "ios"
 ))]
-mod test_apple_netbsd {
+#[test]
+fn test_f_get_path() {
     use nix::fcntl::*;
-    use std::os::unix::io::AsRawFd;
-    use std::path::PathBuf;
-    use tempfile::NamedTempFile;
-
-    #[test]
-    fn test_path() {
-        let tmp = NamedTempFile::new().unwrap();
-        let fd = tmp.as_raw_fd();
-        let mut path = PathBuf::new();
-        let res =
-            fcntl(fd, FcntlArg::F_GETPATH(&mut path)).expect("get path failed");
-        assert_ne!(res, -1);
-        assert_eq!(path, tmp.path());
-    }
+    use std::{os::unix::io::AsRawFd, path::PathBuf};
+
+    let tmp = NamedTempFile::new().unwrap();
+    let fd = tmp.as_raw_fd();
+    let mut path = PathBuf::new();
+    let res =
+        fcntl(fd, FcntlArg::F_GETPATH(&mut path)).expect("get path failed");
+    assert_ne!(res, -1);
+    assert_eq!(
+        path.as_path().canonicalize().unwrap(),
+        tmp.path().canonicalize().unwrap()
+    );
 }