if (ignore_perishable && ent->rflags & FILTRULE_PERISHABLE)
continue;
if (ent->rflags & FILTRULE_PERDIR_MERGE) {
- int rc = check_filter(ent->u.mergelist, code, name,
- name_is_dir);
+ int rc = check_filter(ent->u.mergelist, code, name, name_is_dir);
if (rc)
return rc;
continue;
}
if (ent->rflags & FILTRULE_CVS_IGNORE) {
- int rc = check_filter(&cvs_filter_list, code, name,
- name_is_dir);
+ int rc = check_filter(&cvs_filter_list, code, name, name_is_dir);
if (rc)
return rc;
continue;
}
if (rule_matches(name, ent, name_is_dir)) {
- report_filter_result(code, name, ent, name_is_dir,
- listp->debug_type);
+ report_filter_result(code, name, ent, name_is_dir, listp->debug_type);
return ent->rflags & FILTRULE_INCLUDE ? 1 : -1;
}
}
clear_file(fp);
}
prev_depth = F_DEPTH(file);
- if (is_excluded(f_name(file, fbuf), 1,
- ALL_FILTERS)) {
+ if (is_excluded(f_name(file, fbuf), 1, ALL_FILTERS)) {
/* Keep dirs through this dir. */
for (j = prev_depth-1; ; j--) {
fp = flist->sorted[prev_i];
list_len -= name_len;
#ifdef HAVE_LINUX_XATTRS
- /* We always ignore the system namespace, and non-root
- * ignores everything but the user namespace. */
- if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
- : HAS_PREFIX(name, SYSTEM_PREFIX))
+ /* Choose between ignoring the system namespace or (non-root) ignoring any non-user namespace. */
+ if (user_only ? !HAS_PREFIX(name, USER_PREFIX) : HAS_PREFIX(name, SYSTEM_PREFIX))
continue;
#endif
/* No rsync.%FOO attributes are copied w/o 2 -X options. */
- if (name_len > RPRE_LEN && name[RPRE_LEN] == '%'
- && HAS_PREFIX(name, RSYNC_PREFIX)) {
+ if (name_len > RPRE_LEN && name[RPRE_LEN] == '%' && HAS_PREFIX(name, RSYNC_PREFIX)) {
if ((am_sender && preserve_xattrs < 2)
|| (am_root < 0
&& (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
list_len -= name_len;
#ifdef HAVE_LINUX_XATTRS
- /* We always ignore the system namespace, and non-root
- * ignores everything but the user namespace. */
- if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
- : HAS_PREFIX(name, SYSTEM_PREFIX))
+ /* Choose between ignoring the system namespace or (non-root) ignoring any non-user namespace. */
+ if (user_only ? !HAS_PREFIX(name, USER_PREFIX) : HAS_PREFIX(name, SYSTEM_PREFIX))
continue;
#endif
free(ptr);
continue;
}
+
rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, 1);
rxa->name = name;
rxa->datum = ptr;
list_len -= name_len;
#ifdef HAVE_LINUX_XATTRS
- /* We always ignore the system namespace, and non-root
- * ignores everything but the user namespace. */
- if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
- : HAS_PREFIX(name, SYSTEM_PREFIX))
+ /* Choose between ignoring the system namespace or (non-root) ignoring any non-user namespace. */
+ if (user_only ? !HAS_PREFIX(name, USER_PREFIX) : HAS_PREFIX(name, SYSTEM_PREFIX))
continue;
#endif
- if (am_root < 0 && name_len > RPRE_LEN
- && name[RPRE_LEN] == '%' && strcmp(name, XSTAT_ATTR) == 0)
+ if (am_root < 0 && name_len > RPRE_LEN && name[RPRE_LEN] == '%' && strcmp(name, XSTAT_ATTR) == 0)
continue;
for (i = 0; i < xalp->count; i++) {