Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
One minor tweak to the --delete-before option-passing code.
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
576ce63
..
1ddb54f
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-76,7
+76,8
@@
int delete_file(char *fname, int flags)
return -1;
}
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) {
if (dry_run && zap_dir)
errno = ENOTEMPTY;
else if (do_rmdir(fname) == 0) {