===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/admin.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/cvs/admin.c	2005/04/03 17:32:50	1.8
--- src/usr.bin/cvs/admin.c	2005/04/11 17:56:27	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: admin.c,v 1.8 2005/04/03 17:32:50 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: admin.c,v 1.9 2005/04/11 17:56:27 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
***************
*** 111,117 ****
  				cvs_log(LP_ERR,
  				    "invalid RCS keyword expansion mode");
  				rcs_kflag_usage();
! 				return (EX_USAGE);
  			}
  			break;
  		case 'l':
--- 111,117 ----
  				cvs_log(LP_ERR,
  				    "invalid RCS keyword expansion mode");
  				rcs_kflag_usage();
! 				return (1);
  			}
  			break;
  		case 'l':
***************
*** 151,157 ****
  			strictlock |= LOCK_REMOVE;
  			break;
  		default:
! 			return (EX_USAGE);
  		}
  	}
  
--- 151,157 ----
  			strictlock |= LOCK_REMOVE;
  			break;
  		default:
! 			return (1);
  		}
  	}
  
***************
*** 168,174 ****
  		if ((rcs = rcsnum_parse(lockrev_arg)) == NULL) {
  			cvs_log(LP_ERR, "%s is not a numeric branch",
  			    lockrev_arg);
! 			return (EX_USAGE);
  		}
  		rcsnum_free(rcs);
  	}
--- 168,174 ----
  		if ((rcs = rcsnum_parse(lockrev_arg)) == NULL) {
  			cvs_log(LP_ERR, "%s is not a numeric branch",
  			    lockrev_arg);
! 			return (1);
  		}
  		rcsnum_free(rcs);
  	}
***************
*** 185,191 ****
  	if (replace_msg != NULL) {
  		if ((q = strchr(replace_msg, ':')) == NULL) {
  			cvs_log(LP_ERR, "invalid option for -m");
! 			return (EX_USAGE);
  		}
  		*q = '\0';
  		if ((rcs = rcsnum_parse(replace_msg)) == NULL) {
--- 185,191 ----
  	if (replace_msg != NULL) {
  		if ((q = strchr(replace_msg, ':')) == NULL) {
  			cvs_log(LP_ERR, "invalid option for -m");
! 			return (1);
  		}
  		*q = '\0';
  		if ((rcs = rcsnum_parse(replace_msg)) == NULL) {