===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/edit.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/cvs/edit.c	2005/10/10 17:51:53	1.9
--- src/usr.bin/cvs/edit.c	2005/12/30 02:03:28	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: edit.c,v 1.9 2005/10/10 17:51:53 xsa Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: edit.c,v 1.10 2005/12/30 02:03:28 joris Exp $	*/
  /*
   * Copyright (c) 2005 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 172,217 ****
  static int
  cvs_editors_remote(CVSFILE *cf, void *arg)
  {
- 	int ret;
  	struct cvsroot *root;
  
- 	ret = 0;
  	root = CVS_DIR_ROOT(cf);
  
  	if (cf->cf_type == DT_DIR) {
  		if (cf->cf_cvstat == CVS_FST_UNKNOWN)
! 			ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE,
! 			    cf->cf_name);
  		else
! 			ret = cvs_senddir(root, cf);
! 
! 		if (ret == -1)
! 			ret = CVS_EX_PROTO;
! 
! 		return (ret);
  	}
  
! 	if (cvs_sendentry(root, cf) < 0)
! 		return (CVS_EX_PROTO);
  
  	switch (cf->cf_cvstat) {
  	case CVS_FST_UNKNOWN:
! 		ret = cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name);
  		break;
  	case CVS_FST_UPTODATE:
! 		ret = cvs_sendreq(root, CVS_REQ_UNCHANGED, cf->cf_name);
  		break;
  	case CVS_FST_ADDED:
  	case CVS_FST_MODIFIED:
! 		ret = cvs_sendreq(root, CVS_REQ_ISMODIFIED, cf->cf_name);
  		break;
  	default:
  		break;
  	}
  
! 
! 	if (ret == -1)
! 		ret = CVS_EX_PROTO;
! 
! 	return (ret);
  }
--- 172,205 ----
  static int
  cvs_editors_remote(CVSFILE *cf, void *arg)
  {
  	struct cvsroot *root;
  
  	root = CVS_DIR_ROOT(cf);
  
  	if (cf->cf_type == DT_DIR) {
  		if (cf->cf_cvstat == CVS_FST_UNKNOWN)
! 			cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name);
  		else
! 			cvs_senddir(root, cf);
! 		return (0);
  	}
  
! 	cvs_sendentry(root, cf);
  
  	switch (cf->cf_cvstat) {
  	case CVS_FST_UNKNOWN:
! 		cvs_sendreq(root, CVS_REQ_QUESTIONABLE, cf->cf_name);
  		break;
  	case CVS_FST_UPTODATE:
! 		cvs_sendreq(root, CVS_REQ_UNCHANGED, cf->cf_name);
  		break;
  	case CVS_FST_ADDED:
  	case CVS_FST_MODIFIED:
! 		cvs_sendreq(root, CVS_REQ_ISMODIFIED, cf->cf_name);
  		break;
  	default:
  		break;
  	}
  
! 	return (0);
  }