commit the new opencvs code, i have been hacking on

this for the past 2 weeks now and it should go in at
the start of the hackathon so others can help out.

this code is a lot safer, smarter, faster and best of
all it is actually doing what it is suppose to do!

basic checkout, update, status, diff and commit are
working in local mode only.
there is no support for any remote setups now.

1 files changed, 9 insertions, 9 deletions

diff --git a/usr.bin/cvs/diff3.c b/usr.bin/cvs/diff3.c
index 58f4195c266..16a7657fd7d 100644
--- a/usr.bin/cvs/diff3.c
+++ b/usr.bin/cvs/diff3.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff3.c,v 1.23 2006/04/14 02:49:41 deraadt Exp $	*/
+/*	$OpenBSD: diff3.c,v 1.24 2006/05/27 03:30:30 joris Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -72,7 +72,7 @@ static const char copyright[] =
 
 #ifndef lint
 static const char rcsid[] =
-    "$OpenBSD: diff3.c,v 1.23 2006/04/14 02:49:41 deraadt Exp $";
+    "$OpenBSD: diff3.c,v 1.24 2006/05/27 03:30:30 joris Exp $";
 #endif /* not lint */
 
 #include "includes.h"
@@ -187,13 +187,13 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)
 	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;
@@ -202,13 +202,13 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)
 	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;
@@ -239,7 +239,7 @@ cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)
 		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" : "");
 	}
@@ -293,7 +293,7 @@ diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
 
 	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);
 		}
 	}