[PATCH-v2/RFC 5/6] xutils: fix ignore-space-at-eol on incomplete line
From: Thell Fowler <hidden>
Date: 2016-06-15 22:47:18
Subsystem:
the rest · Maintainer:
Linus Torvalds
- Allow xdl_recmatch to process to the eof. Resolves issue with --ignore-space-at-eol processing where an incomplete line terminated processing early before a final check could be done on the other side. 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 54bb235..3e26488 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c@@ -229,7 +229,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.176.g556a4