diff --git a/test/compare_file.c b/test/compare_file.c index b458ed9f..b2f5fd10 100644 --- a/test/compare_file.c +++ b/test/compare_file.c @@ -137,7 +137,6 @@ int Compare_2_files(char *adr1, char *adr2, char *adrc, int flag) if(s1.st_size > r1count + r1) printf("- %s : early EOF after %d bytes\n", adr1, r1count); differs= 1; - break; } r1count+= r1; if(r2==EOF || r2 r2count + r2) printf("- %s : early EOF after %d bytes\n", adr2, r2count); differs= 1; - break; } if(r2>r1) { if(s1.st_size > r1count + r1) printf("- %s : early EOF after %d bytes\n", adr1, r1count); differs= 1; - break; } r2count+= r2; + if(r1>r2) + r1= r2; for(i= 0; i0) { - printf("%s : %s : differs by at least %.f bytes. First at %.f\n", - a, (s1.st_size==s2.st_size || s1.st_mtime==s2.st_mtime ? - "CONTENT":"content"), (double) diffcount, (double) first_diff); + if(diffcount>0 || r1count!=r2count) { + if(first_diff<0) + first_diff= (r1count>r2count ? r2count : r1count); + printf("%s : %s : differs by at least %.f bytes. First at %.f\n", a, + (s1.st_size==s2.st_size || s1.st_mtime==s2.st_mtime ? + "CONTENT":"content"), + (double) (diffcount + abs(r1count-r2count)), (double) first_diff); differs= 1; } }