Commiteb265d0

committed

std::unix::os::home_dir: fallback's optimisation.

we're using a guaranteed initialised field on success.

1 parenta48f3d6 commiteb265d0Copy full SHA for eb265d0

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -738,16 +738,17 @@ pub fn home_dir() -> Option<PathBuf> {`
`738`	`738`	`n => nasusize,`
`739`	`739`	`};`
`740`	`740`	`letmut buf =Vec::with_capacity(amt);`
`741`		`-letmutpasswd:libc::passwd = mem::zeroed();`
	`741`	`+letmutp = mem::MaybeUninit::<libc::passwd>::uninit();`
`742`	`742`	`letmut result = ptr::null_mut();`
`743`	`743`	`match libc::getpwuid_r(`
`744`	`744`	`libc::getuid(),`
`745`		`-&mut passwd,`
	`745`	`+p.as_mut_ptr(),`
`746`	`746`	`buf.as_mut_ptr(),`
`747`	`747`	`buf.capacity(),`
`748`	`748`	`&mut result,`
`749`	`749`	`){`
`750`	`750`	`0if !result.is_null() =>{`
	`751`	`+let passwd = p.assume_init();`
`751`	`752`	`let ptr = passwd.pw_diras*const_;`
`752`	`753`	`let bytes =CStr::from_ptr(ptr).to_bytes().to_vec();`
`753`	`754`	`Some(OsStringExt::from_vec(bytes))`

Comments

(0)