From c0d18d1dce06ff71db85286c076f3582a18a2410 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 1 Dec 2003 06:07:16 +0000
Subject: [PATCH] Do not require -i0 when -o is used.

---
 bin/cpdup/cpdup.1 | 6 +++---
 bin/cpdup/cpdup.c | 6 +++---
 bin/cpdup/misc.c  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/cpdup/cpdup.1 b/bin/cpdup/cpdup.1
index 858f871ae1..f9c9fa4189 100644
--- a/bin/cpdup/cpdup.1
+++ b/bin/cpdup/cpdup.1
@@ -3,7 +3,7 @@
 .\"    USE WITH EXTREME CAUTION.
 .\"
 .\"
-.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.1 2003/12/01 02:20:14 dillon Exp $
+.\" $DragonFly: src/bin/cpdup/cpdup.1,v 1.2 2003/12/01 06:07:16 dillon Exp $
 .Dd October 28, 1999
 .Dt CPDUP 1
 .Os BSD 4
@@ -25,10 +25,10 @@
 .Ar file
 .Oc
 .Oo
-.Fl x
+.Fl X
 .Ar file
 .Oc
-.Op Fl X
+.Op Fl x
 .Ar source_dir
 .Ar target_dir
 .Sh DESCRIPTION
diff --git a/bin/cpdup/cpdup.c b/bin/cpdup/cpdup.c
index 0c7366034b..b8cd5d32ce 100644
--- a/bin/cpdup/cpdup.c
+++ b/bin/cpdup/cpdup.c
@@ -42,7 +42,7 @@
  *
  *	- Can do MD5 consistancy checks
  *
- * $DragonFly: src/bin/cpdup/cpdup.c,v 1.1 2003/12/01 02:20:14 dillon Exp $
+ * $DragonFly: src/bin/cpdup/cpdup.c,v 1.2 2003/12/01 06:07:16 dillon Exp $
  */
 
 /*-
@@ -855,7 +855,7 @@ RemoveRecur(const char *dpath, int devNo)
 		    }
 		    closedir(dir);
 		}
-		if (AskConfirmation) {
+		if (AskConfirmation && NoRemoveOpt == 0) {
 		    if (YesNo(dpath)) {
 			if (rmdir(dpath) < 0) {
 			    logerr("%-32s rmdir failed: %s\n",
@@ -879,7 +879,7 @@ RemoveRecur(const char *dpath, int devNo)
 		    }
 		}
 	    } else {
-		if (AskConfirmation) {
+		if (AskConfirmation && NoRemoveOpt == 0) {
 		    if (YesNo(dpath)) {
 			if (remove(dpath) < 0) {
 			    logerr("%-32s remove failed: %s\n",
diff --git a/bin/cpdup/misc.c b/bin/cpdup/misc.c
index 77b9282053..8b0c1b2873 100644
--- a/bin/cpdup/misc.c
+++ b/bin/cpdup/misc.c
@@ -1,7 +1,7 @@
 /*
  * MISC.C
  *
- * $DragonFly: src/bin/cpdup/misc.c,v 1.1 2003/12/01 02:20:14 dillon Exp $
+ * $DragonFly: src/bin/cpdup/misc.c,v 1.2 2003/12/01 06:07:16 dillon Exp $
  */
 
 #include "cpdup.h"
@@ -61,7 +61,7 @@ fatal(const char *ctl, ...)
 	     "                copy if md5 check fails\n"
 	     "    -x          use .cpignore as exclusion file\n"
 	     "    -X file     specify exclusion file\n"
-	     " Version 1.05 by Matt Dillon and Dima Ruban\n"
+	     " Version 1.06 by Matt Dillon and Dima Ruban\n"
 	);
 	exit(0);
     } else {
-- 
2.41.0