From cf4870d8d2c71e3eab45066417790d9fe5a37cf0 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 10 2020 11:41:50 +0000 Subject: Apply patch diffutils-3.6-shows_incorrect_data.patch patch_name: diffutils-3.6-shows_incorrect_data.patch present_in_specfile: true --- diff --git a/src/cmp.c b/src/cmp.c index 431b4c6..e711668 100644 --- a/src/cmp.c +++ b/src/cmp.c @@ -642,9 +642,11 @@ count_newlines (char *buf, size_t bufsize) size_t count = 0; char *p; char *lim = buf + bufsize; + char ch = *lim; *lim = '\n'; for (p = buf; (p = rawmemchr (p, '\n')) != lim; p++) count++; + *lim = ch; return count; } diff --git a/tests/cmp b/tests/cmp index 082a931..56946de 100755 --- a/tests/cmp +++ b/tests/cmp @@ -208,4 +208,14 @@ done >out1 compare exp1 out1 || fail=1 +printf 'bad\n' >bad +printf 'bug\n' >bug +echo LC_ALL=C cmp -b bad bug +LC_ALL=C cmp -b bad bug +test $? -eq 1 || fail=1 +case `LC_ALL=C cmp -b bad bug` in + 'bad bug differ: byte 2, line 1 is '*' a '*' u') ;; + *) echo 'expected cmp -b to report a and u'; fail=1;; +esac + Exit $fail