Repository navigation
Conversation
…-block # Conflicts: # tests/by-util/test_diff.rs
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 #349.
GNU diff decides a file is binary from its first read buffer only, and that buffer is
st_blksizebytes for each file. We always looked at 16 KiB, so a NUL between 4 KiB and 16 KiB made us print "Binary files ... differ" where GNU shows the diff.The size now comes from the metadata of the file that was read (and of stdin), per file like GNU. Checked against GNU diff 3.12 with the NUL just before and after 4096, 8192 and 16384, for files, stdin from a file and stdin from a pipe, and with a
/procfile whosest_blksizeis 1024. Where there is nost_blksize(Windows, WASI) it stays at 16 KiB.The test skips itself if the temp dir's block size is not below the test data size.