From a2f9a486fc23d7fb519ff960f16fe902c8f979d2 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 13 Mar 2006 22:03:21 +0000 Subject: [PATCH] Removed patch fuzz. --- xattrs.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xattrs.diff b/xattrs.diff index 6f0c0c3..fe696d0 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -110,7 +110,7 @@ After applying this patch, run these commands for a successful build: extern int preserve_links; extern int preserve_hard_links; extern int preserve_devices; -@@ -971,6 +972,10 @@ static struct file_struct *send_file_nam +@@ -975,6 +976,10 @@ static struct file_struct *send_file_nam if (preserve_acls && make_acl(file, fname) < 0) return NULL; #endif @@ -119,9 +119,9 @@ After applying this patch, run these commands for a successful build: + return NULL; +#endif - if (chmod_modes && !S_ISLNK(file->mode)) - file->mode = tweak_mode(file->mode, chmod_modes); -@@ -986,12 +991,20 @@ static struct file_struct *send_file_nam + maybe_emit_filelist_progress(flist->count + flist_count_offset); + +@@ -987,12 +992,20 @@ static struct file_struct *send_file_nam if (preserve_acls) send_acl(file, f); #endif @@ -142,7 +142,7 @@ After applying this patch, run these commands for a successful build: } return file; } -@@ -1384,6 +1397,10 @@ struct file_list *recv_file_list(int f) +@@ -1385,6 +1398,10 @@ struct file_list *recv_file_list(int f) if (preserve_acls) receive_acl(file, f); #endif @@ -153,7 +153,7 @@ After applying this patch, run these commands for a successful build: if (S_ISREG(file->mode) || S_ISLNK(file->mode)) stats.total_size += file->length; -@@ -1411,6 +1428,10 @@ struct file_list *recv_file_list(int f) +@@ -1412,6 +1429,10 @@ struct file_list *recv_file_list(int f) if (preserve_acls) sort_file_acl_index_lists(); #endif @@ -320,8 +320,8 @@ After applying this patch, run these commands for a successful build: extern int preserve_perms; extern int preserve_executability; extern int preserve_times; -@@ -211,6 +212,10 @@ int set_file_attrs(char *fname, struct f - if (preserve_acls && set_acl(fname, file, st->st_mode) == 0) +@@ -215,6 +216,10 @@ int set_file_attrs(char *fname, struct f + if (preserve_acls && set_acl(fname, file, &st->st_mode) == 0) updated = 1; #endif +#ifdef SUPPORT_XATTRS -- 2.34.1