===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/co.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -c -r1.80 -r1.81
*** src/usr.bin/rcs/co.c	2006/04/21 07:06:25	1.80
--- src/usr.bin/rcs/co.c	2006/04/21 14:18:26	1.81
***************
*** 1,4 ****
! /*	$OpenBSD: co.c,v 1.80 2006/04/21 07:06:25 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$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,82 ****
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				cvs_log(LP_ERR,
! 				    "invalid RCS keyword expansion mode");
  				(usage)();
  				exit(1);
  			}
  			break;
  		case 'l':
  			if (flags & CO_UNLOCK) {
! 				cvs_log(LP_ERR, "warning: -u overridden by -l");
  				flags &= ~CO_UNLOCK;
  			}
  			rcs_setrevstr(&rev_str, rcs_optarg);
--- 68,81 ----
  		case 'k':
  			kflag = rcs_kflag_get(rcs_optarg);
  			if (RCS_KWEXP_INVAL(kflag)) {
! 				warnx("invalid RCS keyword expansion mode");
  				(usage)();
  				exit(1);
  			}
  			break;
  		case 'l':
  			if (flags & CO_UNLOCK) {
! 				warnx("warning: -u overridden by -l");
  				flags &= ~CO_UNLOCK;
  			}
  			rcs_setrevstr(&rev_str, rcs_optarg);
***************
*** 107,113 ****
  		case 'u':
  			rcs_setrevstr(&rev_str, rcs_optarg);
  			if (flags & CO_LOCK) {
! 				cvs_log(LP_ERR, "warning: -l overridden by -u");
  				flags &= ~CO_LOCK;
  			}
  			flags |= CO_UNLOCK;
--- 106,112 ----
  		case 'u':
  			rcs_setrevstr(&rev_str, rcs_optarg);
  			if (flags & CO_LOCK) {
! 				warnx("warning: -l overridden by -u");
  				flags &= ~CO_LOCK;
  			}
  			flags |= CO_UNLOCK;
***************
*** 144,158 ****
  	argv += rcs_optind;
  
  	if (argc == 0) {
! 		cvs_log(LP_ERR, "no input file");
  		(usage)();
  		exit (1);
  	}
  
! 	if ((username = getlogin()) == NULL) {
! 		cvs_log(LP_ERRNO, "failed to get username");
! 		exit (1);
! 	}
  
  	for (i = 0; i < argc; i++) {
  		if (rcs_statfile(argv[i], fpath, sizeof(fpath)) < 0)
--- 143,155 ----
  	argv += rcs_optind;
  
  	if (argc == 0) {
! 		warnx("no input file");
  		(usage)();
  		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,169 ****
  			    (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);
  			continue;
  		}
  
--- 160,166 ----
  			    (flags & PIPEOUT) ? "standard output" : argv[i]);
  
  		if ((flags & CO_LOCK) && (kflag & RCS_KWEXP_VAL)) {
! 			warnx("%s: cannot combine -kv and -l", fpath);
  			continue;
  		}
  
***************
*** 287,294 ****
  	rdp = NULL;
  	if (file->rf_ndelta != 0 && frev == file->rf_head) {
  		if (lcount > 1) {
! 			cvs_log(LP_WARN,
! 			    "multiple revisions locked by %s; "
  			    "please specify one", lockname);
  			return (-1);
  		}
--- 284,290 ----
  	rdp = NULL;
  	if (file->rf_ndelta != 0 && frev == file->rf_head) {
  		if (lcount > 1) {
! 			warnx("multiple revisions locked by %s; "
  			    "please specify one", lockname);
  			return (-1);
  		}
***************
*** 338,344 ****
  				    sizeof(msg));
  			}
  
! 			cvs_log(LP_ERR, msg, buf, rdp->rd_locker);
  			return (-1);
  		}
  	}
--- 334,340 ----
  				    sizeof(msg));
  			}
  
! 			warnx(msg, buf, rdp->rd_locker);
  			return (-1);
  		}
  	}
***************
*** 352,358 ****
  
  	if (file->rf_ndelta != 0) {
  		if ((bp = rcs_getrev(file, rev)) == NULL) {
! 			cvs_log(LP_ERR, "cannot find revision `%s'", buf);
  			return (-1);
  		}
  	} else {
--- 348,354 ----
  
  	if (file->rf_ndelta != 0) {
  		if ((bp = rcs_getrev(file, rev)) == NULL) {
! 			warnx("cannot find revision `%s'", buf);
  			return (-1);
  		}
  	} else {
***************
*** 413,419 ****
  
  	if (file->rf_ndelta == 0 &&
  	    ((flags & CO_LOCK) || (flags & CO_UNLOCK))) {
! 		cvs_log(LP_WARN, "no revisions, so nothing can be %s",
  		    (flags & CO_LOCK) ? "locked" : "unlocked");
  	} else if (file->rf_ndelta != 0) {
  		if (!(flags & QUIET) && !(flags & NEWFILE))
--- 409,415 ----
  
  	if (file->rf_ndelta == 0 &&
  	    ((flags & CO_LOCK) || (flags & CO_UNLOCK))) {
! 		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,430 ****
  		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.",
  			    file->rf_path, lcount);
  	}
  
--- 420,426 ----
  		if (rcs_errno != RCS_ERR_DUPENT)
  			lcount++;
  		if (!(flags & QUIET) && lcount > 1 && !(flags & CO_REVERT))
! 			warnx("%s: warning: You now have %d locks.",
  			    file->rf_path, lcount);
  	}
  
***************
*** 450,460 ****
  		/* default is n */
  		if (cvs_yesno() == -1) {
  			if (!(flags & QUIET) && isatty(STDIN_FILENO))
! 				cvs_log(LP_ERR,
! 				    "writable %s exists; checkout aborted",
! 				    dst);
  			else
! 				cvs_log(LP_ERR, "checkout aborted");
  			return (-1);
  		}
  	}
--- 446,455 ----
  		/* default is n */
  		if (cvs_yesno() == -1) {
  			if (!(flags & QUIET) && isatty(STDIN_FILENO))
! 				warnx("writable %s exists; "
! 				    "checkout aborted", dst);
  			else
! 				warnx("checkout aborted");
  			return (-1);
  		}
  	}
***************
*** 466,472 ****
  		xfree(content);
  	} else {
  		if (cvs_buf_write(bp, dst, mode) < 0) {
! 			cvs_log(LP_ERR, "failed to write revision to file");
  			cvs_buf_free(bp);
  			return (-1);
  		}
--- 461,467 ----
  		xfree(content);
  	} else {
  		if (cvs_buf_write(bp, dst, mode) < 0) {
! 			warnx("failed to write revision to file");
  			cvs_buf_free(bp);
  			return (-1);
  		}
***************
*** 477,483 ****
  			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");
  		}
  	}
  
--- 472,478 ----
  			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)
! 				warn("utimes");
  		}
  	}
  
***************
*** 498,504 ****
  	if (!(flags & CO_STATE))
  		state = NULL;
  
! 	cvs_log(LP_ERR, "%s: No revision on branch has%s%s%s%s%s%s.",
  	    file->rf_path,
  	    date ? " a date before " : "",
  	    date ? date : "",
--- 493,499 ----
  	if (!(flags & CO_STATE))
  		state = NULL;
  
! 	warnx("%s: No revision on branch has%s%s%s%s%s%s.",
  	    file->rf_path,
  	    date ? " a date before " : "",
  	    date ? date : "",