Summary: | OpenBSD diff (WITHOUT_GNU_DIFF) --strip-trailing-cr is incorrect | ||
---|---|---|---|
Product: | Base System | Reporter: | maskray <emacsray> |
Component: | bin | Assignee: | Xin LI <delphij> |
Status: | Closed FIXED | ||
Severity: | Affects Only Me | CC: | delphij |
Priority: | --- | ||
Version: | CURRENT | ||
Hardware: | Any | ||
OS: | Any |
Description
maskray
2018-07-26 05:57:54 UTC
Please try: https://reviews.freebsd.org/D16451 A commit references this bug: Author: delphij Date: Fri Jul 27 05:21:20 UTC 2018 New revision: 336754 URL: https://svnweb.freebsd.org/changeset/base/336754 Log: 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 Reported by: maskray <emacsray gmail com> Reviewed by: bapt, maskray MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D16451 Changes: head/usr.bin/diff/diffreg.c head/usr.bin/diff/tests/diff_test.sh |