===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/rcsprog.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -c -r1.97 -r1.98
*** src/usr.bin/rcs/rcsprog.c	2006/04/12 08:23:30	1.97
--- src/usr.bin/rcs/rcsprog.c	2006/04/12 22:54:23	1.98
***************
*** 1,4 ****
! /*	$OpenBSD: rcsprog.c,v 1.97 2006/04/12 08:23:30 ray Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcsprog.c,v 1.98 2006/04/12 22:54:23 ray Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 682,687 ****
--- 682,688 ----
  		if (rcsflags & RCSPROG_LFLAG) {
  			RCSNUM *rev;
  			const char *username;
+ 			char rev_str[16];
  
  			if ((username = getlogin()) == NULL)
  				fatal("could not get username");
***************
*** 693,709 ****
  				rcs_close(file);
  				continue;
  			}
  			/* Make sure revision exists. */
  			if (rcs_findrev(file, rev) == NULL)
! 				fatal("revision does not exist");
! 			if (rcs_lock_add(file, username, rev) == -1)
! 				fatal("unable to lock file");
  			rcsnum_free(rev);
  		}
  
  		if (rcsflags & RCSPROG_UFLAG) {
  			RCSNUM *rev;
  			const char *username;
  
  			if ((username = getlogin()) == NULL)
  				fatal("could not get username");
--- 694,714 ----
  				rcs_close(file);
  				continue;
  			}
+ 			rcsnum_tostr(rev, rev_str, sizeof(rev_str));
  			/* Make sure revision exists. */
  			if (rcs_findrev(file, rev) == NULL)
! 				fatal("%s: can't lock nonexisting revision %s",
! 				    fpath, rev_str);
! 			if (rcs_lock_add(file, username, rev) != -1 &&
! 			    verbose == 1)
! 				printf("%s locked\n", rev_str);
  			rcsnum_free(rev);
  		}
  
  		if (rcsflags & RCSPROG_UFLAG) {
  			RCSNUM *rev;
  			const char *username;
+ 			char rev_str[16];
  
  			if ((username = getlogin()) == NULL)
  				fatal("could not get username");
***************
*** 715,725 ****
  				rcs_close(file);
  				continue;
  			}
  			/* Make sure revision exists. */
  			if (rcs_findrev(file, rev) == NULL)
! 				fatal("revision does not exist");
! 			if (rcs_lock_remove(file, username, rev) == -1)
! 				fatal("unable to unlock file");
  			rcsnum_free(rev);
  		}
  
--- 720,734 ----
  				rcs_close(file);
  				continue;
  			}
+ 			rcsnum_tostr(rev, rev_str, sizeof(rev_str));
  			/* Make sure revision exists. */
  			if (rcs_findrev(file, rev) == NULL)
! 				fatal("%s: can't unlock nonexisting revision %s",
! 				    fpath, rev_str);
! 			if (rcs_lock_remove(file, username, rev) == -1 &&
! 			    verbose == 1)
! 				cvs_log(LP_ERR,
! 				    "%s: warning: No locks are set.", fpath);
  			rcsnum_free(rev);
  		}