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
- The call to delete_file() needs DEL_NO_RECURSE when handling
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
ac57167
..
c513e5a
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1724,8
+1724,10
@@
void delete_in_dir(struct file_list *flist, char *fname)
safe_fname(f));
}
} else {
- delete_file(f, S_ISDIR(mode)
- ? DEL_DIR | DEL_RECURSE : 0);
+ int dflags = delete_during
+ ? DEL_DIR | DEL_FORCE_RECURSE
+ : DEL_DIR | DEL_NO_RECURSE;
+ delete_file(f, S_ISDIR(mode) ? dflags : 0);
}
deletion_count++;
}