rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #31557 - retep998:house-directory, r=alexcrichton

Browse Source 
This is the simple solution. I know @nodakai was working on a more complex solution that overhauled the `fill_utf16_buf` stuff.

r? @alexcrichton
This commit is contained in:
bors
2016-02-13 06:47:29 +00:00
parent 97842f54c9 dc97023e31
commit a94642c6f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/sys/windows/os.rs
View File

@@ -338,9 +338,9 @@ pub fn home_dir() -> Option<PathBuf> {
let _handle = Handle::new(token); let _handle = Handle::new(token);
super::fill_utf16_buf(|buf, mut sz| { super::fill_utf16_buf(|buf, mut sz| {
match c::GetUserProfileDirectoryW(token, buf, &mut sz) { match c::GetUserProfileDirectoryW(token, buf, &mut sz) {
0 if c::GetLastError() != 0 => 0, 0 if c::GetLastError() != c::ERROR_INSUFFICIENT_BUFFER => 0,
0 => sz, 0 => sz,
n => n as c::DWORD, _ => sz - 1, // sz includes the null terminator
} }
}, super::os2path).ok() }, super::os2path).ok()
}) })