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
Make missing args governed by protect filters, not hide.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
2ffd88a
..
d14cafa
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-98,7
+98,7
@@
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern char *backup_suffix;
extern int backup_suffix_len;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-extern struct filter_list_struct daemon_filter_list;
+extern struct filter_list_struct
filter_list,
daemon_filter_list;
int ignore_perishable = 0;
int non_perishable_cnt = 0;
int ignore_perishable = 0;
int non_perishable_cnt = 0;
@@
-1223,7
+1223,11
@@
static void list_file_entry(struct file_struct *f)
f_name(f, NULL), F_SYMLINK(f));
} else
#endif
f_name(f, NULL), F_SYMLINK(f));
} else
#endif
- {
+ if (delete_missing_args && !f->mode) {
+ rprintf(FINFO, "%-*s %s\n",
+ /*colwidth*/11 + 31, "*missing",
+ f_name(f, NULL));
+ } else {
rprintf(FINFO, "%s %11.0f %s %s\n",
permbuf, len, timestring(f->modtime),
f_name(f, NULL));
rprintf(FINFO, "%s %11.0f %s %s\n",
permbuf, len, timestring(f->modtime),
f_name(f, NULL));
@@
-1371,6
+1375,8
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
if (delete_missing_args && file->mode == 0) {
}
if (delete_missing_args && file->mode == 0) {
+ if (filter_list.head && check_filter(&filter_list, FINFO, fname, is_dir) < 0)
+ return;
if (statret == 0)
delete_item(fname, sx.st.st_mode, del_opts);
return;
if (statret == 0)
delete_item(fname, sx.st.st_mode, del_opts);
return;