version 1.64, 2005/11/14 12:53:43 |
version 1.65, 2005/11/18 10:30:34 |
|
|
output(file1, f1, file2, f2); |
output(file1, f1, file2, f2); |
|
|
closem: |
closem: |
if (anychange) { |
if (anychange == 1) { |
if (rval == D_SAME) |
if (rval == D_SAME) |
rval = D_DIFFER; |
rval = D_DIFFER; |
} |
} |
|
|
j = fread(buf2, (size_t)1, sizeof(buf2), f2); |
j = fread(buf2, (size_t)1, sizeof(buf2), f2); |
if (i != j) |
if (i != j) |
return (1); |
return (1); |
if (i == 0 && j == 0) { |
if ((i == 0) && (j == 0)) { |
if (ferror(f1) || ferror(f2)) |
if (ferror(f1) || ferror(f2)) |
return (1); |
return (1); |
return (0); |
return (0); |
|
|
if (chrtran[c] != chrtran[d]) { |
if (chrtran[c] != chrtran[d]) { |
jackpot++; |
jackpot++; |
J[i] = 0; |
J[i] = 0; |
if (c != '\n' && c != EOF) |
if ((c != '\n') && (c != EOF)) |
ctold += skipline(f1); |
ctold += skipline(f1); |
if (d != '\n' && c != EOF) |
if ((d != '\n') && (c != EOF)) |
ctnew += skipline(f2); |
ctnew += skipline(f2); |
break; |
break; |
} |
} |
if (c == '\n' || c == EOF) |
if ((c == '\n') || (c == EOF)) |
break; |
break; |
} |
} |
} else { |
} else { |
|
|
if ((c = getc(f1)) != (d = getc(f2))) { |
if ((c = getc(f1)) != (d = getc(f2))) { |
/* jackpot++; */ |
/* jackpot++; */ |
J[i] = 0; |
J[i] = 0; |
if (c != '\n' && c != EOF) |
if ((c != '\n') && (c != EOF)) |
ctold += skipline(f1); |
ctold += skipline(f1); |
if (d != '\n' && c != EOF) |
if ((d != '\n') && (c != EOF)) |
ctnew += skipline(f2); |
ctnew += skipline(f2); |
break; |
break; |
} |
} |
if (c == '\n' || c == EOF) |
if ((c == '\n') || (c == EOF)) |
break; |
break; |
} |
} |
} |
} |
|
|
for (; j <= diff_len[1]; j++) |
for (; j <= diff_len[1]; j++) |
ixnew[j] = ctnew += skipline(f2); |
ixnew[j] = ctnew += skipline(f2); |
/* |
/* |
* if (jackpot) |
* if (jackpot != 0) |
* cvs_printf("jackpot\n"); |
* cvs_printf("jackpot\n"); |
*/ |
*/ |
} |
} |
|
|
goto proceed; |
goto proceed; |
} |
} |
} |
} |
if (a > b || c <= d) { /* Changes and inserts. */ |
if ((a > b) || (c <= d)) { /* Changes and inserts. */ |
for (i = c; i <= d; i++) { |
for (i = c; i <= d; i++) { |
line = preadline(fileno(f2), |
line = preadline(fileno(f2), |
ixnew[i] - ixnew[i - 1], ixnew[i - 1]); |
ixnew[i] - ixnew[i - 1], ixnew[i - 1]); |
|
|
do_output++; |
do_output++; |
break; |
break; |
} |
} |
if (do_output) { |
if (do_output != 0) { |
while (cvp <= context_vec_ptr) { |
while (cvp <= context_vec_ptr) { |
a = cvp->a; |
a = cvp->a; |
b = cvp->b; |
b = cvp->b; |
|
|
do_output++; |
do_output++; |
break; |
break; |
} |
} |
if (do_output) { |
if (do_output != 0) { |
while (cvp <= context_vec_ptr) { |
while (cvp <= context_vec_ptr) { |
a = cvp->a; |
a = cvp->a; |
b = cvp->b; |
b = cvp->b; |