Use libc's F_GETPATH

evilpie · evilpie · commit 4060b4e3cabe · 2024-12-27T12:55:46.000+01:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -50,13 +50,12 @@ impl FilePath for File {
     fn path(&self) -> io::Result<PathBuf> {
         use std::ffi::OsString;
         use std::os::unix::ffi::OsStringExt;
-        const F_GETPATH: i32 = 50;
 
         let fd = self.as_raw_fd();
         let mut path = vec![0; libc::PATH_MAX as usize + 1];
 
         unsafe {
-            if libc::fcntl(fd, F_GETPATH, path.as_mut_ptr()) < 0 {
+            if libc::fcntl(fd, libc::F_GETPATH, path.as_mut_ptr()) < 0 {
                 return Err(io::Error::last_os_error());
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -50,13 +50,12 @@ impl FilePath for File {`
`50`	`50`	`fn path(&self) -> io::Result<PathBuf> {`
`51`	`51`	`use std::ffi::OsString;`
`52`	`52`	`use std::os::unix::ffi::OsStringExt;`
`53`		`- const F_GETPATH: i32 = 50;`
`54`	`53`
`55`	`54`	`let fd = self.as_raw_fd();`
`56`	`55`	`let mut path = vec![0; libc::PATH_MAX as usize + 1];`
`57`	`56`
`58`	`57`	`unsafe {`
`59`		`- if libc::fcntl(fd, F_GETPATH, path.as_mut_ptr()) < 0 {`
	`58`	`+ if libc::fcntl(fd, libc::F_GETPATH, path.as_mut_ptr()) < 0 {`
`60`	`59`	`return Err(io::Error::last_os_error());`
`61`	`60`	`}`
`62`	`61`	`}`