Repository navigation
csplit: don't strip \r before matching a regex - #15847
Merged
Merged
Conversation
RenjiSann
approved these changes
Oct 25, 2026
Contributor
|
Thanks for your PR! |
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.
Closes #15805
do_to_matchstripped a trailing\r\nbefore testing a line against the pattern, so on CRLF input/^---$/matched---\r. GNU csplit (and grep/sed) treat that line as a non-match. It also meant a pattern that accounts for the\r, like/^---.$/, never matched.Both match sites (positive and negative offset) now strip only the
\nthatLinesWithNewlinessplit on. Written pieces are unchanged.Added two tests on
x\n---\r\ny\n: one checks that/^---$/,/^---$/-1and%^---$%report "match not found" with exit code 1 and leave no files, and one checks that/^---.$/,/^y$/-1and/^---.$/+1split where GNU does. I compared all six cases against GNU csplit 9.7 and the output, exit code and pieces match.Note: this also changes behaviour for CRLF files on Windows, where
$no longer matches before the\r. That's consistent with GNU, but flagging it in case you want it handled differently.