mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-02-18 15:16:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

When preforming a recursive delete, push/pop the per-dir merge rules.

Browse Source
This commit is contained in:
Wayne Davison
2005-02-22 20:42:55 +00:00
parent 564ef546a9
commit 87fd439059
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flist.c
View File

@@ -1790,6 +1790,7 @@ int delete_file(char *fname, int mode, int flags)
struct file_list *dirlist;
char buf[MAXPATHLEN];
int j, zap_dir, ok;
void *save_filters;
if (max_delete && deletion_count >= max_delete)
return -1;
@@ -1837,6 +1838,8 @@ int delete_file(char *fname, int mode, int flags)
}
flags |= DEL_FORCE_RECURSE;
save_filters = push_local_filters(fname, strlen(fname));
dirlist = get_dirlist(fname, 0);
for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
@@ -1848,6 +1851,8 @@ int delete_file(char *fname, int mode, int flags)
}
flist_free(dirlist);
pop_local_filters(save_filters);
if (max_delete && deletion_count >= max_delete)
return -1;