Improve --strip-trailing-cr handling
ClosedPublic
Actions

Authored by delphij on Jul 26 2018, 8:45 AM.

Tags

None

Referenced Files

	Unknown Object (File)
	Mon, Sep 29, 4:22 AM

	Unknown Object (File)
	Fri, Sep 26, 10:40 PM

	Unknown Object (File)
	Wed, Sep 24, 6:18 AM

	Unknown Object (File)
	Wed, Sep 24, 3:17 AM

	Unknown Object (File)
	Sep 7 2025, 8:51 AM

	Unknown Object (File)
	Aug 20 2025, 1:12 AM

	Unknown Object (File)
	Aug 4 2025, 10:00 PM

	Unknown Object (File)
	Jul 26 2025, 8:19 PM

View All Files

Subscribers

allanjude

imp

Details

Reviewers

ngie
bapt
fbsd-phab_maskray.me

Commits

rS336754: Improve --strip-trailing-cr handling:

Summary

Improve --strip-trailing-cr handling:

Advance ctold for f1 and ctnew for f2
ungetc() if the character is unexpected
Don't break early when we hit the combination on one side

PR: 230049

Test Plan

kyua test -k /usr/tests/Kyuafile usr.bin/diff

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

delphij created this revision.Jul 26 2018, 8:45 AM

Herald added a subscriber: imp. · View Herald TranscriptJul 26 2018, 8:45 AM

Harbormaster completed remote builds in B18345: Diff 45864.Jul 26 2018, 8:45 AM

bapt accepted this revision.Jul 26 2018, 9:00 AM

This revision is now accepted and ready to land.Jul 26 2018, 9:00 AM

fbsd-phab_maskray.me accepted this revision.Jul 27 2018, 2:51 AM

fbsd-phab_maskray.me added a comment.Jul 27 2018, 3:16 AM

This comment was removed by allanjude.

Closed by commit rS336754: Improve --strip-trailing-cr handling: (authored by delphij). · Explain WhyJul 27 2018, 5:21 AM

This revision was automatically updated to reflect the committed changes.

allanjude added a subscriber: allanjude.Jul 29 2018, 6:49 PM

Revision Contents
Changeset List

Path

Size

head/

usr.bin/

diff/

diffreg.c

13 lines

tests/

diff_test.sh

11 lines

Diff 45899

View Options

head/usr.bin/diff/diffreg.c