-+#ifdef SUPPORT_XATTRS
-+ sx2.xattr = NULL;
-+#endif
- if (!preserve_perms && S_ISDIR(new_mode)
- && sx2.st.st_mode & S_ISGID) {
- /* We just created this directory and its setgid
-@@ -321,6 +318,10 @@ int set_file_attrs(char *fname, struct f
- if (daemon_chmod_modes && !S_ISLNK(new_mode))
- new_mode = tweak_mode(new_mode, daemon_chmod_modes);
-
-+#ifdef SUPPORT_XATTRS
-+ if (preserve_xattrs && !am_generator)
-+ set_xattr(fname, file, sxp);
-+#endif
- #ifdef SUPPORT_ACLS
- /* It's OK to call set_acl() now, even for a dir, as the generator
- * will enable owner-writability using chmod, if necessary.
-@@ -353,10 +354,16 @@ int set_file_attrs(char *fname, struct f
- rprintf(FCLIENT, "%s is uptodate\n", fname);
- }
- cleanup:
-+ if (sxp == &sx2) {
- #ifdef SUPPORT_ACLS
-- if (preserve_acls && sxp == &sx2)
-- free_acl(&sx2);
-+ if (preserve_acls)
-+ free_acl(&sx2);
- #endif
-+#ifdef SUPPORT_XATTRS
-+ if (preserve_xattrs)
-+ free_xattr(&sx2);
-+#endif
-+ }
- return updated;
- }
-
---- old/rsync.h
-+++ new/rsync.h
-@@ -569,6 +569,7 @@ extern int file_extra_cnt;
- extern int preserve_uid;
- extern int preserve_gid;
- extern int preserve_acls;
-+extern int preserve_xattrs;
-
- #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
- #define EXTRA_LEN (sizeof (union file_extras))
-@@ -601,7 +602,8 @@ extern int preserve_acls;
- /* When the associated option is on, all entries will have these present: */
- #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
- #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
--#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
-+#define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
-+#define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
-
- /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
-@@ -793,9 +795,13 @@ typedef struct {
- struct rsync_acl *acc_acl; /* access ACL */
- struct rsync_acl *def_acl; /* default ACL */
- #endif
-+#ifdef SUPPORT_XATTRS
-+ item_list *xattr;
-+#endif
- } statx;
-
- #define ACL_READY(sx) ((sx).acc_acl != NULL)
-+#define XATTR_READY(sx) ((sx).xattr != NULL)
-
- #include "proto.h"
-
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -301,7 +301,7 @@ to the detailed description below for a
- -q, --quiet suppress non-error messages
- --no-motd suppress daemon-mode MOTD (see caveat)
- -c, --checksum skip based on checksum, not mod-time & size
-- -a, --archive archive mode; same as -rlptgoD (no -H, -A)
-+ -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)
- --no-OPTION turn off an implied OPTION (e.g. --no-D)
- -r, --recursive recurse into directories
- -R, --relative use relative path names
-@@ -324,6 +324,7 @@ to the detailed description below for a
- -E, --executability preserve executability
- --chmod=CHMOD affect file and/or directory permissions
- -A, --acls preserve ACLs (implies -p)
-+ -X, --xattrs preserve extended attrs (implies -p)
- -o, --owner preserve owner (super-user only)
- -g, --group preserve group
- --devices preserve device files (super-user only)
-@@ -831,6 +832,11 @@ dit(bf(-A, --acls)) This option causes r
- ACLs to be the same as the source ACLs. This nonstandard option only
- works if the remote rsync also supports it. bf(--acls) implies bf(--perms).
-
-+dit(bf(-X, --xattrs)) This option causes rsync to update the remote
-+extended attributes to be the same as the local ones. This will work
-+only if the remote machine's rsync supports this option also. This is
-+a non-standard option.
-+
- dit(bf(--chmod)) This option tells rsync to apply one or more
- comma-separated "chmod" strings to the permission of the files in the
- transfer. The resulting value is treated as though it was the permissions
---- old/sender.c
-+++ new/sender.c
-@@ -22,6 +22,7 @@
- #include "rsync.h"
-
- extern int verbose;
-+extern int dry_run;
- extern int do_xfers;
- extern int am_server;
- extern int am_daemon;
-@@ -144,8 +145,9 @@ void successful_send(int ndx)
- rsyserr(FERROR, errno, "sender failed to remove %s", fname);
- }
-
--void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-- uchar fnamecmp_type, char *buf, int len)
-+static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
-+ const char *fname, struct file_struct *file,
-+ uchar fnamecmp_type, char *buf, int len)
- {
- write_ndx(f_out, ndx);
- if (protocol_version < 29)
-@@ -155,6 +157,10 @@ void write_ndx_and_attrs(int f_out, int
- write_byte(f_out, fnamecmp_type);
- if (iflags & ITEM_XNAME_FOLLOWS)
- write_vstring(f_out, buf, len);
-+#ifdef SUPPORT_XATTRS
-+ if (iflags & ITEM_REPORT_XATTR && !dry_run)
-+ send_xattr_request(fname, file, f_out);
-+#endif
- }
-
- void send_files(int f_in, int f_out)
-@@ -183,8 +189,8 @@ void send_files(int f_in, int f_out)
- send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
-
- /* This call also sets cur_flist. */
-- ndx = read_ndx_and_attrs(f_in, f_out, &iflags,
-- &fnamecmp_type, xname, &xlen);
-+ ndx = read_ndx_and_attrs(f_in, &iflags, &fnamecmp_type,
-+ xname, &xlen);
- if (ndx == NDX_DONE) {
- if (inc_recurse && first_flist) {
- flist_free(first_flist);
-@@ -201,6 +207,9 @@ void send_files(int f_in, int f_out)
- continue;
- }
-
-+ if (inc_recurse)
-+ send_extra_file_list(f_out, FILECNT_LOOKAHEAD);
-+
- file = cur_flist->files[ndx - cur_flist->ndx_start];
- if (F_ROOTDIR(file)) {
- path = F_ROOTDIR(file);
-@@ -215,8 +224,13 @@ void send_files(int f_in, int f_out)
- if (verbose > 2)
- rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
-
-+ if (iflags & ITEM_REPORT_XATTR)
-+ recv_xattr_request(file, f_in);
-+
- if (!(iflags & ITEM_TRANSFER)) {
- maybe_log_item(file, iflags, itemizing, xname);
-+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
-+ fnamecmp_type, xname, xlen);
- continue;
- }
- if (phase == 2) {
-@@ -251,8 +265,8 @@ void send_files(int f_in, int f_out)
-
- if (!do_xfers) { /* log the transfer */
- log_item(FCLIENT, file, &stats, iflags, NULL);
-- write_ndx_and_attrs(f_out, ndx, iflags, fnamecmp_type,
-- xname, xlen);
-+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
-+ fnamecmp_type, xname, xlen);
- continue;
- }
-
-@@ -305,8 +319,8 @@ void send_files(int f_in, int f_out)
- path,slash,fname, (double)st.st_size);
- }
-
-- write_ndx_and_attrs(f_out, ndx, iflags, fnamecmp_type,
-- xname, xlen);
-+ write_ndx_and_attrs(f_out, ndx, iflags, fname, file,
-+ fnamecmp_type, xname, xlen);
- write_sum_head(f_xfer, s);
-
- if (verbose > 2)
---- old/testsuite/xattrs.test
-+++ new/testsuite/xattrs.test
-@@ -0,0 +1,56 @@
-+#! /bin/sh
-+
-+# This program is distributable under the terms of the GNU GPL (see
-+# COPYING).
-+
-+# Test that rsync handles basic xattr preservation.
-+
-+. $srcdir/testsuite/rsync.fns
-+
-+$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
-+
-+makepath "$fromdir/foo"
-+echo something >"$fromdir/file1"
-+echo else >"$fromdir/file2"
-+echo last >"$fromdir/foo/file3"
-+
-+makepath "$todir/foo"
-+echo wow >"$todir/file1"
-+cp -p "$fromdir/foo/file3" "$todir/foo"
-+
-+files='foo file1 file2 foo/file3'
-+
-+cd "$fromdir"
-+
-+setfattr -n user.short -v 'this is short' file1 2>/dev/null || test_skipped "Unable to set an xattr"
-+setfattr -n user.long -v 'this is a long attribute that will be truncated in the initial data send' file1
-+setfattr -n user.good -v 'this is good' file1
-+setfattr -n user.nice -v 'this is nice' file1
-+
-+setfattr -n user.foo -v foo file2
-+setfattr -n user.bar -v bar file2
-+
-+setfattr -n user.foo -v 'new foo' foo/file3
-+setfattr -n user.bar -v 'new bar' foo/file3
-+setfattr -n user.long -v 'this is also a long attribute that will be truncated in the initial data send' foo/file3
-+setfattr -n user.equal -v 'this long attribute should remain the same and not need to be transferred' foo/file3
-+
-+setfattr -n user.short -v 'old short' "$todir/file1"
-+setfattr -n user.extra -v 'remove me' "$todir/file1"
-+
-+setfattr -n user.foo -v 'old foo' "$todir/foo/file3"
-+setfattr -n user.equal -v 'this long attribute should remain the same and not need to be transferred' "$todir/foo/file3"
-+
-+$RSYNC -avX . "$todir/"
-+
-+getfattr -d $files >"$scratchdir/xattrs.txt"
-+
-+cd "$todir"
-+getfattr -d $files | diff $diffopt "$scratchdir/xattrs.txt" -
-+
-+# The script would have aborted on error, so getting here means we've won.
-+exit 0
---- old/xattrs.c
-+++ new/xattrs.c
-@@ -0,0 +1,688 @@
-+/*
-+ * Extended Attribute support for rsync.
-+ * Written by Jay Fenlason, vaguely based on the ACLs patch.
-+ *
-+ * Copyright (C) 2004 Red Hat, Inc.
-+ * Copyright (C) 2006, 2007 Wayne Davison
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License along
-+ * with this program; if not, write to the Free Software Foundation, Inc.,
-+ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include "rsync.h"
-+#include "lib/sysxattrs.h"
-+
-+#ifdef SUPPORT_XATTRS
-+
-+extern int dry_run;
-+extern int am_root;
-+extern int am_sender;
-+extern int read_only;
-+extern int list_only;
-+extern int checksum_seed;
-+
-+#define RSYNC_XAL_INITIAL 5
-+#define RSYNC_XAL_LIST_INITIAL 100
-+
-+#define MAX_FULL_DATUM 32
-+
-+#define HAS_PREFIX(str, prfx) (*(str) == *(prfx) \
-+ && strncmp(str, prfx, sizeof (prfx) - 1) == 0)
-+
-+#define USER_PREFIX "user."
-+#define UPRE_LEN ((int)sizeof USER_PREFIX - 1)
-+#define SYSTEM_PREFIX "system."
-+#define SPRE_LEN ((int)sizeof SYSTEM_PREFIX - 1)
-+
-+#ifdef HAVE_LINUX_XATTRS
-+#define RPRE_LEN 0
-+#else
-+#define RSYNC_PREFIX "rsync."
-+#define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
-+#endif
-+
-+typedef struct {
-+ char *datum, *name;
-+ size_t datum_len, name_len;
-+} rsync_xa;
-+
-+static size_t namebuf_len = 0;
-+static char *namebuf = NULL;
-+
-+static item_list empty_xattr = EMPTY_ITEM_LIST;
-+static item_list rsync_xal_l = EMPTY_ITEM_LIST;
-+
-+/* ------------------------------------------------------------------------- */
-+
-+static void rsync_xal_free(item_list *xalp)
-+{
-+ size_t i;
-+ rsync_xa *rxas = xalp->items;
-+
-+ for (i = 0; i < xalp->count; i++) {
-+ free(rxas[i].datum);
-+ /*free(rxas[i].name);*/
-+ }
-+ xalp->count = 0;
-+}
-+
-+void free_xattr(statx *sxp)
-+{
-+ if (!sxp->xattr)
-+ return;
-+ rsync_xal_free(sxp->xattr);
-+ free(sxp->xattr);
-+ sxp->xattr = NULL;
-+}
-+
-+static int rsync_xal_compare_names(const void *x1, const void *x2)
-+{
-+ const rsync_xa *xa1 = x1;
-+ const rsync_xa *xa2 = x2;
-+ return strcmp(xa1->name, xa2->name);
-+}
-+
-+static ssize_t get_xattr_names(const char *fname)
-+{
-+ ssize_t list_len;
-+
-+ if (!namebuf) {
-+ namebuf_len = 1024;
-+ namebuf = new_array(char, namebuf_len);
-+ if (!namebuf)
-+ out_of_memory("get_xattr_names");
-+ }
-+
-+ /* The length returned includes all the '\0' terminators. */
-+ list_len = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (list_len > (ssize_t)namebuf_len) {
-+ list_len = -1;
-+ errno = ERANGE;
-+ }
-+ if (list_len < 0) {
-+ if (errno == ENOTSUP)
-+ return 0;
-+ if (errno == ERANGE) {
-+ list_len = sys_llistxattr(fname, NULL, 0);
-+ if (list_len < 0) {
-+ rsyserr(FERROR, errno,
-+ "get_xattr_names: llistxattr(\"%s\",0) failed",
-+ fname);
-+ return -1;
-+ }
-+ if (namebuf_len)
-+ free(namebuf);
-+ namebuf_len = list_len + 1024;
-+ namebuf = new_array(char, namebuf_len);
-+ if (!namebuf)
-+ out_of_memory("get_xattr_names");
-+ list_len = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (list_len < 0) {
-+ rsyserr(FERROR, errno,
-+ "get_xattr_names: llistxattr(\"%s\",%ld) failed",
-+ fname, (long)namebuf_len);
-+ return -1;
-+ }
-+ } else {
-+ rsyserr(FERROR, errno,
-+ "get_xattr_names: llistxattr(\"%s\",%ld) failed",
-+ fname, (long)namebuf_len);
-+ return -1;
-+ }
-+ }
-+
-+ return list_len;
-+}
-+
-+/* On entry, the *len_ptr parameter contains the size of the extra space we
-+ * should allocate when we create a buffer for the data. On exit, it contains
-+ * the length of the datum. */
-+static char *get_xattr_data(const char *fname, const char *name, size_t *len_ptr)
-+{
-+ size_t datum_len = sys_lgetxattr(fname, name, NULL, 0);
-+ char *ptr;
-+
-+ if (datum_len == (size_t)-1) {
-+ if (errno == ENOTSUP)
-+ return NULL;
-+ rsyserr(FERROR, errno,
-+ "get_xattr_data: lgetxattr(\"%s\",\"%s\",0) failed",
-+ fname, name);
-+ return NULL;
-+ }
-+
-+ if (datum_len + *len_ptr < datum_len /* checks for overflow */
-+ || !(ptr = new_array(char, datum_len + *len_ptr)))
-+ out_of_memory("get_xattr_data");
-+
-+ *len_ptr = datum_len;
-+
-+ if (datum_len) {
-+ size_t len = sys_lgetxattr(fname, name, ptr, datum_len);
-+ if (len != datum_len) {
-+ if (len == (size_t)-1) {
-+ rsyserr(FERROR, errno,
-+ "get_xattr_data: lgetxattr(\"%s\",\"%s\",%ld)"
-+ " failed", fname, name, (long)datum_len);
-+ } else {
-+ rprintf(FERROR,
-+ "get_xattr_data: lgetxattr(\"%s\",\"%s\",%ld)"
-+ " returned %ld\n", fname, name,
-+ (long)datum_len, (long)len);
-+ }
-+ free(ptr);
-+ return NULL;
-+ }
-+ }
-+
-+ return ptr;
-+}
-+
-+static int rsync_xal_get(const char *fname, item_list *xalp)
-+{
-+ ssize_t list_len, name_len;
-+ size_t datum_len, name_offset;
-+ char *name, *ptr;
-+ int user_only = am_sender ? 0 : !am_root;
-+
-+ /* This puts the name list into the "namebuf" buffer. */
-+ if ((list_len = get_xattr_names(fname)) < 0)
-+ return -1;
-+
-+ for (name = namebuf; list_len > 0; name += name_len) {
-+ rsync_xa *rxas;
-+
-+ name_len = strlen(name) + 1;
-+ list_len -= name_len;
-+
-+#ifdef HAVE_LINUX_XATTRS
-+ /* We always ignore the system namespace, and non-root
-+ * ignores everything but the user namespace. */
-+ if (user_only ? !HAS_PREFIX(name, USER_PREFIX)
-+ : HAS_PREFIX(name, SYSTEM_PREFIX))
-+ continue;
-+#endif
-+
-+ datum_len = name_len; /* Pass extra size to get_xattr_data() */
-+ if (!(ptr = get_xattr_data(fname, name, &datum_len)))
-+ return -1;
-+
-+ if (datum_len > MAX_FULL_DATUM) {
-+ /* For large datums, we store a flag and a checksum. */
-+ name_offset = 1 + MAX_DIGEST_LEN;
-+ sum_init(checksum_seed);
-+ sum_update(ptr, datum_len);
-+ free(ptr);
-+
-+ if (!(ptr = new_array(char, name_offset + name_len)))
-+ out_of_memory("rsync_xal_get");
-+ *ptr = 0;
-+ sum_end(ptr + 1);
-+ } else
-+ name_offset = datum_len;
-+
-+ rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
-+ rxas->name = ptr + name_offset;
-+ memcpy(rxas->name, name, name_len);
-+ rxas->datum = ptr;
-+ rxas->name_len = name_len;
-+ rxas->datum_len = datum_len;
-+ }
-+ if (xalp->count > 1)
-+ qsort(xalp->items, xalp->count, sizeof (rsync_xa), rsync_xal_compare_names);
-+ return 0;
-+}
-+
-+/* Read the xattr(s) for this filename. */
-+int get_xattr(const char *fname, statx *sxp)
-+{
-+ sxp->xattr = new(item_list);
-+ *sxp->xattr = empty_xattr;
-+ if (rsync_xal_get(fname, sxp->xattr) < 0) {
-+ free_xattr(sxp);
-+ return -1;
-+ }
-+ return 0;
-+}
-+
-+static int find_matching_xattr(item_list *xalp)
-+{
-+ size_t i, j;
-+ item_list *lst = rsync_xal_l.items;
-+
-+ for (i = 0; i < rsync_xal_l.count; i++) {
-+ rsync_xa *rxas1 = lst[i].items;
-+ rsync_xa *rxas2 = xalp->items;
-+
-+ /* Wrong number of elements? */
-+ if (lst[i].count != xalp->count)
-+ continue;
-+ /* any elements different? */
-+ for (j = 0; j < xalp->count; j++) {
-+ if (rxas1[j].name_len != rxas2[j].name_len
-+ || rxas1[j].datum_len != rxas2[j].datum_len
-+ || strcmp(rxas1[j].name, rxas2[j].name))
-+ break;
-+ if (rxas1[j].datum_len > MAX_FULL_DATUM) {
-+ if (memcmp(rxas1[j].datum + 1,
-+ rxas2[j].datum + 1,
-+ MAX_DIGEST_LEN) != 0)
-+ break;
-+ } else {
-+ if (memcmp(rxas1[j].datum, rxas2[j].datum,
-+ rxas2[j].datum_len))
-+ break;
-+ }
-+ }
-+ /* no differences found. This is The One! */
-+ if (j == xalp->count)
-+ return i;
-+ }
-+
-+ return -1;
-+}
-+
-+/* Store *xalp on the end of rsync_xal_l */
-+static void rsync_xal_store(item_list *xalp)
-+{
-+ item_list *new_lst = EXPAND_ITEM_LIST(&rsync_xal_l, item_list, RSYNC_XAL_LIST_INITIAL);
-+ /* Since the following call starts a new list, we know it will hold the
-+ * entire initial-count, not just enough space for one new item. */
-+ *new_lst = empty_xattr;
-+ (void)EXPAND_ITEM_LIST(new_lst, rsync_xa, xalp->count);
-+ memcpy(new_lst->items, xalp->items, xalp->count * sizeof (rsync_xa));
-+ new_lst->count = xalp->count;
-+ xalp->count = 0;
-+}
-+
-+/* Send the make_xattr()-generated xattr list for this flist entry. */
-+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);
-+
-+ if (ndx < 0) {
-+ rsync_xa *rxa;
-+ int count = sxp->xattr->count;
-+ write_abbrevint(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_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_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_buf(f, USER_PREFIX, UPRE_LEN);
-+ write_buf(f, rxa->name, rxa->name_len);
-+ }
-+#endif
-+ if (rxa->datum_len > MAX_FULL_DATUM)
-+ write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
-+ else
-+ write_buf(f, rxa->datum, rxa->datum_len);
-+ }
-+ ndx = rsync_xal_l.count; /* pre-incremented count */
-+ rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
-+ }
-+
-+ return ndx;
-+}
-+
-+/* Return a flag indicating if we need to change a file's xattrs. If
-+ * "find_all" is specified, also mark any abbreviated xattrs that we
-+ * need so that send_xattr_request() can tell the sender about them. */
-+int xattr_diff(struct file_struct *file, statx *sxp, int find_all)
-+{
-+ item_list *lst = rsync_xal_l.items;
-+ rsync_xa *snd_rxa, *rec_rxa;
-+ int snd_cnt, rec_cnt;
-+ int cmp, same, xattrs_equal = 1;
-+
-+ if (!XATTR_READY(*sxp)) {
-+ rec_rxa = NULL;
-+ rec_cnt = 0;
-+ } else {
-+ rec_rxa = sxp->xattr->items;
-+ rec_cnt = sxp->xattr->count;
-+ }
-+
-+ if (F_XATTR(file) >= 0)
-+ lst += F_XATTR(file);
-+ else
-+ lst = &empty_xattr;
-+
-+ snd_rxa = lst->items;
-+ snd_cnt = lst->count;
-+
-+ /* If the count of the sender's xattrs is different from our
-+ * (receiver's) xattrs, the lists are not the same. */
-+ if (snd_cnt != rec_cnt) {
-+ if (!find_all)
-+ return 1;
-+ xattrs_equal = 0;
-+ }
-+
-+ while (snd_cnt) {
-+ cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
-+ if (cmp > 0)
-+ same = 0;
-+ else if (snd_rxa->datum_len > MAX_FULL_DATUM) {
-+ same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
-+ && memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
-+ MAX_DIGEST_LEN) == 0;
-+ /* Flag unrequested items that we need. */
-+ if (/*!same &&*/ find_all && snd_rxa->datum[0] == 0)
-+ snd_rxa->datum[0] = 1;
-+ } else {
-+ same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
-+ && memcmp(snd_rxa->datum, rec_rxa->datum,
-+ snd_rxa->datum_len) == 0;
-+ }
-+ if (!same) {
-+ if (!find_all)
-+ return 1;
-+ xattrs_equal = 0;
-+ }
-+
-+ if (cmp <= 0) {
-+ snd_rxa++;
-+ snd_cnt--;
-+ }
-+ if (cmp >= 0) {
-+ rec_rxa++;
-+ rec_cnt--;
-+ }
-+ }
-+
-+ if (rec_cnt)
-+ xattrs_equal = 0;
-+
-+ return !xattrs_equal;
-+}
-+
-+/* When called by the generator with a NULL fname, this tells the sender
-+ * which abbreviated xattr values we need. When called by the sender
-+ * (with a non-NULL fname), we send all the extra xattr data it needs. */
-+void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
-+{
-+ item_list *lst = rsync_xal_l.items;
-+ int j, cnt, prior_req = -1;
-+ rsync_xa *rxa;
-+
-+ lst += F_XATTR(file);
-+ cnt = lst->count;
-+ for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) {
-+ if (rxa->datum_len <= MAX_FULL_DATUM
-+ || rxa->datum[0] != 1)
-+ continue;
-+
-+ /* Flag that we handled this abbreviated item. */
-+ rxa->datum[0] = 2;
-+
-+ write_abbrevint(f_out, j - prior_req);
-+ prior_req = j;
-+
-+ if (fname) {
-+ size_t len = 0;
-+ char *ptr;
-+
-+ /* Re-read the long datum. */
-+ if (!(ptr = get_xattr_data(fname, rxa->name, &len)))
-+ continue;
-+
-+ write_abbrevint(f_out, len); /* length might have changed! */
-+ write_buf(f_out, ptr, len);
-+ free(ptr);
-+ }
-+ }
-+
-+ write_byte(f_out, 0); /* end the list */
-+}
-+
-+/* When called by the sender, read the request from the generator and mark
-+ * any needed xattrs with a flag that lets us know they need to be sent to
-+ * the receiver. When called by the receiver, reads the sent data and
-+ * stores it in place of its checksum. */
-+void recv_xattr_request(struct file_struct *file, int f_in)
-+{
-+ item_list *lst = rsync_xal_l.items;
-+ char *old_datum, *name;
-+ rsync_xa *rxa;
-+ int rel_pos, cnt;
-+
-+ if (F_XATTR(file) >= 0)
-+ lst += F_XATTR(file);
-+ else
-+ exit_cleanup(RERR_STREAMIO); /* XXX */
-+
-+ cnt = lst->count;
-+ rxa = lst->items;
-+ rxa -= 1;
-+ while ((rel_pos = read_abbrevint(f_in)) != 0) {
-+ rxa += rel_pos;
-+ cnt -= rel_pos;
-+ if (cnt < 0 || rxa->datum_len <= MAX_FULL_DATUM
-+ || rxa->datum[0] != 0)
-+ exit_cleanup(RERR_STREAMIO); /* XXX */
-+
-+ if (am_sender) {
-+ rxa->datum[0] = 1;
-+ continue;
-+ }
-+
-+ old_datum = rxa->datum;
-+ rxa->datum_len = read_abbrevint(f_in);
-+
-+ if (rxa->name_len + rxa->datum_len < rxa->name_len)
-+ out_of_memory("recv_xattr_request"); /* overflow */
-+ rxa->datum = new_array(char, rxa->datum_len + rxa->name_len);
-+ if (!rxa->datum)
-+ out_of_memory("recv_xattr_request");
-+ name = rxa->datum + rxa->datum_len;
-+ memcpy(name, rxa->name, rxa->name_len);
-+ rxa->name = name;
-+ free(old_datum);
-+ read_buf(f_in, rxa->datum, rxa->datum_len);
-+ }
-+}
-+
-+/* ------------------------------------------------------------------------- */
-+
-+/* receive and build the rsync_xattr_lists */
-+void receive_xattr(struct file_struct *file, int f)
-+{
-+ static item_list temp_xattr = EMPTY_ITEM_LIST;
-+ int count;
-+ int ndx = read_abbrevint(f);
-+
-+ if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
-+ rprintf(FERROR, "receive_xattr: xa index %d out of"
-+ " range for %s\n", ndx, f_name(file, NULL));
-+ exit_cleanup(RERR_STREAMIO);
-+ }
-+
-+ if (ndx != 0) {
-+ F_XATTR(file) = ndx - 1;
-+ return;
-+ }
-+
-+ if ((count = read_abbrevint(f)) != 0) {
-+ (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
-+ temp_xattr.count = 0;
-+ }
-+
-+ while (count--) {
-+ char *ptr, *name;
-+ rsync_xa *rxa;
-+ size_t name_len = read_abbrevint(f);
-+ size_t datum_len = read_abbrevint(f);
-+ size_t dget_len = datum_len > MAX_FULL_DATUM ? 1 + MAX_DIGEST_LEN : datum_len;
-+#ifdef HAVE_LINUX_XATTRS
-+ size_t extra_len = 0;
-+#else
-+ size_t extra_len = am_root ? RPRE_LEN : 0;
-+ if (dget_len + extra_len < dget_len)
-+ out_of_memory("receive_xattr"); /* overflow */
-+#endif
-+ if (dget_len + extra_len + name_len < dget_len)
-+ out_of_memory("receive_xattr"); /* overflow */
-+ ptr = new_array(char, dget_len + extra_len + name_len);
-+ if (!ptr)
-+ out_of_memory("receive_xattr");
-+ name = ptr + dget_len + extra_len;
-+ read_buf(f, name, name_len);
-+ if (dget_len == datum_len)
-+ read_buf(f, ptr, dget_len);
-+ else {
-+ *ptr = 0;
-+ read_buf(f, ptr + 1, MAX_DIGEST_LEN);
-+ }
-+#ifdef HAVE_LINUX_XATTRS
-+ /* Non-root can only save the user namespace. */
-+ if (!am_root && !HAS_PREFIX(name, USER_PREFIX)) {
-+ free(ptr);
-+ continue;
-+ }
-+#else
-+ /* This OS only has a user namespace, so we either
-+ * strip the user prefix, or we put a non-user
-+ * namespace inside our rsync hierarchy. */
-+ if (HAS_PREFIX(name, USER_PREFIX)) {
-+ name += UPRE_LEN;
-+ name_len -= UPRE_LEN;
-+ } else if (am_root) {
-+ name -= RPRE_LEN;
-+ name_len += RPRE_LEN;
-+ memcpy(name, RSYNC_PREFIX, RPRE_LEN);
-+ } else {
-+ free(ptr);
-+ continue;
-+ }
-+#endif
-+ rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, 1);
-+ rxa->name = name;
-+ rxa->datum = ptr;
-+ rxa->name_len = name_len;
-+ rxa->datum_len = datum_len;
-+ }
-+
-+ ndx = rsync_xal_l.count; /* pre-incremented count */
-+ rsync_xal_store(&temp_xattr); /* adds item to rsync_xal_l */
-+
-+ F_XATTR(file) = ndx;
-+}
-+
-+/* Turn the xattr data in statx into cached xattr data, setting the index
-+ * values in the file struct. */
-+void cache_xattr(struct file_struct *file, statx *sxp)
-+{