summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaro Koskinen2015-07-30 23:13:25 +0300
committerDenys Vlasenko2015-07-31 16:50:49 +0200
commita47fccaa63449182a5d0c11cf03139a072f8c19c (patch)
tree6a6197cb2487e490264360bf778c9cd63d020715
parent9dc526d0f91c37ecdf6280c2cd69107c6102076e (diff)
downloadbusybox-a47fccaa63449182a5d0c11cf03139a072f8c19c.zip
busybox-a47fccaa63449182a5d0c11cf03139a072f8c19c.tar.gz
diff: fix -B with single line changes
Fix -B with single line changes. They were always ignored regardless if they were blank or not. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--editors/diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/diff.c b/editors/diff.c
index cf14b1d..e0adcee 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -658,8 +658,8 @@ static bool diff(FILE* fp[2], char *file[2])
}
for (j = 0; j < 2; j++)
- for (k = v[j].a; k < v[j].b; k++)
- nonempty |= (ix[j][k+1] - ix[j][k] != 1);
+ for (k = v[j].a; k <= v[j].b; k++)
+ nonempty |= (ix[j][k] - ix[j][k - 1] != 1);
vec = xrealloc_vector(vec, 6, ++idx);
memcpy(vec[idx], v, sizeof(v));