Introduce a wrapper on `std::io::Stdin` that checks for closed STDIN before reading by RenjiSann · Pull Request #15835 · uutils/coreutils

RenjiSann · 2026-10-25T17:04:03Z

Also uses it in base32 and derivatives, cksum and derivatives, and csplit

related to #10153

oech3 · 2026-10-25T17:13:19Z

I think something like let stdout = stdout().map_err(|_| EBADF_PROVIDER)? is simpler.

oech3 · 2026-10-25T17:15:46Z

+fn err_if_stdin_closed() -> io::Result<()> {
+    #[cfg(feature = "signals")]
+    if signals::stdin_was_closed() {
+        return Err(io::Error::other(translate!("error-bad-file-descriptor")));


rustix::io::Errno::BADF.into()

I'd agree, but the error is not localized if I do this :(

I was considering that OS provides translated error message corresponding with errno via glibc.

xtqqczze · 2026-10-25T17:20:36Z

Relates to: #12210.

xtqqczze · 2026-10-25T17:39:32Z

+    }
+}
+
+pub fn ustdin() -> UStdin {


I'd probably just name this stdin, and likewise for UStdin

why not follow the naming of other wrappers of uucore (like UResult, UError, etc...) ?

why not follow the naming of other wrappers of uucore (like UResult, UError, etc...) ?

I’m not particularly fond of the naming of those types either, but they’re very common return types, so disambiguation may be necessary. That doesn’t apply in this case, though.

The name ustdin at least should be stdin.

codspeed · 2026-10-25T22:05:08Z

Merging this PR will improve performance by 3.41%

1 warning, 1 note

⚠️ 118 benchmarks are dominated by system calls

System calls cannot be simulated consistently and are left out of the measure. The reported value understates the real cost. Switch to the Walltime instrument to measure them.

Learn more about system calls

See affected benchmarks

ℹ️ 1 benchmark has no flamegraph

The flamegraph wasn't generated: most of the time was spent in runtime internals, which would leave nothing useful to analyze.

See affected benchmarks

⚡ 2 improved benchmarks
✅ 399 untouched benchmarks
⏩ 70 skipped benchmarks¹

Performance Changes

	Mode	Benchmark	`BASE`	`HEAD`	Efficiency
⚡	CPU Simulation	`sort_long_line[10000]`	1.1 ms	1 ms	+3.74%
⚡	CPU Simulation	`cksum_crc32b`	33.3 ms	32.3 ms	+3.08%

Tip

Curious why performance improved? Comment @codspeedbot explain why performance improved on this PR, or directly use the CodSpeed MCP with your agent.

_{Comparing RenjiSann:feature-ustdin (63ba0b3) with main (1d6ca65)²}

70 benchmarks were skipped, so the baseline results were used instead. If they were deleted from the codebase, click here and archive them to remove them from the performance reports. ↩
No successful run was found on main (0776385) during the generation of this report, so 1d6ca65 was used instead as the comparison base. There might be some changes unrelated to this pull request in this report. ↩

xtqqczze · 2026-10-26T01:17:39Z

 selinux = ["dep:selinux", "libc"]
 smack = ["xattr"]
 signals = ["nix/fs", "nix/signal", "nix/poll"]
+stdio = []


Suggested change

stdio = []

stdio = ["signals"]

we should enable the signals feature here, and not directly in the checksum feature

Not sure about that. I made the stdio feature be usable without signals, in case we ever need to further extend the capacities of the wrapper. The idea is to be able to use ustdin() everywhere in the uutils, no matter the availability of signals

that checks for stdin closure before reading

xtqqczze · 2026-10-26T01:32:22Z

-    fs::{File, remove_file},
-    io::{BufRead, BufWriter, Write},
-};
+use std::fs::{File, remove_file};


Going forward, it would be better to keep unrelated style changes in a separate commit.

RenjiSann requested review from sylvestre and xtqqczze October 25, 2026 17:04

RenjiSann force-pushed the feature-ustdin branch from f38e2f5 to 39004e0 Compare October 25, 2026 17:04

oech3 reviewed Oct 25, 2026

View reviewed changes

RenjiSann force-pushed the feature-ustdin branch from 39004e0 to 6ffab91 Compare October 25, 2026 17:17

xtqqczze reviewed Oct 25, 2026

View reviewed changes

Comment thread src/uucore/src/lib/features/stdio.rs

xtqqczze reviewed Oct 25, 2026

View reviewed changes

Comment thread src/uucore/src/lib/features/stdio.rs

xtqqczze reviewed Oct 25, 2026

View reviewed changes

Comment thread src/uucore/src/lib/features/stdio.rs

xtqqczze reviewed Oct 25, 2026

View reviewed changes

RenjiSann force-pushed the feature-ustdin branch 5 times, most recently from dbdcd7e to 1776a3d Compare October 25, 2026 22:03

RenjiSann force-pushed the feature-ustdin branch 2 times, most recently from 7d4cfe4 to a4accfa Compare October 25, 2026 23:17

RenjiSann removed the request for review from sylvestre October 26, 2026 01:08

xtqqczze reviewed Oct 26, 2026

View reviewed changes

Comment thread src/uu/base32/Cargo.toml Outdated

RenjiSann force-pushed the feature-ustdin branch from a4accfa to 3520870 Compare October 26, 2026 01:11

xtqqczze reviewed Oct 26, 2026

View reviewed changes

Comment thread src/uucore/src/lib/features/stdio.rs Outdated

RenjiSann force-pushed the feature-ustdin branch from 3520870 to 85ffcd4 Compare October 26, 2026 01:17

xtqqczze reviewed Oct 26, 2026

View reviewed changes

RenjiSann added 5 commits October 26, 2026 02:23

uucore: Introduce ustdin, a wrapper for stdin...

6a76613

that checks for stdin closure before reading

tests: Allow to close stdin

c31f5b8

checksum: Use ustdin

9782396

base*: Use ustdin

6997ad6

csplit: Use ustdin

7a8cf86

cpslit: rework error handling to print error messages in the right order

63ba0b3

RenjiSann force-pushed the feature-ustdin branch from 85ffcd4 to 63ba0b3 Compare October 26, 2026 01:24

xtqqczze reviewed Oct 26, 2026

View reviewed changes

Conversation

RenjiSann commented Oct 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oech3 commented Oct 25, 2026

Uh oh!

oech3 Oct 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

xtqqczze commented Oct 25, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codspeed Bot commented Oct 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merging this PR will improve performance by 3.41%

Performance Changes

Footnotes

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This branch has not been deployed

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

RenjiSann commented Oct 25, 2026 •

edited

Loading

oech3 Oct 25, 2026 •

edited

Loading

codspeed Bot commented Oct 25, 2026 •

edited

Loading