From 4366d2c42853a88ce7cef62e2cb22d314607cf69 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 25 Jan 2005 12:07:13 +0000 Subject: [PATCH] In delete_files(), handle new DEL_NO_RECURSE flag (and use renamed DEL_FORCE_RECURSE flag. --- rsync.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) { -- 2.34.1