From: Wayne Davison <wayned@samba.org>
Date: Tue, 25 Jan 2005 12:07:13 +0000 (+0000)
Subject: In delete_files(), handle new DEL_NO_RECURSE flag (and use
X-Git-Tag: v2.6.4pre1~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4366d2c42853a88ce7cef62e2cb22d314607cf69;p=thirdparty%2Frsync.git

In delete_files(), handle new DEL_NO_RECURSE flag (and use
renamed DEL_FORCE_RECURSE flag.
---

diff --git a/rsync.c b/rsync.c
index 576ce63f..1ddb54f3 100644
--- a/rsync.c
+++ b/rsync.c
@@ -76,7 +76,8 @@ int delete_file(char *fname, int flags)
 		return -1;
 	}
 
-	zap_dir = flags & DEL_RECURSE || (force_delete && recurse);
+	zap_dir = (flags & DEL_FORCE_RECURSE || (force_delete && recurse))
+		&& !(flags & DEL_NO_RECURSE);
 	if (dry_run && zap_dir)
 		errno = ENOTEMPTY;
 	else if (do_rmdir(fname) == 0) {