[PATCH 5/6] Make diff --ignore-space-at-eol handle incomplete lines.
From: Thell Fowler <hidden>
Date: 2016-06-15 22:47:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
- When processing with --ignore-space-change a diff would be found
whenever an incomplete line was encountered. xdl_recmatch should
process the full length of the record instead of assuming both
sides have a terminator.
Signed-off-by: Thell Fowler <redacted>
---
xdiff/xutils.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index e126de450c99fb1e557c2cfc0ffe54e8e3e80394..a8ed102d528bdb5d8f0839eb392b35dc1c534fba 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c@@ -216,7 +216,7 @@ int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags) } return (i1 >= s1 && i2 >= s2); } else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) { - for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) { + for (i1 = i2 = 0; i1 <= s1 && i2 <= s2; ) { if (l1[i1] != l2[i2]) { while (i1 < s1 && isspace(l1[i1])) i1++;
--
1.6.4.172.g5c0d0.dirty