version 1.88, 2006/04/13 16:55:09 |
version 1.89, 2006/04/14 02:45:35 |
|
|
pflag = 1; |
pflag = 1; |
break; |
break; |
case 'r': |
case 'r': |
if ((dap->rev1 == NULL) && (dap->date1 == NULL)) { |
if (dap->rev1 == NULL && dap->date1 == NULL) { |
dap->rev1 = optarg; |
dap->rev1 = optarg; |
} else if ((dap->rev2 == NULL) && |
} else if (dap->rev2 == NULL && |
(dap->date2 == NULL)) { |
dap->date2 == NULL) { |
dap->rev2 = optarg; |
dap->rev2 = optarg; |
} else { |
} else { |
cvs_log(LP_ERR, |
cvs_log(LP_ERR, |
|
|
} else { |
} else { |
root = cfp->cf_root; |
root = cfp->cf_root; |
#if 0 |
#if 0 |
if ((cfp->cf_parent == NULL) || |
if (cfp->cf_parent == NULL || |
(root != cfp->cf_parent->cf_root)) { |
(root != cfp->cf_parent->cf_root)) { |
cvs_connect(root); |
cvs_connect(root); |
cvs_diff_pre_exec(root); |
cvs_diff_pre_exec(root); |
|
|
rval = D_BINARY; |
rval = D_BINARY; |
goto closem; |
goto closem; |
} |
} |
if ((prepare(0, f1, stb1.st_size) < 0) || |
if (prepare(0, f1, stb1.st_size) < 0 || |
(prepare(1, f2, stb2.st_size) < 0)) { |
prepare(1, f2, stb2.st_size) < 0) { |
goto closem; |
goto closem; |
} |
} |
prune(); |
prune(); |
|
|
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); |
|
|
x = n / x; |
x = n / x; |
x += y; |
x += y; |
x /= 2; |
x /= 2; |
} while ((x - y) > 1 || (x - y) < -1); |
} while (x - y > 1 || x - y < -1); |
|
|
return (x); |
return (x); |
} |
} |
|
|
ixnew[j] = ctnew += skipline(f2); |
ixnew[j] = ctnew += skipline(f2); |
j++; |
j++; |
} |
} |
if ((bflag == 1)|| (wflag == 1) || (iflag == 1)) { |
if (bflag == 1 || wflag == 1 || iflag == 1) { |
for (;;) { |
for (;;) { |
c = getc(f1); |
c = getc(f1); |
d = getc(f2); |
d = getc(f2); |
|
|
* GNU diff ignores a missing newline |
* GNU diff ignores a missing newline |
* in one file if bflag || wflag. |
* in one file if bflag || wflag. |
*/ |
*/ |
if (((bflag == 1) || (wflag == 1)) && |
if ((bflag == 1 || wflag == 1) && |
((c == EOF && d == '\n') || |
((c == EOF && d == '\n') || |
(c == '\n' && d == EOF))) { |
(c == '\n' && d == EOF))) { |
break; |
break; |
} |
} |
ctold++; |
ctold++; |
ctnew++; |
ctnew++; |
if ((bflag == 1) && isspace(c) && isspace(d)) { |
if (bflag == 1 && isspace(c) && isspace(d)) { |
do { |
do { |
if (c == '\n') |
if (c == '\n') |
break; |
break; |
|
|
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; |
} |
} |
} |
} |
|
|
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]); |
|
|
nc = f[i] - f[i - 1]; |
nc = f[i] - f[i - 1]; |
if (diff_format != D_IFDEF && ch != '\0') { |
if (diff_format != D_IFDEF && ch != '\0') { |
diff_output("%c", ch); |
diff_output("%c", ch); |
if ((Tflag == 1 ) && (diff_format == D_NORMAL || |
if (Tflag == 1 && (diff_format == D_NORMAL || |
diff_format == D_CONTEXT || |
diff_format == D_CONTEXT || |
diff_format == D_UNIFIED)) |
diff_format == D_UNIFIED)) |
diff_output("\t"); |
diff_output("\t"); |
|
|
"file"); |
"file"); |
return; |
return; |
} |
} |
if ((c == '\t') && (tflag == 1)) { |
if (c == '\t' && tflag == 1) { |
do { |
do { |
diff_output(" "); |
diff_output(" "); |
} while (++col & 7); |
} while (++col & 7); |
|
|
|
|
sum = 1; |
sum = 1; |
space = 0; |
space = 0; |
if ((bflag != 1) && (wflag != 1)) { |
if (bflag != 1 && wflag != 1) { |
if (iflag == 1) |
if (iflag == 1) |
for (i = 0; (t = getc(f)) != '\n'; i++) { |
for (i = 0; (t = getc(f)) != '\n'; i++) { |
if (t == EOF) { |
if (t == EOF) { |
|
|
space++; |
space++; |
continue; |
continue; |
default: |
default: |
if ((space != 0) && (wflag != 1)) { |
if (space != 0 && wflag != 1) { |
i++; |
i++; |
space = 0; |
space = 0; |
} |
} |
|
|
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
size_t i, cnt; |
size_t i, cnt; |
|
|
if ((aflag == 1) || (f == NULL)) |
if (aflag == 1 || f == NULL) |
return (1); |
return (1); |
|
|
rewind(f); |
rewind(f); |