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

Return to diff3.c CVS log

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

version 1.23, 2006/04/14 02:49:41

version 1.24, 2006/05/27 03:30:30

Line 187

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

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

cvs_buf_write_stmp(b1, path1, 0600);

cvs_buf_write_stmp(b1, path1, 0600, NULL);

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

cvs_buf_write_stmp(b2, path2, 0600);

cvs_buf_write_stmp(b2, path2, 0600, NULL);

strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));

cvs_buf_write_stmp(b3, path3, 0600);

cvs_buf_write_stmp(b3, path3, 0600, NULL);

cvs_buf_free(b2);

b2 = NULL;

Line 202

cvs_diffreg(path2, path3, d2);

strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));

cvs_buf_write_stmp(d1, dp13, 0600);

cvs_buf_write_stmp(d1, dp13, 0600, NULL);

cvs_buf_free(d1);

d1 = NULL;

strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));

cvs_buf_write_stmp(d2, dp23, 0600);

cvs_buf_write_stmp(d2, dp23, 0600, NULL);

cvs_buf_free(d2);

d2 = NULL;

Line 239

goto out;

if (verbose == 1 && diff3_conflicts != 0) {

cvs_log(LP_WARN, "%d conflict%s found during merge, "

cvs_log(LP_ERR, "%d conflict%s found during merge, "

"please correct.", diff3_conflicts,

(diff3_conflicts > 1) ? "s" : "");

}

Line 293

for (i = 0; i <= 2; i++) {

if ((fp[i] = fopen(argv[i + 2], "r")) == NULL) {

cvs_log(LP_ERRNO, "%s", argv[i + 2]);

cvs_log(LP_ERR, "%s", argv[i + 2]);

return (-1);

}