1
Fork 0

rustbuild: Don't leak file handles when creating junctions on Windows

This fixes building the compiler docs because stage1-rustc\x86_64-pc-windows-msvc\doc is used twice which
doesn't work if we still have a handle from the first time.
This commit is contained in:
Oliver Middleton 2018-03-28 22:43:23 +01:00
parent d87c19db6d
commit 77c70a8c47

View file

@ -288,6 +288,7 @@ pub fn symlink_dir(src: &Path, dest: &Path) -> io::Result<()> {
nOutBufferSize: DWORD, nOutBufferSize: DWORD,
lpBytesReturned: LPDWORD, lpBytesReturned: LPDWORD,
lpOverlapped: LPOVERLAPPED) -> BOOL; lpOverlapped: LPOVERLAPPED) -> BOOL;
fn CloseHandle(hObject: HANDLE) -> BOOL;
} }
fn to_u16s<S: AsRef<OsStr>>(s: S) -> io::Result<Vec<u16>> { fn to_u16s<S: AsRef<OsStr>>(s: S) -> io::Result<Vec<u16>> {
@ -341,11 +342,13 @@ pub fn symlink_dir(src: &Path, dest: &Path) -> io::Result<()> {
&mut ret, &mut ret,
ptr::null_mut()); ptr::null_mut());
if res == 0 { let out = if res == 0 {
Err(io::Error::last_os_error()) Err(io::Error::last_os_error())
} else { } else {
Ok(()) Ok(())
} };
CloseHandle(h);
out
} }
} }
} }