X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a5e6228afbf1809d33d9a31e0895c5e955c39ce1..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index cf9cc7e..422f4e3 100644
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -10,10 +10,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
+based-on: patch/master/acls
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
-@@ -177,13 +177,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -191,13 +191,6 @@ void setup_protocol(int f_out,int f_in)
  	if (protocol_version < 30) {
  		if (append_mode == 1)
  			append_mode = 2;
@@ -30,15 +31,15 @@ diff --git a/compat.c b/compat.c
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -21,6 +21,7 @@
- 
+@@ -22,6 +22,7 @@
  #include "rsync.h"
  #include "ifuncs.h"
+ #include "inums.h"
 +#include "io.h"
  #include "lib/sysxattrs.h"
  
  #ifdef SUPPORT_XATTRS
-@@ -33,6 +34,7 @@ extern int read_only;
+@@ -34,6 +35,7 @@ extern int read_only;
  extern int list_only;
  extern int preserve_xattrs;
  extern int checksum_seed;
@@ -46,7 +47,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  #define RSYNC_XAL_INITIAL 5
  #define RSYNC_XAL_LIST_INITIAL 100
-@@ -239,7 +241,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -249,7 +251,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
  		if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
  			return -1;
  
@@ -55,7 +56,7 @@ diff --git a/xattrs.c b/xattrs.c
  			/* For large datums, we store a flag and a checksum. */
  			name_offset = 1 + MAX_DIGEST_LEN;
  			sum_init(checksum_seed);
-@@ -307,7 +309,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -365,7 +367,7 @@ static int find_matching_xattr(item_list *xalp)
  			 || rxas1[j].datum_len != rxas2[j].datum_len
  			 || strcmp(rxas1[j].name, rxas2[j].name))
  				break;
@@ -64,7 +65,7 @@ diff --git a/xattrs.c b/xattrs.c
  				if (memcmp(rxas1[j].datum + 1,
  					   rxas2[j].datum + 1,
  					   MAX_DIGEST_LEN) != 0)
-@@ -344,34 +346,43 @@ int send_xattr(stat_x *sxp, int f)
+@@ -402,13 +404,22 @@ int send_xattr(int f, stat_x *sxp)
  {
  	int ndx = find_matching_xattr(sxp->xattr);
  
@@ -88,37 +89,29 @@ diff --git a/xattrs.c b/xattrs.c
 -		write_varint(f, count);
 +		write_varint30(f, count);
  		for (rxa = sxp->xattr->items; count--; rxa++) {
- #ifdef HAVE_LINUX_XATTRS
--			write_varint(f, rxa->name_len);
+ 			size_t name_len = rxa->name_len;
+ 			const char *name = rxa->name;
+@@ -427,8 +438,8 @@ int send_xattr(int f, stat_x *sxp)
+ 				name_len += UPRE_LEN;
+ 			}
+ #endif
+-			write_varint(f, name_len);
 -			write_varint(f, rxa->datum_len);
-+			write_varint30(f, rxa->name_len);
++			write_varint30(f, 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_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_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);
+ #ifndef HAVE_LINUX_XATTRS
+ 			if (name_len > rxa->name_len) {
  				write_buf(f, USER_PREFIX, UPRE_LEN);
- 				write_buf(f, rxa->name, rxa->name_len);
+@@ -436,7 +447,7 @@ int send_xattr(int f, stat_x *sxp)
  			}
  #endif
+ 			write_buf(f, name, name_len);
 -			if (rxa->datum_len > MAX_FULL_DATUM)
 +			if (rxa->datum_len > MAX_FULL_DATUM && protocol_version >= 30)
  				write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
  			else
  				write_buf(f, rxa->datum, rxa->datum_len);
-@@ -421,7 +432,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+@@ -486,7 +497,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
  		cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
  		if (cmp > 0)
  			same = 0;
@@ -127,7 +120,7 @@ diff --git a/xattrs.c b/xattrs.c
  			same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
  			    && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
  				      MAX_DIGEST_LEN) == 0;
-@@ -464,6 +475,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -531,6 +542,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
  	int cnt, prior_req = 0;
  	rsync_xa *rxa;
  
@@ -137,7 +130,7 @@ diff --git a/xattrs.c b/xattrs.c
  	lst += F_XATTR(file);
  	for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
  		if (rxa->datum_len <= MAX_FULL_DATUM)
-@@ -518,6 +532,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+@@ -587,6 +601,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
  	rsync_xa *rxa;
  	int rel_pos, cnt, num, got_xattr_data = 0;
  
@@ -146,11 +139,11 @@ diff --git a/xattrs.c b/xattrs.c
 +
  	if (F_XATTR(file) < 0) {
  		rprintf(FERROR, "recv_xattr_request: internal data error!\n");
- 		exit_cleanup(RERR_STREAMIO);
-@@ -574,7 +591,22 @@ void receive_xattr(struct file_struct *file, int f)
- {
- 	static item_list temp_xattr = EMPTY_ITEM_LIST;
- 	int count, num;
+ 		exit_cleanup(RERR_PROTOCOL);
+@@ -649,7 +666,22 @@ void receive_xattr(int f, struct file_struct *file)
+ #else
+ 	int need_sort = 1;
+ #endif
 -	int ndx = read_varint(f);
 +	int ndx;
 +
@@ -171,7 +164,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  	if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
  		rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -587,7 +619,7 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -662,7 +694,7 @@ void receive_xattr(int f, struct file_struct *file)
  		return;
  	}
  	
@@ -180,7 +173,7 @@ diff --git a/xattrs.c b/xattrs.c
  		(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
  		temp_xattr.count = 0;
  	}
-@@ -595,9 +627,10 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -670,9 +702,10 @@ void receive_xattr(int f, struct file_struct *file)
  	for (num = 1; num <= count; num++) {
  		char *ptr, *name;
  		rsync_xa *rxa;
@@ -192,5 +185,5 @@ diff --git a/xattrs.c b/xattrs.c
 +		size_t dget_len = datum_len > MAX_FULL_DATUM && protocol_version >= 30
 +				? 1 + MAX_DIGEST_LEN : datum_len;
  		size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0;
- 		if (dget_len + extra_len < dget_len)
- 			out_of_memory("receive_xattr"); /* overflow */
+ 		if ((dget_len + extra_len < dget_len)
+ 		 || (dget_len + extra_len + name_len < dget_len))