remove overkill cvs_log() and rather use warn()/warnx().

OK ray@ and discussed with joris@.

9 files changed, 96 insertions, 116 deletions

diff --git a/usr.bin/rcs/ci.c b/usr.bin/rcs/ci.c
index e579bc103d7..671f9d7107d 100644
--- a/usr.bin/rcs/ci.c
+++ b/usr.bin/rcs/ci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ci.c,v 1.154 2006/04/19 06:53:41 xsa Exp $	*/
+/*	$OpenBSD: ci.c,v 1.155 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Niall O'Higgins <niallo@openbsd.org>
  * All rights reserved.
@@ -218,7 +218,7 @@ checkin_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc == 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit(1);
 	}
@@ -238,13 +238,13 @@ checkin_main(int argc, char **argv)
 			if (pb.openflags & RCS_CREATE)
 				pb.flags |= NEWFILE;
 			else {
-				cvs_log(LP_ERR, "No existing RCS file");
+				warnx("No existing RCS file");
 				status = 1;
 				continue;
 			}
 		} else {
 			if (pb.flags & CI_INIT) {
-				cvs_log(LP_ERR, "%s already exists", pb.fpath);
+				warnx("%s already exists", pb.fpath);
 				status = 1;
 				continue;
 			}
@@ -324,17 +324,17 @@ checkin_diff_file(struct checkin_params *pb)
 	rcsnum_tostr(pb->frev, rbuf, sizeof(rbuf));
 
 	if ((b1 = cvs_buf_load(pb->filename, BUF_AUTOEXT)) == NULL) {
-		cvs_log(LP_ERR, "failed to load file: '%s'", pb->filename);
+		warnx("failed to load file: `%s'", pb->filename);
 		goto out;
 	}
 
 	if ((b2 = rcs_getrev(pb->file, pb->frev)) == NULL) {
-		cvs_log(LP_ERR, "failed to load revision");
+		warnx("failed to load revision");
 		goto out;
 	}
 
 	if ((b3 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL) {
-		cvs_log(LP_ERR, "failed to allocated buffer for diff");
+		warnx("failed to allocated buffer for diff");
 		goto out;
 	}
 
@@ -466,8 +466,7 @@ checkin_update(struct checkin_params *pb)
 	 */
 	if (pb->newrev != NULL &&
 	    rcsnum_cmp(pb->newrev, pb->frev, 0) > 0) {
-		cvs_log(LP_ERR,
-		    "%s: revision %s too low; must be higher than %s",
+		warnx("%s: revision %s too low; must be higher than %s",
 		    pb->file->rf_path,
 		    rcsnum_tostr(pb->newrev, numb1, sizeof(numb1)),
 		    rcsnum_tostr(pb->frev, numb2, sizeof(numb2)));
@@ -504,7 +503,7 @@ checkin_update(struct checkin_params *pb)
 
 	/* Get RCS patch */
 	if ((pb->deltatext = checkin_diff_file(pb)) == NULL) {
-		cvs_log(LP_ERR, "failed to get diff");
+		warnx("failed to get diff");
 		goto fail;
 	}
 
@@ -524,9 +523,9 @@ checkin_update(struct checkin_params *pb)
 
 	if (rcs_lock_remove(pb->file, pb->username, pb->frev) < 0) {
 		if (rcs_errno != RCS_ERR_NOENT)
-			cvs_log(LP_WARN, "failed to remove lock");
+			warnx("failed to remove lock");
 		else if (!(pb->flags & CO_LOCK))
-			cvs_log(LP_WARN, "previous revision was not locked; "
+			warnx("previous revision was not locked; "
 			    "ignoring -l option");
 	}
 
@@ -538,7 +537,7 @@ checkin_update(struct checkin_params *pb)
 	if (rcs_rev_add(pb->file,
 	    (pb->newrev == NULL ? RCS_HEAD_REV : pb->newrev),
 	    pb->rcs_msg, pb->date, pb->author) != 0) {
-		cvs_log(LP_ERR, "failed to add new revision");
+		warnx("failed to add new revision");
 		goto fail;
 	}
 
@@ -650,8 +649,7 @@ checkin_init(struct checkin_params *pb)
 		} else {
 			dp = cvs_buf_load(pb->description, BUF_AUTOEXT);
 			if (dp == NULL) {
-				cvs_log(LP_ERR,
-				    "failed to load description file '%s'",
+				warnx("failed to load description file '%s'",
 				    pb->description);
 				goto fail;
 			}
@@ -686,7 +684,7 @@ skipdesc:
 	    (pb->newrev == NULL ? RCS_HEAD_REV : pb->newrev),
 	    (pb->rcs_msg == NULL ? "Initial revision" : pb->rcs_msg),
 	    pb->date, pb->author) != 0) {
-		cvs_log(LP_ERR, "failed to add new revision");
+		warnx("failed to add new revision");
 		goto fail;
 	}
 
@@ -702,7 +700,7 @@ skipdesc:
 
 	/* New head revision has to contain entire file; */
 	if (rcs_deltatext_set(pb->file, pb->file->rf_head, filec) == -1) {
-		cvs_log(LP_ERR, "failed to set new head revision");
+		warnx("failed to set new head revision");
 		goto fail;
 	}
 
@@ -764,8 +762,8 @@ checkin_attach_symbol(struct checkin_params *pb)
 	if (pb->flags & CI_SYMFORCE) {
 		if (rcs_sym_remove(pb->file, pb->symbol) < 0) {
 			if (rcs_errno != RCS_ERR_NOENT) {
-				cvs_log(LP_ERR,
-				    "problem removing symbol: %s", pb->symbol);
+				warnx("problem removing symbol: %s",
+				    pb->symbol);
 				return (-1);
 			}
 		}
@@ -774,13 +772,10 @@ checkin_attach_symbol(struct checkin_params *pb)
 	    (rcs_errno == RCS_ERR_DUPENT)) {
 		rcsnum_tostr(rcs_sym_getrev(pb->file, pb->symbol),
 		    rbuf, sizeof(rbuf));
-		cvs_log(LP_ERR,
-		    "symbolic name %s already bound to %s",
-		    pb->symbol, rbuf);
+		warnx("symbolic name %s already bound to %s", pb->symbol, rbuf);
 		return (-1);
 	} else if (ret == -1) {
-		cvs_log(LP_ERR, "problem adding symbol: %s",
-		    pb->symbol);
+		warnx("problem adding symbol: %s", pb->symbol);
 		return (-1);
 	}
 	return (0);
@@ -800,9 +795,7 @@ checkin_revert(struct checkin_params *pb)
 	char rbuf[16];
 
 	rcsnum_tostr(pb->frev, rbuf, sizeof(rbuf));
-	cvs_log(LP_WARN,
-	    "file is unchanged; reverting to previous revision %s",
-	    rbuf);
+	warnx("file is unchanged; reverting to previous revision %s", rbuf);
 	pb->flags |= CO_REVERT;
 	(void)unlink(pb->filename);
 	if ((pb->flags & CO_LOCK) || (pb->flags & CO_UNLOCK))
@@ -810,7 +803,7 @@ checkin_revert(struct checkin_params *pb)
 		    pb->flags, pb->username, pb->author, NULL, NULL);
 	if (rcs_lock_remove(pb->file, pb->username, pb->frev) < 0)
 		if (rcs_errno != RCS_ERR_NOENT)
-			cvs_log(LP_WARN, "failed to remove lock");
+			warnx("failed to remove lock");
 }
 
 /*
@@ -830,8 +823,7 @@ checkin_checklock(struct checkin_params *pb)
 			return (0);
 	}
 
-	cvs_log(LP_ERR,
-	    "%s: no lock set by %s", pb->file->rf_path, pb->username);
+	warnx("%s: no lock set by %s", pb->file->rf_path, pb->username);
 	return (-1);
 }
 
@@ -848,7 +840,7 @@ checkin_mtimedate(struct checkin_params *pb)
 {
 	struct stat sb;
 	if (stat(pb->filename, &sb) != 0) {
-		cvs_log(LP_ERRNO, "failed to stat `%s'", pb->filename);
+		warn("%s", pb->filename);
 		return (-1);
 	}
 	pb->date = (time_t)sb.st_mtimespec.tv_sec;
diff --git a/usr.bin/rcs/co.c b/usr.bin/rcs/co.c
index 5c0eb9b2f8c..6012e92494d 100644
--- a/usr.bin/rcs/co.c
+++ b/usr.bin/rcs/co.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: co.c,v 1.80 2006/04/21 07:06:25 xsa Exp $	*/
+/*	$OpenBSD: co.c,v 1.81 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -68,15 +68,14 @@ checkout_main(int argc, char **argv)
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
 			if (RCS_KWEXP_INVAL(kflag)) {
-				cvs_log(LP_ERR,
-				    "invalid RCS keyword expansion mode");
+				warnx("invalid RCS keyword expansion mode");
 				(usage)();
 				exit(1);
 			}
 			break;
 		case 'l':
 			if (flags & CO_UNLOCK) {
-				cvs_log(LP_ERR, "warning: -u overridden by -l");
+				warnx("warning: -u overridden by -l");
 				flags &= ~CO_UNLOCK;
 			}
 			rcs_setrevstr(&rev_str, rcs_optarg);
@@ -107,7 +106,7 @@ checkout_main(int argc, char **argv)
 		case 'u':
 			rcs_setrevstr(&rev_str, rcs_optarg);
 			if (flags & CO_LOCK) {
-				cvs_log(LP_ERR, "warning: -l overridden by -u");
+				warnx("warning: -l overridden by -u");
 				flags &= ~CO_LOCK;
 			}
 			flags |= CO_UNLOCK;
@@ -144,15 +143,13 @@ checkout_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc == 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit (1);
 	}
 
-	if ((username = getlogin()) == NULL) {
-		cvs_log(LP_ERRNO, "failed to get username");
-		exit (1);
-	}
+	if ((username = getlogin()) == NULL)
+		fatal("getlogin failed");
 
 	for (i = 0; i < argc; i++) {
 		if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
@@ -163,7 +160,7 @@ checkout_main(int argc, char **argv)
 			    (flags & PIPEOUT) ? "standard output" : argv[i]);
 
 		if ((flags & CO_LOCK) && (kflag & RCS_KWEXP_VAL)) {
-			cvs_log(LP_ERR, "%s: cannot combine -kv and -l", fpath);
+			warnx("%s: cannot combine -kv and -l", fpath);
 			continue;
 		}
 
@@ -287,8 +284,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 	rdp = NULL;
 	if (file->rf_ndelta != 0 && frev == file->rf_head) {
 		if (lcount > 1) {
-			cvs_log(LP_WARN,
-			    "multiple revisions locked by %s; "
+			warnx("multiple revisions locked by %s; "
 			    "please specify one", lockname);
 			return (-1);
 		}
@@ -338,7 +334,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 				    sizeof(msg));
 			}
 
-			cvs_log(LP_ERR, msg, buf, rdp->rd_locker);
+			warnx(msg, buf, rdp->rd_locker);
 			return (-1);
 		}
 	}
@@ -352,7 +348,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 
 	if (file->rf_ndelta != 0) {
 		if ((bp = rcs_getrev(file, rev)) == NULL) {
-			cvs_log(LP_ERR, "cannot find revision `%s'", buf);
+			warnx("cannot find revision `%s'", buf);
 			return (-1);
 		}
 	} else {
@@ -413,7 +409,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 
 	if (file->rf_ndelta == 0 &&
 	    ((flags & CO_LOCK) || (flags & CO_UNLOCK))) {
-		cvs_log(LP_WARN, "no revisions, so nothing can be %s",
+		warnx("no revisions, so nothing can be %s",
 		    (flags & CO_LOCK) ? "locked" : "unlocked");
 	} else if (file->rf_ndelta != 0) {
 		if (!(flags & QUIET) && !(flags & NEWFILE))
@@ -424,7 +420,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 		if (rcs_errno != RCS_ERR_DUPENT)
 			lcount++;
 		if (!(flags & QUIET) && lcount > 1 && !(flags & CO_REVERT))
-			cvs_log(LP_WARN, "%s: warning: You now have %d locks.",
+			warnx("%s: warning: You now have %d locks.",
 			    file->rf_path, lcount);
 	}
 
@@ -450,11 +446,10 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 		/* default is n */
 		if (cvs_yesno() == -1) {
 			if (!(flags & QUIET) && isatty(STDIN_FILENO))
-				cvs_log(LP_ERR,
-				    "writable %s exists; checkout aborted",
-				    dst);
+				warnx("writable %s exists; "
+				    "checkout aborted", dst);
 			else
-				cvs_log(LP_ERR, "checkout aborted");
+				warnx("checkout aborted");
 			return (-1);
 		}
 	}
@@ -466,7 +461,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 		xfree(content);
 	} else {
 		if (cvs_buf_write(bp, dst, mode) < 0) {
-			cvs_log(LP_ERR, "failed to write revision to file");
+			warnx("failed to write revision to file");
 			cvs_buf_free(bp);
 			return (-1);
 		}
@@ -477,7 +472,7 @@ checkout_rev(RCSFILE *file, RCSNUM *frev, const char *dst, int flags,
 			tv[0].tv_sec = (long)rcs_rev_getdate(file, rev);
 			tv[1].tv_sec = tv[0].tv_sec;
 			if (utimes(dst, (const struct timeval *)&tv) < 0)
-				cvs_log(LP_ERRNO, "error setting utimes");
+				warn("utimes");
 		}
 	}
 
@@ -498,7 +493,7 @@ checkout_err_nobranch(RCSFILE *file, const char *author, const char *date,
 	if (!(flags & CO_STATE))
 		state = NULL;
 
-	cvs_log(LP_ERR, "%s: No revision on branch has%s%s%s%s%s%s.",
+	warnx("%s: No revision on branch has%s%s%s%s%s%s.",
 	    file->rf_path,
 	    date ? " a date before " : "",
 	    date ? date : "",
diff --git a/usr.bin/rcs/ident.c b/usr.bin/rcs/ident.c
index 9c9953d6693..900d25814be 100644
--- a/usr.bin/rcs/ident.c
+++ b/usr.bin/rcs/ident.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ident.c,v 1.16 2006/04/19 06:53:41 xsa Exp $	*/
+/*	$OpenBSD: ident.c,v 1.17 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -66,12 +66,12 @@ ident_main(int argc, char **argv)
 	else {
 		for (i = 0; i < argc; i++) {
 			if ((fp = fopen(argv[i], "r")) == NULL) {
-				cvs_log(LP_ERRNO, "%s", argv[i]);
+				warn("%s", argv[i]);
 				continue;
 			}
 
 			ident_file(argv[i], fp);
-			fclose(fp);
+			(void)fclose(fp);
 		}
 	}
 
diff --git a/usr.bin/rcs/rcsclean.c b/usr.bin/rcs/rcsclean.c
index ef0acdc7882..9df700ad56d 100644
--- a/usr.bin/rcs/rcsclean.c
+++ b/usr.bin/rcs/rcsclean.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsclean.c,v 1.37 2006/04/19 06:53:41 xsa Exp $	*/
+/*	$OpenBSD: rcsclean.c,v 1.38 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -52,8 +52,7 @@ rcsclean_main(int argc, char **argv)
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
 			if (RCS_KWEXP_INVAL(kflag)) {
-				cvs_log(LP_ERR,
-				    "invalid RCS keyword expansion mode");
+				warnx("invalid RCS keyword expansion mode");
 				(usage)();
 				exit(1);
 			}
@@ -98,7 +97,7 @@ rcsclean_main(int argc, char **argv)
 
 	if (argc == 0) {
 		if ((dirp = opendir(".")) == NULL) {
-			cvs_log(LP_ERRNO, "failed to open directory '.'");
+			warn("opendir");
 			(usage)();
 			exit(1);
 		}
@@ -109,7 +108,7 @@ rcsclean_main(int argc, char **argv)
 			rcsclean_file(dp->d_name, rev_str);
 		}
 
-		closedir(dirp);
+		(void)closedir(dirp);
 	} else
 		for (i = 0; i < argc; i++)
 			rcsclean_file(argv[i], rev_str);
@@ -153,17 +152,16 @@ rcsclean_file(char *fname, const char *rev_str)
 	if (rev_str == NULL)
 		rev = file->rf_head;
 	else if ((rev = rcs_getrevnum(rev_str, file)) == NULL) {
-		cvs_log(LP_ERR, "%s: Symbolic name `%s' is undefined.",
-		    fpath, rev_str);
+		warnx("%s: Symbolic name `%s' is undefined.", fpath, rev_str);
 		goto out;
 	}
 
 	if ((b1 = rcs_getrev(file, rev)) == NULL) {
-		cvs_log(LP_ERR, "failed to get needed revision");
+		warnx("failed to get needed revision");
 		goto out;
 	}
 	if ((b2 = cvs_buf_load(fname, 0)) == NULL) {
-		cvs_log(LP_ERRNO, "failed to load '%s'", fname);
+		warnx("failed to load `%s'", fname);
 		goto out;
 	}
 
diff --git a/usr.bin/rcs/rcsdiff.c b/usr.bin/rcs/rcsdiff.c
index 05b7bf6e6ea..aa7328f50b4 100644
--- a/usr.bin/rcs/rcsdiff.c
+++ b/usr.bin/rcs/rcsdiff.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsdiff.c,v 1.51 2006/04/19 06:53:41 xsa Exp $	*/
+/*	$OpenBSD: rcsdiff.c,v 1.52 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -58,8 +58,7 @@ rcsdiff_main(int argc, char **argv)
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
 			if (RCS_KWEXP_INVAL(kflag)) {
-				cvs_log(LP_ERR,
-				    "invalid RCS keyword expansion mode");
+				warnx("invalid RCS keyword expansion mode");
 				(usage)();
 				exit(1);
 			}
@@ -104,7 +103,7 @@ rcsdiff_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc == 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit(1);
 	}
@@ -193,7 +192,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 	diff_rev2 = NULL;
 
 	if (stat(filename, &st) == -1) {
-		cvs_log(LP_ERRNO, "%s", filename);
+		warn("%s", filename);
 		goto out;
 	}
 
@@ -204,7 +203,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 	}
 
 	if ((b1 = rcs_getrev(file, rev)) == NULL) {
-		cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf);
+		warnx("failed to retrieve revision %s", rbuf);
 		goto out;
 	}
 
@@ -213,7 +212,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 	tv[1].tv_sec = tv[0].tv_sec;
 
 	if ((b2 = cvs_buf_load(filename, BUF_AUTOEXT)) == NULL) {
-		cvs_log(LP_ERR, "failed to load file: '%s'", filename);
+		warnx("failed to load file: `%s'", filename);
 		goto out;
 	}
 
@@ -232,7 +231,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 	b1 = NULL;
 
 	if (utimes(path1, (const struct timeval *)&tv) < 0)
-		cvs_log(LP_ERRNO, "error setting utimes");
+		warn("utimes");
 
 	strlcpy(path2, rcs_tmpdir, sizeof(path2));
 	strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
@@ -242,7 +241,7 @@ rcsdiff_file(RCSFILE *file, RCSNUM *rev, const char *filename)
 	b2 = NULL;
 
 	if (utimes(path2, (const struct timeval *)&tv2) < 0)
-		cvs_log(LP_ERRNO, "error setting utimes");
+		warn("utimes");
 
 	cvs_diffreg(path1, path2, NULL);
 	ret = 0;
@@ -278,7 +277,7 @@ rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
 		fprintf(stderr, "retrieving revision %s\n", rbuf1);
 
 	if ((b1 = rcs_getrev(file, rev1)) == NULL) {
-		cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf1);
+		warnx("failed to retrieve revision %s", rbuf1);
 		goto out;
 	}
 
@@ -291,7 +290,7 @@ rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
 		fprintf(stderr, "retrieving revision %s\n", rbuf2);
 
 	if ((b2 = rcs_getrev(file, rev2)) == NULL) {
-		cvs_log(LP_ERR, "failed to retrieve revision %s", rbuf2);
+		warnx("failed to retrieve revision %s", rbuf2);
 		goto out;
 	}
 
@@ -310,7 +309,7 @@ rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
 	b1 = NULL;
 
 	if (utimes(path1, (const struct timeval *)&tv) < 0)
-		cvs_log(LP_ERRNO, "error setting utimes");
+		warn("utimes");
 
 	strlcpy(path2, rcs_tmpdir, sizeof(path2));
 	strlcat(path2, "/diff2.XXXXXXXXXX", sizeof(path2));
@@ -320,7 +319,7 @@ rcsdiff_rev(RCSFILE *file, RCSNUM *rev1, RCSNUM *rev2)
 	b2 = NULL;
 
 	if (utimes(path2, (const struct timeval *)&tv2) < 0)
-		cvs_log(LP_ERRNO, "error setting utimes");
+		warn("utimes");
 
 	cvs_diffreg(path1, path2, NULL);
 	ret = 0;
diff --git a/usr.bin/rcs/rcsmerge.c b/usr.bin/rcs/rcsmerge.c
index a81c1b34663..278aa214845 100644
--- a/usr.bin/rcs/rcsmerge.c
+++ b/usr.bin/rcs/rcsmerge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsmerge.c,v 1.28 2006/04/21 07:06:25 xsa Exp $	*/
+/*	$OpenBSD: rcsmerge.c,v 1.29 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -50,8 +50,7 @@ rcsmerge_main(int argc, char **argv)
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
 			if (RCS_KWEXP_INVAL(kflag)) {
-				cvs_log(LP_ERR,
-				    "invalid RCS keyword expansion mode");
+				warnx("invalid RCS keyword expansion mode");
 				(usage)();
 				exit(1);
 			}
@@ -93,13 +92,13 @@ rcsmerge_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc < 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit(1);
 	}
 
 	if (rev_str1 == NULL) {
-		cvs_log(LP_ERR, "no base revision number given");
+		warnx("no base revision number given");
 		(usage)();
 		exit(1);
 	}
@@ -149,7 +148,7 @@ rcsmerge_main(int argc, char **argv)
 
 		if ((bp = cvs_diff3(file, argv[i], rev1, rev2,
 		    !(flags & QUIET))) == NULL) {
-			cvs_log(LP_ERR, "failed to merge");
+			warnx("failed to merge");
 			rcs_close(file);
 			continue;
 		}
@@ -162,7 +161,7 @@ rcsmerge_main(int argc, char **argv)
 		} else {
 			/* XXX mode */
 			if (cvs_buf_write(bp, argv[i], 0644) < 0)
-				cvs_log(LP_ERR, "failed to write new file");
+				warnx("cvs_buf_write failed");
 
 			cvs_buf_free(bp);
 		}
diff --git a/usr.bin/rcs/rcsprog.c b/usr.bin/rcs/rcsprog.c
index 9c6636baaf3..9e3dda61574 100644
--- a/usr.bin/rcs/rcsprog.c
+++ b/usr.bin/rcs/rcsprog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.c,v 1.109 2006/04/21 07:06:25 xsa Exp $	*/
+/*	$OpenBSD: rcsprog.c,v 1.110 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -95,7 +95,7 @@ rcs_get_mtime(const char *filename)
 	time_t mtime;
 
 	if (stat(filename, &st) == -1) {
-		cvs_log(LP_ERRNO, "failed to stat `%s'", filename);
+		warn("%s", filename);
 		return (-1);
 	}
 	mtime = (time_t)st.st_mtimespec.tv_sec;
@@ -208,9 +208,9 @@ rcs_getopt(int argc, char **argv, const char *optstr)
 	}
 
 	if (ret == 0)
-		cvs_log(LP_ERR, "unknown option -%c", opt);
+		warnx("unknown option -%c", opt);
 	else if (ret == 1)
-		cvs_log(LP_ERR, "missing argument for option -%c", opt);
+		warnx("missing argument for option -%c", opt);
 
 	return (ret);
 }
@@ -352,7 +352,7 @@ rcs_statfile(char *fname, char *out, size_t len)
 	if (stat(rcspath, &st) == -1 && !(flags & RCS_CREATE)) {
 		if (strcmp(__progname, "rcsclean") != 0 &&
 		    strcmp(__progname, "ci") != 0)
-			cvs_log(LP_ERRNO, "%s", rcspath);
+			warn("%s", rcspath);
 		xfree(rcspath);
 		return (-1);
 	}
@@ -374,7 +374,7 @@ rcs_setrevstr(char **str, char *new_str)
 	if (new_str == NULL)
 		return;
 	if (*str != NULL)
-		cvs_log(LP_WARN, "redefinition of revision number");
+		warnx("redefinition of revision number");
 	*str = new_str;
 }
 
@@ -423,7 +423,6 @@ main(int argc, char **argv)
 
 	ret = -1;
 	rcs_optind = 1;
-	cvs_log_init(LD_STD, 0);
 	SLIST_INIT(&rcs_temp_files);
 
 	cmd_argc = 0;
@@ -432,7 +431,7 @@ main(int argc, char **argv)
 		ret = rcs_init(rcsinit, cmd_argv + 1,
 		    RCS_CMD_MAXARG - 1);
 		if (ret < 0) {
-			cvs_log(LP_ERRNO, "failed to prepend RCSINIT options");
+			warnx("failed to prepend RCSINIT options");
 			exit (1);
 		}
 
@@ -526,15 +525,14 @@ rcs_main(int argc, char **argv)
 		case 'k':
 			kflag = rcs_kflag_get(rcs_optarg);
 			if (RCS_KWEXP_INVAL(kflag)) {
-				cvs_log(LP_ERR,
-				    "invalid keyword substitution mode `%s'",
-				    rcs_optarg);
+				warnx("invalid keyword substitution "
+				    "mode `%s'", rcs_optarg);
 				exit(1);
 			}
 			break;
 		case 'L':
 			if (lkmode == RCS_LOCK_LOOSE)
-				cvs_log(LP_WARN, "-U overriden by -L");
+				warnx("-U overriden by -L");
 			lkmode = RCS_LOCK_STRICT;
 			break;
 		case 'l':
@@ -570,7 +568,7 @@ rcs_main(int argc, char **argv)
 			break;
 		case 'U':
 			if (lkmode == RCS_LOCK_STRICT)
-				cvs_log(LP_WARN, "-L overriden by -U");
+				warnx("-L overriden by -U");
 			lkmode = RCS_LOCK_LOOSE;
 			break;
 		case 'u':
@@ -601,7 +599,7 @@ rcs_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc == 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit(1);
 	}
@@ -629,22 +627,20 @@ rcs_main(int argc, char **argv)
 
 		if (logstr != NULL) {
 			if ((logmsg = strchr(logstr, ':')) == NULL) {
-				cvs_log(LP_ERR, "missing log message");
+				warnx("missing log message");
 				rcs_close(file);
 				continue;
 			}
 
 			*logmsg++ = '\0';
 			if ((logrev = rcsnum_parse(logstr)) == NULL) {
-				cvs_log(LP_ERR,
-				    "'%s' bad revision number", logstr);
+				warnx("'%s' bad revision number", logstr);
 				rcs_close(file);
 				continue;
 			}
 
 			if (rcs_rev_setlog(file, logrev, logmsg) < 0) {
-				cvs_log(LP_ERR,
-				    "failed to set logmsg for '%s' to '%s'",
+				warnx("failed to set logmsg for '%s' to '%s'",
 				    logstr, logmsg);
 				rcs_close(file);
 				rcsnum_free(logrev);
@@ -718,7 +714,7 @@ rcs_main(int argc, char **argv)
 				rev = rcsnum_alloc();
 				rcsnum_cpy(file->rf_head, rev, 0);
 			} else if ((rev = rcsnum_parse(lrev)) == NULL) {
-				cvs_log(LP_ERR, "unable to unlock file");
+				warnx("unable to unlock file");
 				rcs_close(file);
 				continue;
 			}
@@ -744,7 +740,7 @@ rcs_main(int argc, char **argv)
 				rev = rcsnum_alloc();
 				rcsnum_cpy(file->rf_head, rev, 0);
 			} else if ((rev = rcsnum_parse(urev)) == NULL) {
-				cvs_log(LP_ERR, "unable to unlock file");
+				warnx("unable to unlock file");
 				rcs_close(file);
 				continue;
 			}
@@ -755,8 +751,7 @@ rcs_main(int argc, char **argv)
 				    fpath, rev_str);
 			if (rcs_lock_remove(file, username, rev) == -1 &&
 			    !(rcsflags & QUIET))
-				cvs_log(LP_ERR,
-				    "%s: warning: No locks are set.", fpath);
+				warnx("%s: warning: No locks are set.", fpath);
 			rcsnum_free(rev);
 		}
 
@@ -828,8 +823,8 @@ rcs_attach_symbol(RCSFILE *file, const char *symname)
 		if (rcs_sym_remove(file, symname) < 0) {
 			if (rcs_errno == RCS_ERR_NOENT &&
 			    !(rcsflags & RCSPROG_NFLAG))
-				cvs_log(LP_WARN,
-				    "can't delete nonexisting symbol %s", symname);
+				warnx("can't delete nonexisting symbol %s",
+				    symname);
 		} else {
 			if (rcsflags & RCSPROG_NFLAG)
 				rm = 0;
diff --git a/usr.bin/rcs/rcsprog.h b/usr.bin/rcs/rcsprog.h
index 15945103a27..a5f5bda7b7f 100644
--- a/usr.bin/rcs/rcsprog.h
+++ b/usr.bin/rcs/rcsprog.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rcsprog.h,v 1.51 2006/04/21 07:06:25 xsa Exp $	*/
+/*	$OpenBSD: rcsprog.h,v 1.52 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * All rights reserved.
@@ -27,6 +27,8 @@
 #ifndef RCSPROG_H
 #define RCSPROG_H
 
+#include <err.h>
+
 #include "log.h"
 #include "rcs.h"
 #include "worklist.h"
diff --git a/usr.bin/rcs/rlog.c b/usr.bin/rcs/rlog.c
index 6283884a17b..d8af2d79989 100644
--- a/usr.bin/rcs/rlog.c
+++ b/usr.bin/rcs/rlog.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rlog.c,v 1.47 2006/04/19 06:53:41 xsa Exp $	*/
+/*	$OpenBSD: rlog.c,v 1.48 2006/04/21 14:18:26 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
  * Copyright (c) 2005, 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -126,13 +126,13 @@ rlog_main(int argc, char **argv)
 	argv += rcs_optind;
 
 	if (argc == 0) {
-		cvs_log(LP_ERR, "no input file");
+		warnx("no input file");
 		(usage)();
 		exit(1);
 	}
 
 	if (hflag == 1 && tflag == 1) {
-		cvs_log(LP_WARN, "warning: -t overrides -h.");
+		warnx("warning: -t overrides -h.");
 		hflag = 0;
 	}