Skip to content

fix(unix): retry EINTR in poll/select/read #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jh-block wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(unix): retry EINTR in poll/select/read #286

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e3e277
fix(unix): retry EINTR in poll/select/read
jh-block May 5, 2026
e08b569
Collapse nested if into match guard in read_secure
jh-block May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 42 additions & 25 deletions src/unix_term.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,21 +157,25 @@ fn poll_fd(fd: RawFd, timeout: i32) -> io::Result<bool> {
events: libc::POLLIN,
revents: 0,
};
let ret = unsafe { libc::poll(&mut pollfd as *mut _, 1, timeout) };
if ret < 0 {
Err(io::Error::last_os_error())
} else {
Ok(pollfd.revents & libc::POLLIN != 0)
loop {
let ret = unsafe { libc::poll(&mut pollfd as *mut _, 1, timeout) };
if ret < 0 {
let err = io::Error::last_os_error();
if err.kind() == io::ErrorKind::Interrupted {
continue;
}
break Err(err);
Comment on lines +164 to +167
Copy link
Copy Markdown
Member

@djc djc May 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: suggest writing this as

match err.kind() {
    io::ErrorKind::Interrupted => continue,
    _ => break Err(err),
}

}
break Ok(pollfd.revents & libc::POLLIN != 0);
}
}

#[cfg(target_os = "macos")]
fn select_fd(fd: RawFd, timeout: i32) -> io::Result<bool> {
unsafe {
let mut read_fd_set: libc::fd_set = mem::zeroed();

loop {
let mut read_fd_set: libc::fd_set = unsafe { mem::zeroed() };
let mut timeout_val;
let timeout = if timeout < 0 {
let timeout_ptr: *mut libc::timeval = if timeout < 0 {
ptr::null_mut()
} else {
timeout_val = libc::timeval {
Expand All @@ -181,20 +185,25 @@ fn select_fd(fd: RawFd, timeout: i32) -> io::Result<bool> {
&mut timeout_val
};

libc::FD_ZERO(&mut read_fd_set);
libc::FD_SET(fd, &mut read_fd_set);
let ret = libc::select(
fd + 1,
&mut read_fd_set,
ptr::null_mut(),
ptr::null_mut(),
timeout,
);
let ret = unsafe {
libc::FD_ZERO(&mut read_fd_set);
libc::FD_SET(fd, &mut read_fd_set);
libc::select(
fd + 1,
&mut read_fd_set,
ptr::null_mut(),
ptr::null_mut(),
timeout_ptr,
)
};
if ret < 0 {
Err(io::Error::last_os_error())
} else {
Ok(libc::FD_ISSET(fd, &read_fd_set))
let err = io::Error::last_os_error();
if err.kind() == io::ErrorKind::Interrupted {
continue;
}
break Err(err);
Comment on lines +201 to +204
Copy link
Copy Markdown
Member

@djc djc May 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

}
break Ok(unsafe { libc::FD_ISSET(fd, &read_fd_set) });
}
}

Expand Down Expand Up @@ -231,10 +240,18 @@ fn read_single_char(fd: RawFd) -> io::Result<Option<char>> {
// If successful, return the number of bytes read.
// Will return an error if nothing was read, i.e when called at end of file.
fn read_bytes(fd: RawFd, buf: &mut [u8], count: u8) -> io::Result<u8> {
let read = unsafe { libc::read(fd, buf.as_mut_ptr() as *mut _, count as usize) };
if read < 0 {
Err(io::Error::last_os_error())
} else if read == 0 {
let read = loop {
let n = unsafe { libc::read(fd, buf.as_mut_ptr() as *mut _, count as usize) };
if n < 0 {
let err = io::Error::last_os_error();
if err.kind() == io::ErrorKind::Interrupted {
continue;
}
return Err(err);
}
break n;
};
if read == 0 {
Err(io::Error::new(
io::ErrorKind::UnexpectedEof,
"Reached end of file",
Expand Down