X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/4c15e80040f6ac2fc79d599d1722cf209cc30536..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/checksum-xattr.diff

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 94953bb..1f8d6bc 100644
--- a/checksum-xattr.diff
+++ b/checksum-xattr.diff
@@ -8,23 +8,24 @@ To use this patch, run these commands for a successful build:
     ./configure                               (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1208,7 +1208,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
- 	}
+@@ -1277,7 +1277,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  #endif
  
--	if (always_checksum && am_sender && S_ISREG(st.st_mode))
-+	if (always_checksum && am_sender && S_ISREG(st.st_mode)
-+	 && !get_sum_xattr(thisname, &st, tmp_sum))
- 		file_checksum(thisname, tmp_sum, st.st_size);
- 
- 	F_PATHNAME(file) = pathname;
+ 	if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
+-		file_checksum(thisname, tmp_sum, st.st_size);
++		if (!get_sum_xattr(thisname, &st, tmp_sum))
++			file_checksum(thisname, tmp_sum, st.st_size);
+ 		if (sender_keeps_checksum)
+ 			extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
+ 	}
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -637,7 +637,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -531,7 +531,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  	   of the file time to determine whether to sync */
  	if (always_checksum > 0 && S_ISREG(st->st_mode)) {
  		char sum[MAX_DIGEST_LEN];
@@ -160,7 +161,7 @@ new file mode 100644
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -33,6 +33,8 @@ extern int read_only;
+@@ -34,6 +34,8 @@ extern int read_only;
  extern int list_only;
  extern int preserve_xattrs;
  extern int checksum_seed;
@@ -169,16 +170,29 @@ diff --git a/xattrs.c b/xattrs.c
  
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
-@@ -66,6 +68,8 @@ extern int checksum_seed;
- #define XSTAT_ATTR RSYNC_PREFIX "%stat"
- #define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
- #define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
-+#define MD4_ATTR RSYNC_PREFIX "%md4"
-+#define MD5_ATTR RSYNC_PREFIX "%md5"
+@@ -69,6 +71,10 @@ extern int checksum_seed;
+ #define XACC_ACL_ATTR RSYNC_PREFIX "%" XACC_ACL_SUFFIX
+ #define XDEF_ACL_SUFFIX "dacl"
+ #define XDEF_ACL_ATTR RSYNC_PREFIX "%" XDEF_ACL_SUFFIX
++#define MD4_SUFFIX "md4"
++#define MD4_ATTR RSYNC_PREFIX "%" MD4_SUFFIX
++#define MD5_SUFFIX "md5"
++#define MD5_ATTR RSYNC_PREFIX "%" MD5_SUFFIX
  
  typedef struct {
  	char *datum, *name;
-@@ -853,6 +857,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -241,7 +247,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+ 			 || (am_root < 0
+ 			  && (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
+ 			   || strcmp(name+RPRE_LEN+1, XACC_ACL_SUFFIX) == 0
+-			   || strcmp(name+RPRE_LEN+1, XDEF_ACL_SUFFIX) == 0)))
++			   || strcmp(name+RPRE_LEN+1, XDEF_ACL_SUFFIX) == 0
++			   || strcmp(name+RPRE_LEN+1, MD4_SUFFIX) == 0
++			   || strcmp(name+RPRE_LEN+1, MD5_SUFFIX) == 0)))
+ 				continue;
+ 		}
+ 
+@@ -914,6 +922,39 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif
  
@@ -189,7 +203,7 @@ diff --git a/xattrs.c b/xattrs.c
 +	char buf[256];
 +	uint32 file_length, mtime;
 +	int len;
-+	
++
 +	len = sys_lgetxattr(fname, mdattr, buf, sizeof buf);
 +	if (len < 0) {
 +		if (errno == ENOTSUP || errno == ENOATTR)