diff options
| author | Wayne Davison <wayned@samba.org> | 2005-01-25 12:07:13 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-01-25 12:07:13 +0000 |
| commit | 4366d2c42853a88ce7cef62e2cb22d314607cf69 (patch) | |
| tree | b5206f4ab1242ad4aa04399d19b132870e30c556 /rsync.c | |
| parent | 217cc3b0459e0c4d3a01c2d6808750b94cba5a17 (diff) | |
| download | rsync-4366d2c42853a88ce7cef62e2cb22d314607cf69.tar.gz | |
In delete_files(), handle new DEL_NO_RECURSE flag (and use
renamed DEL_FORCE_RECURSE flag.
Diffstat (limited to 'rsync.c')
| -rw-r--r-- | rsync.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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) { |