mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-24 22:58:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Join some lines.

Browse Source
This commit is contained in:
Wayne Davison committed 2017-01-22 15:55:54 -08:00
1 parent 62652202c4
commit a4e8b552d6
3 files changed
+13 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

exclude.c
+3 -6
View File
@@ -730,22 +730,19 @@ int check_filter(filter_rule_list *listp, enum logcode code,
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;
}
}
flist.c
+1 -2
View File
@@ -2967,8 +2967,7 @@ static void flist_sort_and_clean(struct file_list *flist, int strip_root)
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];
xattrs.c
+9 -16
View File
@@ -250,16 +250,13 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
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
@@ -353,10 +350,8 @@ int copy_xattrs(const char *source, const char *dest)
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
@@ -860,6 +855,7 @@ void receive_xattr(int f, struct file_struct *file)
free(ptr);
continue;
}
rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, 1);
rxa->name = name;
rxa->datum = ptr;
@@ -1025,14 +1021,11 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
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++) {