util/unix: avoid fdopendir/closedir on O_PATH fd

1 files changed, 10 insertions, 5 deletions

diff --git a/src/util/unix.rs b/src/util/unix.rs
index ee0507c..b5e4d33 100644
--- a/src/util/unix.rs
+++ b/src/util/unix.rs
@@ -1,6 +1,10 @@
-use std::{fs::File, io::Result, os::unix::prelude::AsRawFd, path::Path};
+use std::{fs::File, io::Result, os::unix::prelude::*, path::Path};
 
-use nix::{dir::Dir, fcntl::OFlag, sys::stat::Mode, unistd};
+use nix::{
+	fcntl::{self, OFlag},
+	sys::stat::Mode,
+	unistd,
+};
 
 use super::ToIOResult;
 
@@ -43,7 +47,7 @@ pub fn create_as<P: AsRef<Path>>(
 	File::create(path)
 }
 
-pub struct Chdir(Dir);
+pub struct Chdir(File);
 
 impl Drop for Chdir {
 	fn drop(&mut self) {
@@ -52,14 +56,15 @@ impl Drop for Chdir {
 }
 
 pub fn chdir<P: AsRef<Path>>(path: P) -> Result<Chdir> {
-	let dir = Dir::open(
+	let fd = fcntl::open(
 		".",
 		OFlag::O_PATH | OFlag::O_CLOEXEC | OFlag::O_NOFOLLOW,
 		Mode::empty(),
 	)
 	.to_io_result()?;
+	let file = unsafe { File::from_raw_fd(fd) };
 
 	unistd::chdir(path.as_ref()).to_io_result()?;
 
-	Ok(Chdir(dir))
+	Ok(Chdir(file))
 }