Skip to content
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

Throw error in set_terminal_attr when started without a TTY on macOS #953

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Throw error in set_terminal_attr when started without a TTY on macOS #953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/terminal/sys/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,14 @@ fn get_terminal_attr(fd: impl AsFd) -> io::Result<Termios> {

#[cfg(not(feature = "libc"))]
fn set_terminal_attr(fd: impl AsFd, termios: &Termios) -> io::Result<()> {
// When stdin is not a tty, fd points to '/dev/tty', causing tcsetattr to hang on macOS.
if !rustix::termios::isatty(std::io::stdin()) {
return Err(io::Error::new(
io::ErrorKind::Other,
"Attempt to set terminal attributes with no terminal attached",
))
}

rustix::termios::tcsetattr(fd, rustix::termios::OptionalActions::Now, termios)?;
Ok(())
}
Expand Down