wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-08-17 10:10:23 +03:00
Code Issues Projects Releases Wiki Activity

filedescriptor: use winsock send/recv and respect non-blocking mode

Browse Source
This commit is contained in:
Wez Furlong 2020-01-15 22:55:36 -08:00
parent 08b0017c16
commit 8f1878c92c
2 changed files with 67 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
filedescriptor/Cargo.toml
View File

@ -1,6 +1,6 @@
[package]
name = "filedescriptor"
version = "0.7.0"
version = "0.7.1"
authors = ["Wez Furlong"]
edition = "2018"
repository = "https://github.com/wez/wzsh"

97
filedescriptor/src/windows.rs
View File

@ -19,8 +19,8 @@ use winapi::um::processthreadsapi::*;
use winapi::um::winbase::{FILE_TYPE_CHAR, FILE_TYPE_DISK, FILE_TYPE_PIPE};
use winapi::um::winnt::HANDLE;
use winapi::um::winsock2::{
accept, bind, closesocket, connect, getsockname, htonl, ioctlsocket, listen, WSAPoll,
WSASocketW, WSAStartup, INVALID_SOCKET, SOCKET, SOCK_STREAM, WSADATA,
accept, bind, closesocket, connect, getsockname, htonl, ioctlsocket, listen, recv, send,
WSAPoll, WSASocketW, WSAStartup, INVALID_SOCKET, SOCKET, SOCK_STREAM, WSADATA,
WSA_FLAG_NO_HANDLE_INHERIT,
};
pub use winapi::um::winsock2::{POLLERR, POLLHUP, POLLIN, POLLOUT, WSAPOLLFD as pollfd};
@ -285,45 +285,80 @@ impl FromRawSocket for FileDescriptor {
impl io::Read for FileDescriptor {
fn read(&mut self, buf: &mut [u8]) -> Result<usize, io::Error> {
let mut num_read = 0;
let ok = unsafe {
ReadFile(
self.handle.as_raw_handle() as *mut _,
buf.as_mut_ptr() as *mut _,
buf.len() as u32,
&mut num_read,
ptr::null_mut(),
)
};
if ok == 0 {
let err = IoError::last_os_error();
if err.kind() == std::io::ErrorKind::BrokenPipe {
Ok(0)
if self.handle.is_socket_handle() {
// It's important to use the winsock functions to read/write
// even though ReadFile and WriteFile technically work; only
// the winsock functions respect non-blocking mode.
let num_read = unsafe {
recv(
self.as_socket_descriptor(),
buf.as_mut_ptr() as *mut _,
buf.len() as _,
0,
)
};
if num_read < 0 {
Err(IoError::last_os_error())
} else {
Err(err)
Ok(num_read as usize)
}
} else {
Ok(num_read as usize)
let mut num_read = 0;
let ok = unsafe {
ReadFile(
self.handle.as_raw_handle() as *mut _,
buf.as_mut_ptr() as *mut _,
buf.len() as _,
&mut num_read,
ptr::null_mut(),
)
};
if ok == 0 {
let err = IoError::last_os_error();
if err.kind() == std::io::ErrorKind::BrokenPipe {
Ok(0)
} else {
Err(err)
}
} else {
Ok(num_read as usize)
}
}
}
}
impl io::Write for FileDescriptor {
fn write(&mut self, buf: &[u8]) -> Result<usize, io::Error> {
let mut num_wrote = 0;
let ok = unsafe {
WriteFile(
self.handle.as_raw_handle() as *mut _,
buf.as_ptr() as *const _,
buf.len() as u32,
&mut num_wrote,
ptr::null_mut(),
)
};
if ok == 0 {
Err(IoError::last_os_error())
if self.handle.is_socket_handle() {
let num_wrote = unsafe {
send(
self.as_socket_descriptor(),
buf.as_ptr() as *const _,
buf.len() as _,
0,
)
};
if num_wrote < 0 {
Err(IoError::last_os_error())
} else {
Ok(num_wrote as usize)
}
} else {
Ok(num_wrote as usize)
let mut num_wrote = 0;
let ok = unsafe {
WriteFile(
self.handle.as_raw_handle() as *mut _,
buf.as_ptr() as *const _,
buf.len() as u32,
&mut num_wrote,
ptr::null_mut(),
)
};
if ok == 0 {
Err(IoError::last_os_error())
} else {
Ok(num_wrote as usize)
}
}
}
fn flush(&mut self) -> Result<(), io::Error> {