sort: strip the errno suffix from read errors - #13994
Open
MsfPablo wants to merge 1 commit into
Open
Conversation
read_to_buffer built its error with e.to_string(), which carries the "(os error N)" tail that GNU does not print. Every other io error in sort already goes through strip_errno. Fixes uutils#13992
Contributor
|
please only add a test in test_sort.rs |
|
GNU testsuite comparison: |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #13992.
sort /proc/self/memprints:The
SortErrorvariants all run their io errors throughstrip_errnoalready; this one path does not.read_to_bufferinchunks.rsbuilds aUSimpleErrorstraight frome.to_string(), so the errno tail survives. Switched it tostrip_errno, which is the only remainingto_stringon an io error in the crate.Tests: a unit test driving
read_to_bufferwith a reader that fails with EIO. It reproduces the reported message exactly on the old code and passes on the new one.