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

Return to diff.c CVS log

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

version 1.11, 2004/12/07 17:10:56

version 1.12, 2004/12/08 21:11:07

Line 472

{

char *dir, *repo, buf[64];

char fpath[MAXPATHLEN], dfpath[MAXPATHLEN], rcspath[MAXPATHLEN];

char path_tmp1[MAXPATHLEN], path_tmp2[MAXPATHLEN];

BUF *b1, *b2;

RCSNUM *r1, *r2;

RCSFILE *rf;

Line 585

Line 586

if (dap->rev2 != NULL)

printf(" -r%s", dap->rev2);

printf(" %s\n", diff_file);

cvs_buf_write(b1, "/tmp/diff1", 0600);

strlcpy(path_tmp1, "/tmp/diff1.XXXXXXXXXX", sizeof(path_tmp1));

cvs_buf_write(b2, "/tmp/diff2", 0600);

if (cvs_buf_write_stmp(b1, path_tmp1, 0600) == -1)

cvs_diffreg("/tmp/diff1", "/tmp/diff2");

return (-1);

strlcpy(path_tmp2, "/tmp/diff2.XXXXXXXXXX", sizeof(path_tmp1));

if (cvs_buf_write_stmp(b2, path_tmp2, 0600) == -1) {

(void)unlink(path_tmp1);

return (-1);

}

cvs_diffreg(path_tmp1, path_tmp2);

(void)unlink(path_tmp1);

(void)unlink(path_tmp2);

}

cvs_ent_free(entp);