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 576ce63f7ca8f1198e790a38b5a4ff415b1108c0..1ddb54f38af47d89da1a3259209f01e41309a5a2 100644 (file)
--- 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) {