src/usr.bin/rcs/ci.c - diff

Return to ci.c CVS log

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

version 1.167, 2006/04/29 06:32:00

version 1.168, 2006/05/04 07:06:58

Line 329

static char *

checkin_diff_file(struct checkin_params *pb)

{

char path1[MAXPATHLEN], path2[MAXPATHLEN];

char *path1, *path2;

BUF *b1, *b2, *b3;

char rbuf[64], *deltatext;

Line 352

goto out;

}

if (strlcpy(path1, rcs_tmpdir, sizeof(path1)) >= sizeof(path1) ||

(void)xasprintf(&path1, "%s/diff1.XXXXXXXXXX", rcs_tmpdir);

strlcat(path1, "/diff1.XXXXXXXXXX", sizeof(path1)) >= sizeof(path1))

errx(1, "path truncated");

rcs_buf_write_stmp(b1, path1, 0600);

rcs_buf_free(b1);

b1 = NULL;

if (strlcpy(path2, rcs_tmpdir, sizeof(path2)) >= sizeof(path2) ||

(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);

strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2)) >= sizeof(path2))

errx(1, "path truncated");

rcs_buf_write_stmp(b2, path2, 0600);

rcs_buf_free(b2);

Line 382

Line 378

rcs_buf_free(b2);

if (b3 != NULL)

rcs_buf_free(b3);

if (path1 != NULL)

xfree(path1);

if (path2 != NULL)

xfree(path2);

return (deltatext);

}