-+#ifdef HAVE_LINUX_XATTRS
-+#define SUPPORT_XATTRS 1
-+#endif
-+
-+#ifdef SUPPORT_XATTRS
-+#ifdef HAVE_ATTR_XATTR_H
-+#include <attr/xattr.h>
-+#endif
-+#define MAKE_XATTR(file, fname) make_xattr(file, fname)
-+#define SEND_XATTR(file, f) send_xattr(file, f)
-+#define RECEIVE_XATTR(file, f) receive_xattr(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS() sort_file_xattr_index_lists()
-+#define SET_XATTR(fname, file) set_xattr(fname, file)
-+#define NEXT_XATTR_UID() next_xattr_uid()
-+#define XATTR_UID_MAP(uid) xattr_uid_map(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest) \
-+ push_keep_backup_xattr(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR() cleanup_keep_backup_xattr()
-+#define DUP_XATTR(orig, dest) dup_xattr(orig, dest)
-+#else /* SUPPORT_XATTRS */
-+#define MAKE_XATTR(file, fname) 1 /* checked return value */
-+#define SEND_XATTR(file, f)
-+#define RECEIVE_XATTR(file, f)
-+#define SORT_FILE_XATTR_INDEX_LISTS()
-+#define SET_XATTR(fname, file) 1 /* checked return value */
-+#define NEXT_XATTR_UID()
-+#define XATTR_UID_MAP(uid)
-+#define PUSH_KEEP_BACKUP_XATTR(file, orig, dest)
-+#define CLEANUP_KEEP_BACKUP_XATTR()
-+#define DUP_XATTR(src, orig) 1 /* checked return value */
-+#endif /* SUPPORT_XATTRS */
-+
- #include "proto.h"
-
- /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2004-07-03 20:11:58
-+++ rsync.yo 2005-03-03 01:33:53
-@@ -317,6 +317,7 @@ to the detailed description below for a
- -K, --keep-dirlinks treat symlinked dir on receiver as dir
- -p, --perms preserve permissions
- -A, --acls preserve ACLs (implies -p) [local option]
-+ -X, --xattrs preserve extended attributes (implies -p) [local option]
- -o, --owner preserve owner (root only)
- -g, --group preserve group
- -D, --devices preserve devices (root only)
-@@ -672,6 +673,11 @@ ACLs to be the same as the local ACLs.
- remote machine's rsync supports this option also. This is a non-standard
- option.
-
-+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(-o, --owner)) This option causes rsync to set the owner of the
- destination file to be the same as the source file. On most systems,
- only the super-user can set file ownership. By default, the preservation
---- orig/xattr.c 2005-10-16 23:25:12
-+++ xattr.c 2005-10-16 23:25:12
-@@ -0,0 +1,540 @@
-+/* Extended Attribute support for rsync */
-+/* Copyright (C) 2004 Red Hat, Inc */
-+/* Written by Jay Fenlason, vaguely based on the ACLs patch */
-+
-+/* This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
-+*/
-+
-+#include "rsync.h"
-+#include "lib/sysxattr.h"
-+
-+#ifdef SUPPORT_XATTRS
-+
-+extern int preserve_xattrs;
-+extern int dry_run;
-+
-+#define RSYNC_XAL_INITIAL 5
-+#define RSYNC_XAL_LIST_INITIAL 100
-+
-+typedef struct {
-+ size_t name_len;
-+ char *name;
-+ size_t datum_len;
-+ char *datum;
-+} rsync_xa;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ rsync_xa *rxas;
-+} rsync_xal;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ rsync_xal *rxals;
-+} rsync_xal_list;
-+
-+static size_t namebuf_len = 0;
-+static char *namebuf = NULL;
-+
-+static size_t datumbuf_len = 0;
-+static char *datumbuf = NULL;
-+
-+static rsync_xal curr_rsync_xal = { 0, 0, NULL };
-+static rsync_xal_list rsync_xal_l = { 0, 0, NULL };
-+
-+
-+/* ------------------------------------------------------------------------- */
-+
-+/* the below stuff is only used by the receiver */
-+
-+/* structure to hold index to rsync_xal_l member corresponding to
-+ * flist->files[i] */
-+
-+typedef struct {
-+ const struct file_struct *file;
-+ int xalidx;
-+} file_xal_index;
-+
-+typedef struct {
-+ size_t count;
-+ size_t alloc;
-+ file_xal_index *filexalidxs;
-+} file_xal_index_list;
-+
-+static file_xal_index_list fxil = {0, 0, NULL };
-+
-+/* stuff for redirecting calls to set_acl() from set_perms()
-+ * for keep_backup() */
-+static const struct file_struct *backup_orig_file = NULL;
-+static const char null_string[] = "";
-+static const char *backup_orig_fname = null_string;
-+static const char *backup_dest_fname = null_string;
-+static rsync_xal backup_xal;
-+
-+/* ------------------------------------------------------------------------- */
-+
-+static void rsync_xal_free(rsync_xal *x)
-+{
-+ size_t i;
-+
-+ for (i = 0; i < x->count; i++) {
-+ free(x->rxas[i].name);
-+ /* free(x->rxas[i].value); */
-+ }
-+ x->count = 0;
-+}
-+
-+static int rsync_xal_compare_names(const void *x1, const void *x2)
-+{
-+ const rsync_xa *xa1;
-+ const rsync_xa *xa2;
-+
-+ xa1 = x1;
-+ xa2 = x2;
-+ return strcmp(xa1->name, xa2->name);
-+}
-+
-+static int rsync_xal_get(const char *fname, rsync_xal *x)
-+{
-+ ssize_t name_size;
-+ ssize_t datum_size;
-+ ssize_t left;
-+ char *name;
-+ size_t len;
-+ char *ptr;
-+
-+ if (!namebuf) {
-+ namebuf_len = 100;
-+ namebuf = new_array(char, namebuf_len);
-+ datumbuf_len = 100;
-+ datumbuf = new_array(char, datumbuf_len);
-+ if (!namebuf || !datumbuf)
-+ out_of_memory("rsync_xal_get");
-+ }
-+
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size > (ssize_t)namebuf_len) {
-+ name_size = -1;
-+ errno = ERANGE;
-+ }
-+ if (name_size < 0) {
-+ if (errno == ENOTSUP)
-+ return -1;
-+ if (errno == ERANGE) {
-+ name_size = sys_llistxattr(fname, NULL, 0);
-+ if (name_size < 0) {
-+ rprintf(FERROR, "%s: rsync_xal_get: llistxattr: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ namebuf = realloc_array(namebuf, char, name_size + 1);
-+ if (!namebuf)
-+ out_of_memory("rsync_xal_get");
-+ namebuf_len = name_size;
-+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
-+ if (name_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: re-llistxattr failed: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ } else {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: llistxattr failed: %s\n",
-+ fname, strerror(errno));
-+ return -1;
-+ }
-+ }
-+ rsync_xal_free(x);
-+ if (name_size == 0)
-+ return 0;
-+ for (left = name_size, name = namebuf; left > 0 ; left -= len, name += len) {
-+ len = strlen(name) + 1;
-+
-+ if (x->count >= x->alloc) {
-+ size_t new_alloc;
-+ rsync_xa *new_rxas;
-+
-+ new_alloc = x->alloc < RSYNC_XAL_INITIAL ? RSYNC_XAL_INITIAL : x->alloc * 2;
-+ new_rxas = realloc_array(x->rxas, rsync_xa, new_alloc);
-+ if (!new_rxas)
-+ out_of_memory("rsync_xal_get");
-+ x->alloc = new_alloc;
-+ x->rxas = new_rxas;
-+ }
-+ datum_size = sys_lgetxattr(fname, name, datumbuf, datumbuf_len);
-+ if (datum_size > (ssize_t)datumbuf_len) {
-+ datum_size = -1;
-+ errno = ERANGE;
-+ }
-+ if (datum_size < 0) {
-+ if (errno == ENOTSUP)
-+ return -1;
-+ if (errno == ERANGE) {
-+ datum_size = sys_lgetxattr(fname, name, NULL, 0);
-+ if (datum_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: lgetxattr %s failed: %s\n",
-+ fname, name, strerror(errno));
-+ return -1;
-+ }
-+ datumbuf = realloc_array(datumbuf, char, datum_size + 1);
-+ if (!datumbuf)
-+ out_of_memory("rsync_xal_get");
-+ datumbuf_len = datum_size;
-+ datum_size = sys_lgetxattr(fname, name, datumbuf, datumbuf_len);
-+ if (datum_size < 0) {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: re-lgetxattr of %s failed: %s\n",
-+ name, fname, strerror(errno));
-+ return -1;
-+ }
-+ } else {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: lgetxattr %s failed: %s\n",
-+ fname, name, strerror(errno));
-+ return -1;
-+ }
-+ }
-+ ptr = new_array(char, len + datum_size);
-+ if (!ptr)
-+ out_of_memory("rsync_xal_get");
-+ strcpy(ptr, name);
-+ if (datum_size)
-+ memcpy(ptr + len, datumbuf, datum_size);
-+ x->rxas[curr_rsync_xal.count].name_len = len;
-+ x->rxas[curr_rsync_xal.count].name = ptr;
-+ x->rxas[curr_rsync_xal.count].datum_len = datum_size;
-+ x->rxas[curr_rsync_xal.count].datum = ptr + len;
-+ x->count++;
-+ }
-+ if (x->count > 1) {
-+ qsort(x->rxas, x->count, sizeof (rsync_xa), rsync_xal_compare_names);
-+ }
-+ return 0;
-+}
-+
-+
-+/* generate the xattr(s) for this flist entry;
-+ * xattr(s) are either sent or cleaned-up by send_xattr() below */
-+
-+int make_xattr(const struct file_struct *file, const char *fname)
-+{
-+ if (!preserve_xattrs || !file)
-+ return 1;
-+
-+ rsync_xal_get(fname, &curr_rsync_xal);
-+ return 0; /* TODO: This needs to return 1 if no xattrs changed! */
-+}
-+
-+static ssize_t rsync_xal_find_matching(void)
-+{
-+ size_t i;
-+ size_t j;
-+
-+ for (i = 0; i < rsync_xal_l.count; i++) {
-+ /* Wrong number of elements? */
-+ if (rsync_xal_l.rxals[i].count != curr_rsync_xal.count)
-+ continue;
-+ /* any elements different? */
-+ for (j = 0; j < curr_rsync_xal.count; j++) {
-+ if (rsync_xal_l.rxals[i].rxas[j].name_len != curr_rsync_xal.rxas[j].name_len
-+ || rsync_xal_l.rxals[i].rxas[j].datum_len != curr_rsync_xal.rxas[j].datum_len
-+ || strcmp(rsync_xal_l.rxals[i].rxas[j].name, curr_rsync_xal.rxas[j].name)
-+ || memcmp(rsync_xal_l.rxals[i].rxas[j].datum, curr_rsync_xal.rxas[j].datum, curr_rsync_xal.rxas[j].datum_len))
-+ break;