X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/82471e68a8bb3da8ca95f2b6564c330c52ce891e..c32edbe02eaf8ae9ed1bf6d766ab4f4c34881217:/rsync.c

diff --git a/rsync.c b/rsync.c
index 576ce63f..acb260cc 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) {
@@ -220,7 +221,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		updated = 1;
 	}
 
-#ifdef HAVE_CHMOD
+#if HAVE_CHMOD
 	if (!S_ISLNK(st->st_mode)) {
 		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 			updated = 1;