squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #84712 - joshtriplett:simplify-chdir, r=yaahc

Browse source 
Simplify chdir implementation and minimize unsafe block
This commit is contained in:
Dylan DPC 2021-05-06 13:30:55 +02:00 committed by GitHub
parent 6a6c644016 8a2e67e0d0
commit 2ed0134cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/std/src/sys/unix/os.rs
View file

@ -155,12 +155,10 @@ pub fn getcwd() -> io::Result<PathBuf> {
pub fn chdir(p: &path::Path) -> io::Result<()> { pub fn chdir(p: &path::Path) -> io::Result<()> {
let p: &OsStr = p.as_ref(); let p: &OsStr = p.as_ref();
let p = CString::new(p.as_bytes())?; let p = CString::new(p.as_bytes())?;
unsafe { if unsafe { libc::chdir(p.as_ptr()) } != 0 {
match libc::chdir(p.as_ptr()) == (0 as c_int) { return Err(io::Error::last_os_error());
true => Ok(()),
false => Err(io::Error::last_os_error()),
}
} }
Ok(())
} }
pub struct SplitPaths<'a> { pub struct SplitPaths<'a> {