===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/util.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/cvs/util.c	2005/07/26 14:46:24	1.44
--- src/usr.bin/cvs/util.c	2005/07/27 10:36:14	1.45
***************
*** 1,4 ****
! /*	$OpenBSD: util.c,v 1.44 2005/07/26 14:46:24 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: util.c,v 1.45 2005/07/27 10:36:14 xsa Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 541,553 ****
  }
  
  /*
!  * cvs_remove_dir()
   *
   * Remove a directory tree from disk.
   * Returns 0 on success, or -1 on failure.
   */
  int
! cvs_remove_dir(const char *path)
  {
  	int ret = -1;
  	size_t len;
--- 541,553 ----
  }
  
  /*
!  * cvs_rmdir()
   *
   * Remove a directory tree from disk.
   * Returns 0 on success, or -1 on failure.
   */
  int
! cvs_rmdir(const char *path)
  {
  	int ret = -1;
  	size_t len;
***************
*** 570,576 ****
  			goto done;
  
  		if (ent->d_type == DT_DIR) {
! 			if (cvs_remove_dir(fpath) == -1)
  				goto done;
  		} else if ((cvs_unlink(fpath) == -1) && (errno != ENOENT))
  			goto done;
--- 570,576 ----
  			goto done;
  
  		if (ent->d_type == DT_DIR) {
! 			if (cvs_rmdir(fpath) == -1)
  				goto done;
  		} else if ((cvs_unlink(fpath) == -1) && (errno != ENOENT))
  			goto done;