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
Got rid of kluged value for am_sender, and instead added a new
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
6f94e8c
..
05b53f6
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-1767,6
+1767,8
@@
struct file_list *get_dirlist(const char *dirname, int ignore_filter_rules)
send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen);
recurse = save_recurse;
send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirbuf, dlen);
recurse = save_recurse;
+ clean_flist(dirlist, 0, 0);
+
return dirlist;
}
return dirlist;
}
@@
-1788,6
+1790,7
@@
int delete_file(char *fname, int mode, int flags)
struct file_list *dirlist;
char buf[MAXPATHLEN];
int j, zap_dir, ok;
struct file_list *dirlist;
char buf[MAXPATHLEN];
int j, zap_dir, ok;
+ void *save_filters;
if (max_delete && deletion_count >= max_delete)
return -1;
if (max_delete && deletion_count >= max_delete)
return -1;
@@
-1835,8
+1838,10
@@
int delete_file(char *fname, int mode, int flags)
}
flags |= DEL_FORCE_RECURSE;
}
flags |= DEL_FORCE_RECURSE;
+ save_filters = push_local_filters(fname, strlen(fname));
+
dirlist = get_dirlist(fname, 0);
dirlist = get_dirlist(fname, 0);
- for (j = dirlist->count; j--
> 0
; ) {
+ for (j = dirlist->count; j--; ) {
struct file_struct *fp = dirlist->files[j];
f_name_to(fp, buf);
if (delete_file(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
struct file_struct *fp = dirlist->files[j];
f_name_to(fp, buf);
if (delete_file(buf, fp->mode, flags & ~DEL_TERSE) != 0) {
@@
-1846,6
+1851,8
@@
int delete_file(char *fname, int mode, int flags)
}
flist_free(dirlist);
}
flist_free(dirlist);
+ pop_local_filters(save_filters);
+
if (max_delete && deletion_count >= max_delete)
return -1;
if (max_delete && deletion_count >= max_delete)
return -1;
@@
-1945,6
+1952,8
@@
void delete_in_dir(struct file_list *flist, char *fbuf,
recurse = -1;
fbuf[dlen] = '\0';
recurse = -1;
fbuf[dlen] = '\0';
+ clean_flist(dir_list, 0, 0);
+
if (verbose > 3)
output_flist(dir_list, "delete");
if (verbose > 3)
output_flist(dir_list, "delete");