version 1.50, 2006/04/14 23:32:01 |
version 1.51, 2006/04/19 06:53:41 |
|
|
static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *); |
static int rcsdiff_file(RCSFILE *, RCSNUM *, const char *); |
static int rcsdiff_rev(RCSFILE *, RCSNUM *, RCSNUM *); |
static int rcsdiff_rev(RCSFILE *, RCSNUM *, RCSNUM *); |
|
|
|
static int flags = 0; |
static int kflag = RCS_KWEXP_ERR; |
static int kflag = RCS_KWEXP_ERR; |
|
|
int |
int |
|
|
diff_format = D_RCSDIFF; |
diff_format = D_RCSDIFF; |
break; |
break; |
case 'q': |
case 'q': |
verbose = 0; |
flags |= QUIET; |
break; |
break; |
case 'u': |
case 'u': |
strlcat(diffargs, " -u", sizeof(diffargs)); |
strlcat(diffargs, " -u", sizeof(diffargs)); |
|
|
fatal("bad revision number"); |
fatal("bad revision number"); |
} |
} |
|
|
if (verbose == 1) { |
if (!(flags & QUIET)) { |
fprintf(stderr, "%s\n", RCS_DIFF_DIV); |
fprintf(stderr, "%s\n", RCS_DIFF_DIV); |
fprintf(stderr, "RCS file: %s\n", fpath); |
fprintf(stderr, "RCS file: %s\n", fpath); |
} |
} |
|
|
} |
} |
|
|
rcsnum_tostr(rev, rbuf, sizeof(rbuf)); |
rcsnum_tostr(rev, rbuf, sizeof(rbuf)); |
if (verbose == 1) { |
if (!(flags & QUIET)) { |
fprintf(stderr, "retrieving revision %s\n", rbuf); |
fprintf(stderr, "retrieving revision %s\n", rbuf); |
fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename); |
fprintf(stderr, "%s -r%s %s\n", diffargs, rbuf, filename); |
} |
} |
|
|
diff_rev2 = rev2; |
diff_rev2 = rev2; |
|
|
rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1)); |
rcsnum_tostr(rev1, rbuf1, sizeof(rbuf1)); |
if (verbose == 1) |
if (!(flags & QUIET)) |
fprintf(stderr, "retrieving revision %s\n", rbuf1); |
fprintf(stderr, "retrieving revision %s\n", rbuf1); |
|
|
if ((b1 = rcs_getrev(file, rev1)) == NULL) { |
if ((b1 = rcs_getrev(file, rev1)) == NULL) { |
|
|
tv[1].tv_sec = tv[0].tv_sec; |
tv[1].tv_sec = tv[0].tv_sec; |
|
|
rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2)); |
rcsnum_tostr(rev2, rbuf2, sizeof(rbuf2)); |
if (verbose == 1) |
if (!(flags & QUIET)) |
fprintf(stderr, "retrieving revision %s\n", rbuf2); |
fprintf(stderr, "retrieving revision %s\n", rbuf2); |
|
|
if ((b2 = rcs_getrev(file, rev2)) == NULL) { |
if ((b2 = rcs_getrev(file, rev2)) == NULL) { |
|
|
tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2); |
tv2[0].tv_sec = (long)rcs_rev_getdate(file, rev2); |
tv2[1].tv_sec = tv2[0].tv_sec; |
tv2[1].tv_sec = tv2[0].tv_sec; |
|
|
if (verbose == 1) |
if (!(flags & QUIET)) |
fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2); |
fprintf(stderr, "%s -r%s -r%s\n", diffargs, rbuf1, rbuf2); |
|
|
strlcpy(path1, rcs_tmpdir, sizeof(path1)); |
strlcpy(path1, rcs_tmpdir, sizeof(path1)); |