Skip to content

Improve the stty --all output to match GNU version #9432

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
3v1n0 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Improve the stty --all output to match GNU version #9432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ef5f260
stty/flags: Do not show tandem option
3v1n0 Nov 21, 2025
3cc4c61
stty/flags: Use same order of GNU in printing ixoff/ixon
3v1n0 Nov 21, 2025
d62b347
stty/flags: Add missing tabs combination setting
3v1n0 Nov 21, 2025
8ce5b7b
stty/flags: Add delayed suspend (dsusp) support
3v1n0 Nov 21, 2025
6aaeab4
stty/flags: List all missing flags that GNU version supports
3v1n0 Nov 21, 2025
9331894
stty/flags: Add references to support to IUCLC
3v1n0 Nov 21, 2025
1fdbdc7
stty: Use libc definition for OFILL
3v1n0 Nov 22, 2025
c9fe2e5
stty: Use c_line (as line_discipline) from nix
3v1n0 Nov 22, 2025
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
74 changes: 69 additions & 5 deletions src/uu/stty/src/flags.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@
// spell-checker:ignore ignbrk brkint ignpar parmrk inpck istrip inlcr igncr icrnl ixoff ixon iuclc ixany imaxbel iutf
// spell-checker:ignore opost olcuc ocrnl onlcr onocr onlret ofdel nldly crdly tabdly bsdly vtdly ffdly
// spell-checker:ignore isig icanon iexten echoe crterase echok echonl noflsh xcase tostop echoprt prterase echoctl ctlecho echoke crtkill flusho extproc
// spell-checker:ignore lnext rprnt susp swtch vdiscard veof veol verase vintr vkill vlnext vquit vreprint vstart vstop vsusp vswtc vwerase werase
// spell-checker:ignore lnext rprnt susp dsusp swtch vdiscard veof veol verase vintr vkill vlnext vquit vreprint vstart vstop vsusp vswtc vwerase werase VDSUSP
// spell-checker:ignore sigquit sigtstp
// spell-checker:ignore cbreak decctlq evenp litout oddp
// spell-checker:ignore cdtrdsr CDTRDSR ofill OFILL dsusp VDSUSP VFLUSHO VSTATUS noncanonical VMIN deciseconds noncanonical VTIME

use crate::Flag;

Expand Down Expand Up @@ -75,10 +76,14 @@ pub const CONTROL_FLAGS: &[Flag<C>] = &[
Flag::new_grouped("cs7", C::CS7, C::CSIZE),
Flag::new_grouped("cs8", C::CS8, C::CSIZE).sane(),
Flag::new("hupcl", C::HUPCL),
// Not supported by nix and libc.
// Flag::new("hup", C::HUP).hidden(),
Flag::new("cstopb", C::CSTOPB),
Flag::new("cread", C::CREAD).sane(),
Flag::new("clocal", C::CLOCAL),
Flag::new("crtscts", C::CRTSCTS),
// Not supported by nix and libc.
// Flag::new("cdtrdsr", C::CDTRDSR),
];

pub const INPUT_FLAGS: &[Flag<I>] = &[
Expand All @@ -91,10 +96,18 @@ pub const INPUT_FLAGS: &[Flag<I>] = &[
Flag::new("inlcr", I::INLCR),
Flag::new("igncr", I::IGNCR),
Flag::new("icrnl", I::ICRNL).sane(),
Flag::new("ixoff", I::IXOFF),
Flag::new("tandem", I::IXOFF),
Flag::new("ixon", I::IXON),
// not supported by nix
Flag::new("ixoff", I::IXOFF),
Flag::new("tandem", I::IXOFF).hidden(),
// not supported by nix and libc:
// - https://github.com/rust-lang/libc/pull/4846
// - https://github.com/nix-rust/nix/pull/2702
// #[cfg(any(
// target_os = "aix",
// target_os = "android",
// target_os = "haiku",
// target_os = "linux",
// ))]
// Flag::new("iuclc", I::IUCLC),
Copy link
Contributor Author

@3v1n0 3v1n0 Nov 21, 2025

Choose a reason for hiding this comment

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

Not related to this PR, but this is being added to libc rust-lang/libc#4846 then we need to update nix

Flag::new("ixany", I::IXANY),
Flag::new("imaxbel", I::IMAXBEL).sane(),
Expand Down Expand Up @@ -122,6 +135,17 @@ pub const OUTPUT_FLAGS: &[Flag<O>] = &[
target_os = "linux",
target_os = "macos"
))]
#[cfg(any(
target_os = "android",
target_os = "haiku",
target_os = "ios",
target_os = "linux",
target_os = "macos"
))]
// Not supported by nix.
// See: https://github.com/nix-rust/nix/pull/2701
// FIXME: Flag::new("ofill", O::OFILL),
Flag::new("ofill", O::from_bits_retain(nix::libc::OFILL)),
Flag::new("ofdel", O::OFDEL),
#[cfg(any(
target_os = "android",
Expand Down Expand Up @@ -263,7 +287,15 @@ pub const LOCAL_FLAGS: &[Flag<L>] = &[
Flag::new("echok", L::ECHOK).sane(),
Flag::new("echonl", L::ECHONL),
Flag::new("noflsh", L::NOFLSH),
// Not supported by nix
// Not supported by nix and libc:
// - https://github.com/rust-lang/libc/pull/4847
// - https://github.com/nix-rust/nix/pull/2703
// #[cfg(any(
// target_os = "aix",
// target_os = "android",
// target_os = "haiku",
// target_os = "linux",
// ))]
// Flag::new("xcase", L::XCASE),
Flag::new("tostop", L::TOSTOP),
#[cfg(not(target_os = "cygwin"))]
Expand Down Expand Up @@ -370,6 +402,18 @@ pub const CONTROL_CHARS: &[(&str, S)] = &[
("stop", S::VSTOP),
// Sends a suspend signal (SIGTSTP).
("susp", S::VSUSP),
#[cfg(any(
target_os = "freebsd",
target_os = "dragonfly",
target_os = "ios",
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
target_os = "aix",
target_os = "solaris"
))]
// Sends a delayed suspend signal (SIGTSTP).
("dsusp", S::VDSUSP),
// Reprints the current line.
("rprnt", S::VREPRINT),
// Deletes the last word typed.
Expand All @@ -378,6 +422,25 @@ pub const CONTROL_CHARS: &[(&str, S)] = &[
("lnext", S::VLNEXT),
// Discards the current line.
("discard", S::VDISCARD),
// deprecated compat option.
// Not supported by nix and libc.
// ("flush", S::VFLUSHO),
#[cfg(any(
target_os = "freebsd",
target_os = "dragonfly",
target_os = "ios",
target_os = "macos",
target_os = "netbsd",
target_os = "openbsd",
))]
// Status character
("status", S::VSTATUS),
// Minimum number of characters for noncanonical read.
// We handle this manually.
// ("min", S::VMIN),
Copy link
Collaborator

@ChrisDryden ChrisDryden Nov 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

Is it possible that the nix compatibility is more about the platform that it is being built on?

Copy link
Contributor Author

@3v1n0 3v1n0 Nov 21, 2025

Choose a reason for hiding this comment

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

I checked the code, but there are no such definitions... I wanted to submit a change there too, but I'm unsure about what platforms are supported, so I'd rather wait for someone having it to support it

Copy link
Contributor Author

@3v1n0 3v1n0 Nov 22, 2025

Choose a reason for hiding this comment

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

for this specific case, actually it was defined, but I commented this out since we use the value differently in the code

// Timeout in deciseconds for noncanonical read.
// We handle this manually.
// ("time", S::VTIME),
];

/// This constant lists all possible combination settings, using a bool to represent if the setting is negatable
Expand All @@ -398,4 +461,5 @@ pub const COMBINATION_SETTINGS: &[(&str, bool)] = &[
("pass8", true),
("raw", true),
("sane", false),
("tabs", true),
];
9 changes: 3 additions & 6 deletions src/uu/stty/src/stty.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,12 +658,9 @@ fn print_terminal_size(
);
}

#[cfg(any(target_os = "linux", target_os = "redox"))]
#[cfg(any(target_os = "linux", target_os = "android", target_os = "haiku"))]
{
// For some reason the normal nix Termios struct does not expose the line,
// so we get the underlying libc::termios struct to get that information.
let libc_termios: nix::libc::termios = termios.clone().into();
let line = libc_termios.c_line;
let line = termios.line_discipline;
printer.print(&translate!("stty-output-line", "line" => line));
}
printer.flush();
Expand Down Expand Up @@ -1042,7 +1039,7 @@ fn apply_special_setting(
)]
SpecialSetting::Line(n) => {
// nix only defines Termios's `line_discipline` field on these platforms
#[cfg(any(target_os = "linux", target_os = "android"))]
#[cfg(any(target_os = "linux", target_os = "android", target_os = "haiku"))]
{
_termios.line_discipline = *n;
}
Expand Down
Loading