rename cvs_remove_dir() to cvs_rmdir() because it might be confusing

with the `remove' command local functions. ok joris@.

5 files changed, 12 insertions, 16 deletions

diff --git a/usr.bin/cvs/cvs.h b/usr.bin/cvs/cvs.h
index 6996f6b44ad..7249a5e1aa9 100644
--- a/usr.bin/cvs/cvs.h
+++ b/usr.bin/cvs/cvs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cvs.h,v 1.74 2005/07/25 11:28:59 xsa Exp $	*/
+/*	$OpenBSD: cvs.h,v 1.75 2005/07/27 10:36:13 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -399,7 +399,7 @@ int	  cvs_exec(int, char **, int []);
 int	  cvs_getargv(const char *, char **, int);
 int	  cvs_chdir(const char *);
 int	  cvs_unlink(const char *);
-int	  cvs_remove_dir(const char *);
+int	  cvs_rmdir(const char *);
 int	  cvs_create_dir(const char *, int, char *, char *);
 char	 *cvs_rcs_getpath(CVSFILE *, char *, size_t);
 char	**cvs_makeargv(const char *, int *);
diff --git a/usr.bin/cvs/file.c b/usr.bin/cvs/file.c
index c51f57e4be5..8284525b87a 100644
--- a/usr.bin/cvs/file.c
+++ b/usr.bin/cvs/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.105 2005/07/25 12:58:22 joris Exp $	*/
+/*	$OpenBSD: file.c,v 1.106 2005/07/27 10:36:14 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -1381,7 +1381,7 @@ cvs_file_prune(char *path)
 
 	empty = (empty == 0);
 	if (empty) {
-		if (cvs_remove_dir(path) < 0) {
+		if (cvs_rmdir(path) < 0) {
 			cvs_log(LP_ERR, "failed to prune `%s'", path);
 			empty = 0;
 		}
diff --git a/usr.bin/cvs/release.c b/usr.bin/cvs/release.c
index 131cf35029a..3b49250396a 100644
--- a/usr.bin/cvs/release.c
+++ b/usr.bin/cvs/release.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: release.c,v 1.18 2005/07/25 12:13:08 xsa Exp $	*/
+/*	$OpenBSD: release.c,v 1.19 2005/07/27 10:36:14 xsa Exp $	*/
 /*
  * Copyright (c) 2005 Xavier Santolaria <xsa@openbsd.org>
  * All rights reserved.
@@ -223,12 +223,8 @@ cvs_release_dir(CVSFILE *cf, void *arg)
 				return (CVS_EX_FILE);
 
 			if (dflag == 1) {
-				if (!cvs_noexec && cvs_remove_dir(dpath) != 0) {
-					cvs_log(LP_ERRNO,
-					    "deletion of directory `%s' failed",
-					    dpath);
+				if (cvs_rmdir(dpath) != 0)
 					return (CVS_EX_FILE);
-				}
 			}
 		}
 	} else {
diff --git a/usr.bin/cvs/server.c b/usr.bin/cvs/server.c
index 5045d5b159b..2ef98a6c625 100644
--- a/usr.bin/cvs/server.c
+++ b/usr.bin/cvs/server.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: server.c,v 1.19 2005/07/23 10:59:47 xsa Exp $	*/
+/*	$OpenBSD: server.c,v 1.20 2005/07/27 10:36:14 xsa Exp $	*/
 /*
  * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
  * All rights reserved.
@@ -126,7 +126,7 @@ cvs_server(int argc, char **argv)
 	}
 
 	/* cleanup the temporary tree */
-	ret = cvs_remove_dir(cvs_server_tmpdir);
+	ret = cvs_rmdir(cvs_server_tmpdir);
 
 	return (ret);
 }
diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c
index 73804ba8fb0..3d8948a6b1a 100644
--- a/usr.bin/cvs/util.c
+++ b/usr.bin/cvs/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.44 2005/07/26 14:46:24 joris Exp $	*/
+/*	$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,13 +541,13 @@ cvs_unlink(const char *path)
 }
 
 /*
- * cvs_remove_dir()
+ * cvs_rmdir()
  *
  * Remove a directory tree from disk.
  * Returns 0 on success, or -1 on failure.
  */
 int
-cvs_remove_dir(const char *path)
+cvs_rmdir(const char *path)
 {
 	int ret = -1;
 	size_t len;
@@ -570,7 +570,7 @@ cvs_remove_dir(const char *path)
 			goto done;
 
 		if (ent->d_type == DT_DIR) {
-			if (cvs_remove_dir(fpath) == -1)
+			if (cvs_rmdir(fpath) == -1)
 				goto done;
 		} else if ((cvs_unlink(fpath) == -1) && (errno != ENOENT))
 			goto done;