===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/commit.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -c -r1.49 -r1.50
*** src/usr.bin/cvs/commit.c	2005/12/22 14:59:54	1.49
--- src/usr.bin/cvs/commit.c	2005/12/30 02:03:28	1.50
***************
*** 1,4 ****
! /*	$OpenBSD: commit.c,v 1.49 2005/12/22 14:59:54 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: commit.c,v 1.50 2005/12/30 02:03:28 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 187,199 ****
  		return (CVS_EX_DATA);
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		if (cvs_logmsg_send(root, cvs_msg) < 0)
! 			return (CVS_EX_PROTO);
  
  		if (rev != NULL) {
! 			if ((cvs_sendarg(root, "-r", 0) < 0) ||
! 			    (cvs_sendarg(root, rev, 0) < 0))
! 				return (CVS_EX_PROTO);
  		}
  	}
  
--- 187,197 ----
  		return (CVS_EX_DATA);
  
  	if (root->cr_method != CVS_METHOD_LOCAL) {
! 		cvs_logmsg_send(root, cvs_msg);
  
  		if (rev != NULL) {
! 			cvs_sendarg(root, "-r", 0);
! 			cvs_sendarg(root, rev, 0);
  		}
  	}
  
***************
*** 243,252 ****
  	root = CVS_DIR_ROOT(cf);
  
  	if (cf->cf_type == DT_DIR) {
! 		if (cf->cf_cvstat != CVS_FST_UNKNOWN) {
! 			if (cvs_senddir(root, cf) < 0)
! 				return (CVS_EX_PROTO);
! 		}
  		return (0);
  	}
  
--- 241,248 ----
  	root = CVS_DIR_ROOT(cf);
  
  	if (cf->cf_type == DT_DIR) {
! 		if (cf->cf_cvstat != CVS_FST_UNKNOWN)
! 			cvs_senddir(root, cf);
  		return (0);
  	}
  
***************
*** 258,266 ****
  	if ((cf->cf_cvstat == CVS_FST_ADDED) ||
  	    (cf->cf_cvstat == CVS_FST_MODIFIED) ||
  	    (cf->cf_cvstat == CVS_FST_REMOVED)) {
! 		if (cvs_sendentry(root, cf) < 0) {
! 			return (CVS_EX_PROTO);
! 		}
  
  		/* if it's removed, don't bother sending a
  		 * Modified request together with the file its
--- 254,260 ----
  	if ((cf->cf_cvstat == CVS_FST_ADDED) ||
  	    (cf->cf_cvstat == CVS_FST_MODIFIED) ||
  	    (cf->cf_cvstat == CVS_FST_REMOVED)) {
! 		cvs_sendentry(root, cf);
  
  		/* if it's removed, don't bother sending a
  		 * Modified request together with the file its
***************
*** 269,280 ****
  		if (cf->cf_cvstat == CVS_FST_REMOVED)
  			return (0);
  
! 		if (cvs_sendreq(root, CVS_REQ_MODIFIED, cf->cf_name) < 0)
! 			return (CVS_EX_PROTO);
! 
! 		if (cvs_sendfile(root, fpath) < 0) {
! 			return (CVS_EX_PROTO);
! 		}
  	}
  
  	return (0);
--- 263,270 ----
  		if (cf->cf_cvstat == CVS_FST_REMOVED)
  			return (0);
  
! 		cvs_sendreq(root, CVS_REQ_MODIFIED, cf->cf_name);
! 		cvs_sendfile(root, fpath);
  	}
  
  	return (0);