]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Improve --strip-trailing-cr handling:
authorXin LI <delphij@FreeBSD.org>
Fri, 27 Jul 2018 05:21:20 +0000 (05:21 +0000)
committerXin LI <delphij@FreeBSD.org>
Fri, 27 Jul 2018 05:21:20 +0000 (05:21 +0000)
commit9977c7b5127ed393b291323fc095f65b39ab7a99
treee99f2bc3b2f67a5453b8adfdc23d47dc128b11e9
parent324976739f3c03838bf53eb4edbbac736b9d87d8
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
usr.bin/diff/diffreg.c
usr.bin/diff/tests/diff_test.sh