src/usr.bin/cvs/diff3.c - diff

Return to diff3.c CVS log

Up to [local] / src / usr.bin / cvs

version 1.31, 2007/01/12 17:25:33

version 1.32, 2007/01/12 23:32:01

Line 173

if ((b1 = cvs_buf_load_fd(workfd, BUF_AUTOEXT)) == NULL)

goto out;

if (verbose == 1)

cvs_printf("Retrieving revision %s\n", r1);

if ((b2 = rcs_getrev(rf, rev1)) == NULL)

goto out;

if (verbose == 1)

cvs_printf("Retrieving revision %s\n", r2);

if ((b3 = rcs_getrev(rf, rev2)) == NULL)

goto out;

d1 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);

d2 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);

diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);

Line 192

Line 182

(void)xasprintf(&path3, "%s/diff3.XXXXXXXXXX", cvs_tmpdir);

cvs_buf_write_stmp(b1, path1, NULL);

cvs_buf_write_stmp(b2, path2, NULL);

if (verbose == 1)

cvs_buf_write_stmp(b3, path3, NULL);

cvs_printf("Retrieving revision %s\n", r1);

rcs_rev_write_stmp(rf, rev1, path2, 0);

if (verbose == 1)

cvs_printf("Retrieving revision %s\n", r2);

rcs_rev_write_stmp(rf, rev2, path3, 0);

cvs_buf_free(b2);

b2 = NULL;

cvs_diffreg(path1, path3, d1);

cvs_diffreg(path2, path3, d2);

Line 249

Line 240

out:

if (b1 != NULL)

cvs_buf_free(b1);

if (b2 != NULL)

cvs_buf_free(b2);

if (b3 != NULL)

cvs_buf_free(b3);

if (d1 != NULL)

cvs_buf_free(d1);

if (d2 != NULL)