X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/39c135f960128d34b26fccc35773393965e9dc1d..a2dabe5eab85deaa188309daf73a24ee8a5ed3c5:/xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index 85d2d08..4214ca9 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
  			    protocol_version);
  			exit_cleanup(RERR_PROTOCOL);
  		}
--		if (preserve_xattrs) {
+-		if (preserve_xattrs && !local_server) {
 -			rprintf(FERROR,
 -			    "--xattrs requires protocol 30 or higher"
 -			    " (negotiated %d).\n",
@@ -26,19 +26,6 @@ To use this patch, run these commands for a successful build:
  	}
  
  	if (delete_mode && !(delete_before+delete_during+delete_after)) {
---- old/testsuite/xattrs.test
-+++ new/testsuite/xattrs.test
-@@ -9,10 +9,6 @@
- 
- $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is configured without xattr support"
- 
--case "$RSYNC" in
--*protocol=29*) test_skipped "xattr support requires protocol 30" ;;
--esac
--
- case "`xattr 2>&1`" in
- *--list:*)
-     xset() {
 --- old/xattrs.c
 +++ new/xattrs.c
 @@ -20,6 +20,7 @@
@@ -75,54 +62,51 @@ To use this patch, run these commands for a successful build:
  				if (memcmp(rxas1[j].datum + 1,
  					   rxas2[j].datum + 1,
  					   MAX_DIGEST_LEN) != 0)
-@@ -315,34 +317,46 @@ int send_xattr(statx *sxp, int f)
+@@ -315,34 +317,43 @@ int send_xattr(statx *sxp, int f)
  {
  	int ndx = find_matching_xattr(sxp->xattr);
  
 -	/* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
--	write_abbrevint(f, ndx + 1);
+-	write_varint(f, ndx + 1);
 +	if (protocol_version < 30) {
-+		if (ndx >= 0) {
++		if (ndx < 0)
++			write_byte(f, 'X');
++		else {
 +			write_byte(f, 'x');
 +			write_int(f, ndx);
 +		}
 +	} else {
 +		/* Send 0 (-1 + 1) to indicate that literal xattr data follows. */
-+		write_abbrevint(f, ndx + 1);
++		write_varint(f, ndx + 1);
 +	}
  
  	if (ndx < 0) {
  		rsync_xa *rxa;
  		int count = sxp->xattr->count;
--		write_abbrevint(f, count);
-+		if (protocol_version >= 30)
-+			write_abbrevint(f, count);
-+		else {
-+			write_byte(f, 'X');
-+			write_int(f, count);
-+		}
+-		write_varint(f, count);
++		write_varint30(f, count);
  		for (rxa = sxp->xattr->items; count--; rxa++) {
  #ifdef HAVE_LINUX_XATTRS
--			write_abbrevint(f, rxa->name_len);
--			write_abbrevint(f, rxa->datum_len);
-+			write_abbrevint30(f, rxa->name_len);
-+			write_abbrevint30(f, rxa->datum_len);
+-			write_varint(f, rxa->name_len);
+-			write_varint(f, rxa->datum_len);
++			write_varint30(f, rxa->name_len);
++			write_varint30(f, rxa->datum_len);
  			write_buf(f, rxa->name, rxa->name_len);
  #else
  			/* We strip the rsync prefix from disguised namespaces
  			 * and put everything else in the user namespace. */
  			if (HAS_PREFIX(rxa->name, RSYNC_PREFIX)
  			 && rxa->name[RPRE_LEN] != '%') {
--				write_abbrevint(f, rxa->name_len - RPRE_LEN);
--				write_abbrevint(f, rxa->datum_len);
-+				write_abbrevint30(f, rxa->name_len - RPRE_LEN);
-+				write_abbrevint30(f, rxa->datum_len);
+-				write_varint(f, rxa->name_len - RPRE_LEN);
+-				write_varint(f, rxa->datum_len);
++				write_varint30(f, rxa->name_len - RPRE_LEN);
++				write_varint30(f, rxa->datum_len);
  				write_buf(f, rxa->name + RPRE_LEN, rxa->name_len - RPRE_LEN);
  			} else {
--				write_abbrevint(f, rxa->name_len + UPRE_LEN);
--				write_abbrevint(f, rxa->datum_len);
-+				write_abbrevint30(f, rxa->name_len + UPRE_LEN);
-+				write_abbrevint30(f, rxa->datum_len);
+-				write_varint(f, rxa->name_len + UPRE_LEN);
+-				write_varint(f, rxa->datum_len);
++				write_varint30(f, rxa->name_len + UPRE_LEN);
++				write_varint30(f, rxa->datum_len);
  				write_buf(f, USER_PREFIX, UPRE_LEN);
  				write_buf(f, rxa->name, rxa->name_len);
  			}
@@ -132,7 +116,7 @@ To use this patch, run these commands for a successful build:
  				write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
  			else
  				write_buf(f, rxa->datum, rxa->datum_len);
-@@ -392,7 +406,7 @@ int xattr_diff(struct file_struct *file,
+@@ -392,7 +403,7 @@ int xattr_diff(struct file_struct *file,
  		cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
  		if (cmp > 0)
  			same = 0;
@@ -141,7 +125,7 @@ To use this patch, run these commands for a successful build:
  			same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
  			    && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
  				      MAX_DIGEST_LEN) == 0;
-@@ -435,6 +449,9 @@ void send_xattr_request(const char *fnam
+@@ -435,6 +446,9 @@ void send_xattr_request(const char *fnam
  	int j, cnt, prior_req = -1;
  	rsync_xa *rxa;
  
@@ -151,7 +135,7 @@ To use this patch, run these commands for a successful build:
  	lst += F_XATTR(file);
  	cnt = lst->count;
  	for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) {
-@@ -506,6 +523,9 @@ void recv_xattr_request(struct file_stru
+@@ -506,6 +520,9 @@ void recv_xattr_request(struct file_stru
  	rsync_xa *rxa;
  	int rel_pos, cnt;
  
@@ -161,15 +145,15 @@ To use this patch, run these commands for a successful build:
  	if (F_XATTR(file) < 0) {
  		rprintf(FERROR, "recv_xattr_request: internal data error!\n");
  		exit_cleanup(RERR_STREAMIO);
-@@ -552,7 +572,22 @@ void receive_xattr(struct file_struct *f
+@@ -552,7 +569,22 @@ void receive_xattr(struct file_struct *f
  {
  	static item_list temp_xattr = EMPTY_ITEM_LIST;
  	int count;
--	int ndx = read_abbrevint(f);
+-	int ndx = read_varint(f);
 +	int ndx;
 +
 +	if (protocol_version >= 30)
-+		ndx = read_abbrevint(f);
++		ndx = read_varint(f);
 +	else {
 +		int tag = read_byte(f);
 +		if (tag == 'x')
@@ -185,24 +169,24 @@ To use this patch, run these commands for a successful build:
  
  	if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
  		rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -565,7 +600,7 @@ void receive_xattr(struct file_struct *f
+@@ -565,7 +597,7 @@ void receive_xattr(struct file_struct *f
  		return;
  	}
  	
--	if ((count = read_abbrevint(f)) != 0) {
-+	if ((count = read_abbrevint30(f)) != 0) {
+-	if ((count = read_varint(f)) != 0) {
++	if ((count = read_varint30(f)) != 0) {
  		(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
  		temp_xattr.count = 0;
  	}
-@@ -573,9 +608,10 @@ void receive_xattr(struct file_struct *f
+@@ -573,9 +605,10 @@ void receive_xattr(struct file_struct *f
  	while (count--) {
  		char *ptr, *name;
  		rsync_xa *rxa;
--		size_t name_len = read_abbrevint(f);
--		size_t datum_len = read_abbrevint(f);
+-		size_t name_len = read_varint(f);
+-		size_t datum_len = read_varint(f);
 -		size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
-+		size_t name_len = read_abbrevint30(f);
-+		size_t datum_len = read_abbrevint30(f);
++		size_t name_len = read_varint30(f);
++		size_t datum_len = read_varint30(f);
 +		size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
 +				? 1 + MAX_DIGEST_LEN : datum_len;
  #ifdef HAVE_LINUX_XATTRS