changes from review

Author: devnexen

src/fcntl.rs

@@ -6,6 +6,13 @@ use std::os::raw;
 use std::os::unix::ffi::OsStringExt;
 use std::os::unix::io::RawFd;
 // For splice and copy_file_range
+#[cfg(any(
+    target_os = "netbsd",
+    target_os = "macos",
+    target_os = "ios",
+    target_os = "dragonfly",
+))]
+use std::path::PathBuf;
 #[cfg(any(
     target_os = "android",
     target_os = "freebsd",
@@ -489,8 +496,8 @@ pub enum FcntlArg<'a> {
     F_GETPIPE_SZ,
     #[cfg(any(target_os = "linux", target_os = "android"))]
     F_SETPIPE_SZ(c_int),
-    #[cfg(any(target_os = "netbsd", target_os = "macos", target_os = "ios"))]
-    F_GETPATH(Vec<u8>),
+    #[cfg(any(target_os = "netbsd", target_os = "dragonfly", target_os = "macos", target_os = "ios"))]
+    F_GETPATH(&'a PathBuf),
     // TODO: Rest of flags
 }
 
@@ -553,8 +560,17 @@ pub fn fcntl(fd: RawFd, arg: FcntlArg) -> Result<c_int> {
             F_SETPIPE_SZ(size) => libc::fcntl(fd, libc::F_SETPIPE_SZ, size),
             #[cfg(any(target_os = "netbsd", target_os = "macos", target_os = "ios"))]
             F_GETPATH(path) => {
-                path.resize(libc::PATH_MAX);
-                libc::fcntl(fd, libc::F_GETPATH, path.as_ptr())
+                let mut buffer = vec![0; libc::PATH_MAX as usize];
+                let r = libc::fcntl(fd, libc::F_GETPATH, buffer.as_ptr());
+                if r < 0 {
+                    return Errno::result(r);
+                } else {
+                    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));
+                    return r;
+                }
             },
         }
     };

test/test_fcntl.rs

@@ -563,19 +563,24 @@ mod test_posix_fallocate {
 }
 
 #[test]
-#[cfg(any(target_os = "netbsd", target_os = "macos", target_os = "ios"))]
+#[cfg(any(
+    target_os = "dragonfly",
+    target_os = "netbsd",
+    target_os = "macos",
+    target_os = "ios"
+))]
 mod test_apple_netbsd {
     use nix::fcntl::*;
+    use std::path::Path;
     use tempfile::NamedTempFile;
 
     #[test]
     fn test_path() {
         let mut tmp = NamedTempFile::new().unwrap();
         let fd = tmp.as_raw_fd();
-        let mut path: Vec<u8> = Vec::new();
-        let res = fcntl(fd, FcntlArg::F_GETPATH(path)).expect("get path failed");
-        assert_eq!(
-            path.len() > 0
-        );
+        let mut path: PathBuf::new();
+        let res =
+            fcntl(fd, FcntlArg::F_GETPATH(path)).expect("get path failed");
+        assert_ne!(path.as_path(), Path::new(""));
     }
 }