X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a5e6228afbf1809d33d9a31e0895c5e955c39ce1..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/xattrs.diff diff --git a/xattrs.diff b/xattrs.diff index cf9cc7e..4446c7c 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -13,7 +13,7 @@ To use this patch, run these commands for a successful build: 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) +@@ -190,13 +190,6 @@ void setup_protocol(int f_out,int f_in) if (protocol_version < 30) { if (append_mode == 1) append_mode = 2; @@ -46,7 +46,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) +@@ -246,7 +248,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 +55,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) +@@ -348,7 +350,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 +64,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) +@@ -385,13 +387,22 @@ int send_xattr(stat_x *sxp, int f) { int ndx = find_matching_xattr(sxp->xattr); @@ -88,37 +88,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; +@@ -410,8 +421,8 @@ int send_xattr(stat_x *sxp, int f) + 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); +@@ -419,7 +430,7 @@ int send_xattr(stat_x *sxp, int f) } #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) +@@ -469,7 +480,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 +119,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) +@@ -514,6 +525,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 +129,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) +@@ -570,6 +584,9 @@ int recv_xattr_request(struct file_struct *file, int f_in) rsync_xa *rxa; int rel_pos, cnt, num, got_xattr_data = 0; @@ -147,10 +139,10 @@ 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; +@@ -632,7 +649,22 @@ void receive_xattr(struct file_struct *file, int f) + #else + int need_sort = 1; + #endif - int ndx = read_varint(f); + int ndx; + @@ -171,7 +163,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) +@@ -645,7 +677,7 @@ void receive_xattr(struct file_struct *file, int f) return; } @@ -180,7 +172,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) +@@ -653,9 +685,10 @@ void receive_xattr(struct file_struct *file, int f) for (num = 1; num <= count; num++) { char *ptr, *name; rsync_xa *rxa; @@ -192,5 +184,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))