===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cmd.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/cmd.c	2005/04/01 09:44:00	1.6
--- src/usr.bin/cvs/cmd.c	2005/04/03 17:32:50	1.7
***************
*** 1,4 ****
! /*	$OpenBSD: cmd.c,v 1.6 2005/04/01 09:44:00 joris Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cmd.c,v 1.7 2005/04/03 17:32:50 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 60,66 ****
  	}
  
  	if (c->cmd_options != NULL) {
! 		if ((ret = c->cmd_options(cmd->cmd_opts, argc, argv, &i)))
  			return (ret);
  
  		argc -= i;
--- 60,66 ----
  	}
  
  	if (c->cmd_options != NULL) {
! 		if ((ret = c->cmd_options(cmd->cmd_opts, argc, argv, &i)) < 0)
  			return (ret);
  
  		argc -= i;
***************
*** 73,81 ****
  		cvs_files = cvs_file_get(".", c->file_flags);
  
  	if (cvs_files == NULL)
! 		return (EX_DATAERR);
  
! 	if ((c->cmd_helper != NULL) && ((ret = c->cmd_helper())))
  		return (ret);
  
  	root = CVS_DIR_ROOT(cvs_files);
--- 73,81 ----
  		cvs_files = cvs_file_get(".", c->file_flags);
  
  	if (cvs_files == NULL)
! 		return (-1);
  
! 	if ((c->cmd_helper != NULL) && ((ret = c->cmd_helper()) < 0))
  		return (ret);
  
  	root = CVS_DIR_ROOT(cvs_files);
***************
*** 89,111 ****
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if (cvs_connect(root) < 0)
! 			return (EX_PROTOCOL);
  
  		if (c->cmd_flags & CVS_CMD_SENDARGS1) {
  			for (i = 0; i < argc; i++) {
  				if (cvs_sendarg(root, argv[i], 0) < 0)
! 					return (EX_PROTOCOL);
  			}
  		}
  
  		if (c->cmd_sendflags != NULL) {
! 			if ((ret = c->cmd_sendflags(root)))
  				return (ret);
  		}
  
  		if (c->cmd_flags & CVS_CMD_NEEDLOG) {
  			if (cvs_logmsg_send(root, cvs_msg) < 0)
! 				return (EX_PROTOCOL);
  		}
  	}
  
--- 89,111 ----
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if (cvs_connect(root) < 0)
! 			return (-1);
  
  		if (c->cmd_flags & CVS_CMD_SENDARGS1) {
  			for (i = 0; i < argc; i++) {
  				if (cvs_sendarg(root, argv[i], 0) < 0)
! 					return (-1);
  			}
  		}
  
  		if (c->cmd_sendflags != NULL) {
! 			if ((ret = c->cmd_sendflags(root)) < 0)
  				return (ret);
  		}
  
  		if (c->cmd_flags & CVS_CMD_NEEDLOG) {
  			if (cvs_logmsg_send(root, cvs_msg) < 0)
! 				return (-1);
  		}
  	}
  
***************
*** 121,139 ****
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if (c->cmd_flags & CVS_CMD_SENDDIR) {
  			if (cvs_senddir(root, cvs_files) < 0)
! 				return (EX_PROTOCOL);
  		}
  
  		if (c->cmd_flags & CVS_CMD_SENDARGS2) {
  			for (i = 0; i < argc; i++) {
  				if (cvs_sendarg(root, argv[i], 0) < 0)
! 					return (EX_PROTOCOL);
  			}
  		}
  
  		if (cvs_sendreq(root, c->cmd_req,
  		    (cmd->cmd_op == CVS_OP_INIT) ? root->cr_dir : NULL) < 0)
! 			return (EX_PROTOCOL);
  	}
  
  	return (0);
--- 121,139 ----
  	if (root->cr_method != CVS_METHOD_LOCAL) {
  		if (c->cmd_flags & CVS_CMD_SENDDIR) {
  			if (cvs_senddir(root, cvs_files) < 0)
! 				return (-1);
  		}
  
  		if (c->cmd_flags & CVS_CMD_SENDARGS2) {
  			for (i = 0; i < argc; i++) {
  				if (cvs_sendarg(root, argv[i], 0) < 0)
! 					return (-1);
  			}
  		}
  
  		if (cvs_sendreq(root, c->cmd_req,
  		    (cmd->cmd_op == CVS_OP_INIT) ? root->cr_dir : NULL) < 0)
! 			return (-1);
  	}
  
  	return (0);