X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/8a38e00aeb2dc1119a0a236a8c903e942903d08b..5214a41bbae94607b196b199b483710e1babf292:/xattrs.diff diff --git a/xattrs.diff b/xattrs.diff index d760bb6..635d852 100644 --- a/xattrs.diff +++ b/xattrs.diff @@ -10,12 +10,14 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make ---- old/compat.c -+++ new/compat.c -@@ -115,13 +115,6 @@ void setup_protocol(int f_out,int f_in) - protocol_version); - exit_cleanup(RERR_PROTOCOL); - } +based-on: patch/acls +diff --git a/compat.c b/compat.c +--- a/compat.c ++++ b/compat.c +@@ -189,13 +189,6 @@ void setup_protocol(int f_out,int f_in) + if (protocol_version < 30) { + if (append_mode == 1) + append_mode = 2; - if (preserve_xattrs && !local_server) { - rprintf(FERROR, - "--xattrs requires protocol 30 or higher" @@ -26,25 +28,26 @@ To use this patch, run these commands for a successful build: } if (delete_mode && !(delete_before+delete_during+delete_after)) { ---- old/xattrs.c -+++ new/xattrs.c -@@ -20,6 +20,7 @@ - */ - +diff --git a/xattrs.c b/xattrs.c +--- a/xattrs.c ++++ b/xattrs.c +@@ -22,6 +22,7 @@ #include "rsync.h" + #include "ifuncs.h" + #include "inums.h" +#include "io.h" #include "lib/sysxattrs.h" #ifdef SUPPORT_XATTRS -@@ -31,6 +32,7 @@ extern int am_generator; - extern int read_only; +@@ -34,6 +35,7 @@ extern int read_only; extern int list_only; + extern int preserve_xattrs; extern int checksum_seed; +extern int protocol_version; #define RSYNC_XAL_INITIAL 5 #define RSYNC_XAL_LIST_INITIAL 100 -@@ -222,7 +224,7 @@ static int rsync_xal_get(const char *fna +@@ -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; @@ -53,7 +56,7 @@ To use this patch, run these commands for a successful build: /* For large datums, we store a flag and a checksum. */ name_offset = 1 + MAX_DIGEST_LEN; sum_init(checksum_seed); -@@ -278,7 +280,7 @@ static int find_matching_xattr(item_list +@@ -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; @@ -62,12 +65,12 @@ 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,43 @@ int send_xattr(statx *sxp, int f) +@@ -402,13 +404,22 @@ int send_xattr(int f, stat_x *sxp) { 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) + write_byte(f, 'X'); @@ -77,46 +80,38 @@ To use this patch, run these commands for a successful build: + } + } 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); -+ write_abbrevint30(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_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_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); + 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, name_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); -@@ -392,7 +403,7 @@ int xattr_diff(struct file_struct *file, +@@ -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; @@ -125,35 +120,35 @@ 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 +446,9 @@ void send_xattr_request(const char *fnam - int j, cnt, prior_req = -1; +@@ -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; + if (protocol_version < 30) + return; + lst += F_XATTR(file); - cnt = lst->count; - for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) { -@@ -506,6 +520,9 @@ void recv_xattr_request(struct file_stru + for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) { + if (rxa->datum_len <= MAX_FULL_DATUM) +@@ -587,6 +601,9 @@ int recv_xattr_request(struct file_struct *file, int f_in) rsync_xa *rxa; - int rel_pos, cnt; + int rel_pos, cnt, num, got_xattr_data = 0; + if (protocol_version < 30) -+ return; ++ return 0; + if (F_XATTR(file) < 0) { rprintf(FERROR, "recv_xattr_request: internal data error!\n"); - exit_cleanup(RERR_STREAMIO); -@@ -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); + 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; + + if (protocol_version >= 30) -+ ndx = read_abbrevint(f); ++ ndx = read_varint(f); + else { + int tag = read_byte(f); + if (tag == 'x') @@ -169,26 +164,26 @@ 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 +597,7 @@ void receive_xattr(struct file_struct *f +@@ -662,7 +694,7 @@ void receive_xattr(int f, struct file_struct *file) 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 +605,10 @@ void receive_xattr(struct file_struct *f - while (count--) { +@@ -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; -- 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 - size_t extra_len = 0; - #else + size_t extra_len = MIGHT_NEED_RPRE ? RPRE_LEN : 0; + if ((dget_len + extra_len < dget_len) + || (dget_len + extra_len + name_len < dget_len))