1
0
Fork 0

Merging upstream version 1.2~pre2.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-24 05:45:19 +01:00
parent f9513766bb
commit efa0d5eefe
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
22 changed files with 804 additions and 87 deletions

View file

@ -246,12 +246,12 @@ int cmp( const long long max_size, const int infd[2],
}
}
buffer0[rd[0]] = ~buffer1[rd[0]]; // sentinels for the block compare
buffer1[rd[1]] = ~buffer0[rd[1]];
const int min_rd = std::min( rd[0], rd[1] );
buffer0[min_rd] = 0; // sentinels for the block compare
buffer1[min_rd] = 1;
int first_diff = block_compare( buffer0, buffer1, &line_number );
byte_number += first_diff;
const int min_rd = std::min( rd[0], rd[1] );
if( first_diff < min_rd )
{