mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std::process (windows): refactor Stdio::to_handle slightly

Browse Source 
We're going to want to reuse this bit of code.
This commit is contained in:
Ian Jackson 2023-01-03 15:01:19 +00:00
parent fb7f1a8127
commit deda7d3301
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/sys/windows/process.rs
View File

@ -521,8 +521,7 @@ fn program_exists(path: &Path) -> Option<Vec<u16>> {
impl Stdio { impl Stdio {
fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Result<Handle> { fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Result<Handle> {
match *self { let use_stdio_id = |stdio_id| match stdio::get_handle(stdio_id) {
Stdio::Inherit => match stdio::get_handle(stdio_id) {
Ok(io) => unsafe { Ok(io) => unsafe {
let io = Handle::from_raw_handle(io); let io = Handle::from_raw_handle(io);
let ret = io.duplicate(0, true, c::DUPLICATE_SAME_ACCESS); let ret = io.duplicate(0, true, c::DUPLICATE_SAME_ACCESS);
@ -531,7 +530,9 @@ fn to_handle(&self, stdio_id: c::DWORD, pipe: &mut Option<AnonPipe>) -> io::Resu
}, },
// If no stdio handle is available, then propagate the null value. // If no stdio handle is available, then propagate the null value.
Err(..) => unsafe { Ok(Handle::from_raw_handle(ptr::null_mut())) }, Err(..) => unsafe { Ok(Handle::from_raw_handle(ptr::null_mut())) },
}, };
match *self {
Stdio::Inherit => use_stdio_id(stdio_id),
Stdio::MakePipe => { Stdio::MakePipe => {
let ours_readable = stdio_id != c::STD_INPUT_HANDLE; let ours_readable = stdio_id != c::STD_INPUT_HANDLE;