X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/99eba67585c79180be72ea10889ae7eec61f9034..eaf895e6efca5348e96375425f15fc94ddebcd71:/flist.c

diff --git a/flist.c b/flist.c
index 08a75b26..a61eaef7 100644
--- a/flist.c
+++ b/flist.c
@@ -48,6 +48,8 @@ extern int preserve_uid;
 extern int preserve_gid;
 extern int relative_paths;
 extern int implied_dirs;
+extern int ignore_perishable;
+extern int non_perishable_cnt;
 extern int prune_empty_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
@@ -752,8 +754,12 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		int save_errno = errno;
 		/* See if file is excluded before reporting an error. */
 		if (filter_level != NO_FILTERS
-		    && is_excluded(thisname, 0, filter_level))
+		 && (is_excluded(thisname, 0, filter_level)
+		  || is_excluded(thisname, 1, filter_level))) {
+			if (ignore_perishable && save_errno != ENOENT)
+				non_perishable_cnt++;
 			return NULL;
+		}
 		if (save_errno == ENOENT) {
 #ifdef SUPPORT_LINKS
 			/* Avoid "vanished" error if symlink points nowhere. */
@@ -803,8 +809,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
 		flags |= FLAG_MOUNT_POINT;
 	}
 
-	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level))
+	if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) {
+		if (ignore_perishable)
+			non_perishable_cnt++;
 		return NULL;
+	}
 
 	if (lp_ignore_nonreadable(module_id)) {
 #ifdef SUPPORT_LINKS