Skip to content

stty: cleanup a hack for stty 51 panic #15562

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
sylvestre merged 1 commit into from
Oct 21, 2026
Merged

stty: cleanup a hack for stty 51 panic #15562

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
25 changes: 12 additions & 13 deletions src/uu/stty/src/stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,19 +585,13 @@ impl WrappedPrinter {
}
}

#[allow(
clippy::unnecessary_wraps,
reason = "needed for some platform-specific code"
)]
fn print_terminal_size(
termios: &Termios,
termios: &rustix::termios::Termios,
opts: &Options,
window_size: Option<&Winsize>,
term_size: Option<&Winsize>,
) -> io::Result<()> {
// GNU linked against glibc 2.42 provides us baudrate 51 which panics cfgetospeed
// so we repeat syscall... use termios.output_speed() instead if we switched to rustix instead.
let speed = rustix::termios::tcgetattr(&opts.file)?.output_speed();
) {
let speed = termios.output_speed();
let mut printer = WrappedPrinter::new(window_size);
printer.print(&translate!("stty-output-speed", "speed" => speed));
if opts.all {
Expand All @@ -612,10 +606,7 @@ fn print_terminal_size(
let line = termios.line_discipline;
printer.print(&translate!("stty-output-line", "line" => line));
}
#[cfg(not(any(target_os = "linux", target_os = "redox")))]
let _ = termios; // remove this hack when we switched to rustix completely
printer.flush();
Ok(())
}

fn cc_to_index(option: &str) -> Option<S> {
Expand Down Expand Up @@ -822,7 +813,15 @@ fn print_settings(termios: &Termios, opts: &Options) -> io::Result<()> {
&tcgetwinsize(stdout).ok()
};

print_terminal_size(termios, opts, window_size.as_ref(), term_size.as_ref())?;
// GNU linked against glibc 2.42 provides us baudrate 51 which panics nix::sys::termios::cfgetospeed
// so we repeat syscall until we replace nix with rustix...
let rustix_termios = rustix::termios::tcgetattr(&opts.file)?;
print_terminal_size(
&rustix_termios,
opts,
window_size.as_ref(),
term_size.as_ref(),
);
print_control_chars(termios, opts, window_size.as_ref())?;
print_flags(termios, opts, CONTROL_FLAGS, window_size.as_ref());
print_flags(termios, opts, INPUT_FLAGS, window_size.as_ref());
Expand Down
Loading