===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/cmd.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/cvs/cmd.c	2005/03/29 03:10:27	1.3
--- src/usr.bin/cvs/cmd.c	2005/03/31 15:47:17	1.4
***************
*** 1,4 ****
! /*	$OpenBSD: cmd.c,v 1.3 2005/03/29 03:10:27 joris Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: cmd.c,v 1.4 2005/03/31 15:47:17 joris Exp $	*/
  /*
   * Copyright (c) 2005 Joris Vink <joris@openbsd.org>
   * All rights reserved.
***************
*** 52,58 ****
  	struct cvs_cmd_info *c = cmd->cmd_info;
  
  	if (c->cmd_options != NULL) {
! 		if ((ret = c->cmd_options(cmd->cmd_opts, argc, argv, &i)) < 0)
  			return (ret);
  
  		argc -= i;
--- 52,58 ----
  	struct cvs_cmd_info *c = cmd->cmd_info;
  
  	if (c->cmd_options != NULL) {
! 		if ((ret = c->cmd_options(cmd->cmd_opts, argc, argv, &i)))
  			return (ret);
  
  		argc -= i;
***************
*** 67,73 ****
  	if (cvs_files == NULL)
  		return (EX_DATAERR);
  
! 	if ((c->cmd_helper != NULL) && ((ret = c->cmd_helper()) < 0))
  		return (ret);
  
  	root = CVS_DIR_ROOT(cvs_files);
--- 67,73 ----
  	if (cvs_files == NULL)
  		return (EX_DATAERR);
  
! 	if ((c->cmd_helper != NULL) && ((ret = c->cmd_helper())))
  		return (ret);
  
  	root = CVS_DIR_ROOT(cvs_files);
***************
*** 90,97 ****
  			}
  		}
  
! 		if (c->cmd_sendflags != NULL)
! 			c->cmd_sendflags(root);
  
  		if (c->cmd_flags & CVS_CMD_NEEDLOG) {
  			if (cvs_logmsg_send(root, cvs_msg) < 0)
--- 90,99 ----
  			}
  		}
  
! 		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)