Skip to content

stty: Fix incorrect ppc64el type presumption #11284

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 2 commits into from
Mar 11, 2026
Merged

stty: Fix incorrect ppc64el type presumption #11284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad95ace
stty: Fix incorrect ppc64el type presumption
BAMF0 Mar 10, 2026
3875d71
stty: Run cargo fmt
BAMF0 Mar 10, 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
36 changes: 15 additions & 21 deletions src/uu/stty/src/stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,42 +630,36 @@ fn print_terminal_size(
// GNU linked against glibc 2.42 provides us baudrate 51 which panics cfgetospeed
#[cfg(not(target_os = "linux"))]
let speed = nix::sys::termios::cfgetospeed(termios);
#[cfg(all(
target_os = "linux",
not(target_arch = "powerpc"),
not(target_arch = "powerpc64")
))]
#[cfg(target_os = "linux")]
#[cfg(all(not(target_arch = "powerpc"), not(target_arch = "powerpc64")))]
ioctl_read_bad!(tcgets2, TCGETS2, termios2);
#[cfg(all(
target_os = "linux",
not(target_arch = "powerpc"),
not(target_arch = "powerpc64")
))]
#[cfg(target_os = "linux")]
#[cfg(all(not(target_arch = "powerpc"), not(target_arch = "powerpc64")))]
let speed = {
let mut t2 = unsafe { std::mem::zeroed::<termios2>() };
unsafe { tcgets2(opts.file.as_raw_fd(), &raw mut t2)? };
t2.c_ospeed
};
#[cfg(all(
target_os = "linux",
any(target_arch = "powerpc", target_arch = "powerpc64")
))]
#[cfg(target_os = "linux")]
#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))]
let speed = nix::sys::termios::cfgetospeed(termios);

let mut printer = WrappedPrinter::new(window_size);

// BSDs and Linux (non-PowerPC) use a u32 for the baud rate, so we can simply print it.
// BSDs and Linux (not ppc/big-endian ppc64) use a u32 for the baud rate, so we can simply
// print it.
#[cfg(any(target_os = "linux", bsd))]
#[cfg(all(
any(target_os = "linux", bsd),
not(target_arch = "powerpc"),
not(target_arch = "powerpc64")
not(all(target_arch = "powerpc64", target_endian = "big"))
))]
printer.print(&translate!("stty-output-speed", "speed" => speed));

// PowerPC uses BaudRate enum, need to convert to display format
#[cfg(all(
target_os = "linux",
any(target_arch = "powerpc", target_arch = "powerpc64")
// Big-endian Linux PowerPC uses BaudRate enum, need to convert to display format
#[cfg(target_os = "linux")]
#[cfg(any(
target_arch = "powerpc",
all(target_arch = "powerpc64", target_endian = "big")
))]
{
// On PowerPC, find the corresponding baud rate string for display
Expand Down
Loading