OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #36048 - GuillaumeGomez:code_clean, r=brson 

Clean code a bit
This commit is contained in:
bors 2016-09-08 07:20:51 -07:00 committed by GitHub
parent 0b02ae02bb 286ae72fb7
commit c615b21533
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libstd/sys/unix/os.rs
View File

@ -584,18 +584,15 @@ pub fn home_dir() -> Option<PathBuf> {
n if n < 0 => 512 as usize,
n => n as usize,
};
let me = libc::getuid();
loop {
let mut buf = Vec::with_capacity(amt);
let mut passwd: libc::passwd = mem::zeroed();
let mut buf = Vec::with_capacity(amt);
let mut passwd: libc::passwd = mem::zeroed();
if getpwduid_r(me, &mut passwd, &mut buf).is_some() {
let ptr = passwd.pw_dir as *const _;
let bytes = CStr::from_ptr(ptr).to_bytes().to_vec();
return Some(OsStringExt::from_vec(bytes))
} else {
return None;
}
if getpwduid_r(libc::getuid(), &mut passwd, &mut buf).is_some() {
let ptr = passwd.pw_dir as *const _;
let bytes = CStr::from_ptr(ptr).to_bytes().to_vec();
Some(OsStringExt::from_vec(bytes))
} else {
None
}
}
}