Skip to content

Avoid panic in stty #8559

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

Merged
cakebaker merged 1 commit into from
Sep 6, 2025
Merged

Avoid panic in stty #8559

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
9 changes: 4 additions & 5 deletions src/uu/stty/src/stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ fn stty(opts: &Options) -> UResult<()> {
}

// TODO: Figure out the right error message for when tcgetattr fails
let mut termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes");
let mut termios = tcgetattr(opts.file.as_fd())?;

// iterate over valid_args, match on the arg type, do the matching apply function
for arg in &valid_args {
Expand All @@ -419,12 +419,11 @@ fn stty(opts: &Options) -> UResult<()> {
}
}
}
tcsetattr(opts.file.as_fd(), set_arg, &termios)
.expect("Could not write terminal attributes");
tcsetattr(opts.file.as_fd(), set_arg, &termios)?;
} else {
// TODO: Figure out the right error message for when tcgetattr fails
let termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes");
print_settings(&termios, opts).expect("TODO: make proper error here from nix error");
let termios = tcgetattr(opts.file.as_fd())?;
print_settings(&termios, opts)?;
}
Ok(())
}
Expand Down
Loading