===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/co.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -c -r1.96 -r1.97
*** src/usr.bin/rcs/co.c	2006/08/01 05:14:17	1.96
--- src/usr.bin/rcs/co.c	2006/08/07 20:55:28	1.97
***************
*** 1,4 ****
! /*	$OpenBSD: co.c,v 1.96 2006/08/01 05:14:17 ray Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: co.c,v 1.97 2006/08/07 20:55:28 ray Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 239,245 ****
  	struct stat st;
  	struct rcs_delta *rdp;
  	struct rcs_lock *lkp;
! 	char msg[128], *fdate;
  	time_t rcsdate, givendate;
  	RCSNUM *rev;
  
--- 239,245 ----
  	struct stat st;
  	struct rcs_delta *rdp;
  	struct rcs_lock *lkp;
! 	char *fdate;
  	time_t rcsdate, givendate;
  	RCSNUM *rev;
  
***************
*** 320,336 ****
  
  	if (file->rf_ndelta != 0 && rdp->rd_locker != NULL) {
  		if (strcmp(lockname, rdp->rd_locker)) {
! 			if (strlcpy(msg, "Revision %s is already locked by %s; ",
! 			    sizeof(msg)) >= sizeof(msg))
! 				errx(1, "msg too long");
! 
! 			if (flags & CO_UNLOCK) {
! 				if (strlcat(msg, "use co -r or rcs -u",
! 				    sizeof(msg)) >= sizeof(msg))
! 					errx(1, "msg too long");
! 			}
! 
! 			warnx(msg, buf, rdp->rd_locker);
  			return (-1);
  		}
  	}
--- 320,328 ----
  
  	if (file->rf_ndelta != 0 && rdp->rd_locker != NULL) {
  		if (strcmp(lockname, rdp->rd_locker)) {
! 			warnx("Revision %s is already locked by %s; %s",
! 			    buf, rdp->rd_locker,
! 			    (flags & CO_UNLOCK) ? "use co -r or rcs -u" : "");
  			return (-1);
  		}
  	}