===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/tag.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/cvs/tag.c	2005/04/11 18:02:58	1.10
--- src/usr.bin/cvs/tag.c	2005/04/12 14:58:40	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: tag.c,v 1.10 2005/04/11 18:02:58 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tag.c,v 1.11 2005/04/12 14:58:40 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * Copyright (c) 2004 Joris Vink <joris@openbsd.org>
***************
*** 83,89 ****
  			old_tag = optarg;
  			break;
  		default:
! 			return (1);
  		}
  	}
  
--- 83,89 ----
  			old_tag = optarg;
  			break;
  		default:
! 			return (CVS_EX_USAGE);
  		}
  	}
  
***************
*** 92,98 ****
  	argv += optind;
  
  	if (argc == 0) {
! 		return (1);
  	} else {
  		tag = argv[0];
  		argc--;
--- 92,98 ----
  	argv += optind;
  
  	if (argc == 0) {
! 		return (CVS_EX_USAGE);
  	} else {
  		tag = argv[0];
  		argc--;
***************
*** 113,119 ****
  
  	if (old_tag != NULL && date != NULL) {
  		cvs_log(LP_ERROR, "-r and -D options are mutually exclusive");
! 		return (-1);
  	}
  
  	return (0);
--- 113,119 ----
  
  	if (old_tag != NULL && date != NULL) {
  		cvs_log(LP_ERROR, "-r and -D options are mutually exclusive");
! 		return (CVS_EX_USAGE);
  	}
  
  	return (0);
***************
*** 123,147 ****
  cvs_tag_sendflags(struct cvsroot *root)
  {
  	if (branch && (cvs_sendarg(root, "-b", 0) < 0))
! 		return (-1);
  
  	if (delete && (cvs_sendarg(root, "-d", 0) < 0))
! 		return (-1);
  
  	if (old_tag) {
  		if ((cvs_sendarg(root, "-r", 0) < 0) ||
  		    (cvs_sendarg(root, old_tag, 0) < 0))
! 			return (-1);
  	}
  
  	if (date) {
  		if ((cvs_sendarg(root, "-D", 0) < 0) ||
  		    (cvs_sendarg(root, date, 0) < 0))
! 			return (-1);
  	}
  
  	if (cvs_sendarg(root, tag, 0) < 0)
! 		return (-1);
  
  	return (0);
  }
--- 123,147 ----
  cvs_tag_sendflags(struct cvsroot *root)
  {
  	if (branch && (cvs_sendarg(root, "-b", 0) < 0))
! 		return (CVS_EX_PROTO);
  
  	if (delete && (cvs_sendarg(root, "-d", 0) < 0))
! 		return (CVS_EX_PROTO);
  
  	if (old_tag) {
  		if ((cvs_sendarg(root, "-r", 0) < 0) ||
  		    (cvs_sendarg(root, old_tag, 0) < 0))
! 			return (CVS_EX_PROTO);
  	}
  
  	if (date) {
  		if ((cvs_sendarg(root, "-D", 0) < 0) ||
  		    (cvs_sendarg(root, date, 0) < 0))
! 			return (CVS_EX_PROTO);
  	}
  
  	if (cvs_sendarg(root, tag, 0) < 0)
! 		return (CVS_EX_PROTO);
  
  	return (0);
  }
***************
*** 167,173 ****
  
  	if ((root->cr_method != CVS_METHOD_LOCAL) && (cfp->cf_type == DT_DIR)) {
  		if (cvs_senddir(root, cfp) < 0)
! 			return (-1);
  		return (0);
  	}
  
--- 167,173 ----
  
  	if ((root->cr_method != CVS_METHOD_LOCAL) && (cfp->cf_type == DT_DIR)) {
  		if (cvs_senddir(root, cfp) < 0)
! 			return (CVS_EX_PROTO);
  		return (0);
  	}
  
***************
*** 177,183 ****
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if ((entp != NULL) && (cvs_sendentry(root, entp) < 0)) {
  			cvs_ent_free(entp);
! 			return (-1);
  		}
  
  		switch (cfp->cf_cvstat) {
--- 177,183 ----
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if ((entp != NULL) && (cvs_sendentry(root, entp) < 0)) {
  			cvs_ent_free(entp);
! 			return (CVS_EX_PROTO);
  		}
  
  		switch (cfp->cf_cvstat) {
***************
*** 213,219 ****
  		if (rf == NULL) {
  			if (entp != NULL)
  				cvs_ent_free(entp);
! 			return (-1);
  		}
  
  		rcs_close(rf);
--- 213,219 ----
  		if (rf == NULL) {
  			if (entp != NULL)
  				cvs_ent_free(entp);
! 			return (CVS_EX_DATA);
  		}
  
  		rcs_close(rf);