Fix EINTR handling in cat, od, and comm #8946
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add proper retry loops for ErrorKind::Interrupted in I/O operations to handle signals like SIGUSR1 that can interrupt read/write calls. This pattern is proven in production - identical to PR uutils#6025 (merged March 2024) which fixed dd's EINTR handling for GNU test dd/stats.sh. The same pattern is already used in 9+ utilities (head, tail, tee, wc, sort, sum, tr, shuf, dd) without issues. Changes: - cat: Fix write_fast() and write_lines() to retry on EINTR - od: Fix PartialReader::read() in all three read paths - comm: Fix are_files_identical() for both file readers - tests: Add InterruptingReader/Writer test utilities Historical context: - Pattern validated by cre4ture's PR uutils#6025 (dd EINTR fix) - Matches existing implementations in dd/dd.rs:450,881 - POSIX best practice for signal-interrupted I/O Fixes uutils#1275
|
GNU testsuite comparison: |
sylvestre
reviewed
Oct 18, 2025
| loop { | ||
| let bytes1 = reader1.read(&mut buffer1)?; | ||
| let bytes2 = reader2.read(&mut buffer2)?; | ||
| let bytes1 = loop { |
There was a problem hiding this comment.
please add comments to explain what it is :)
sylvestre
reviewed
Oct 18, 2025
| use std::io::Cursor; | ||
|
|
||
| #[test] | ||
| fn test_interrupting_reader_no_interrupts() { |
There was a problem hiding this comment.
i don't see them in the ci logs. Do you know which jobs should run them ?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This adds proper signal interruption handling to cat, od, and comm. When read or write operations get interrupted by signals like SIGUSR1, these utilities now retry instead of failing.
The pattern used here is identical to #6025 from March 2024 that fixed dd's signal handling for the GNU test suite. That same retry-on-interrupted pattern is already working in 9 other utilities including head, tail, tee, wc, sort, sum, tr, and shuf.
Closes #1275