Depends-On-Patch: acls.diff
+This patch adds preliminary support for extended attributes.
+
After applying this patch, run these commands for a successful build:
- autoconf
- autoheader
+ ./prepare-source
./configure --enable-acl-support --enable-xattr-support
- make proto
make
---- orig/Makefile.in 2005-11-07 04:31:05
-+++ Makefile.in 2005-11-07 04:38:36
-@@ -27,13 +27,13 @@ VERSION=@VERSION@
+TODO:
+
+ - This patch needs to more efficiently handle large xattrs, especially when
+ they're unchanged.
+
+ - Extraneous xattr values need to be removed from files that are not being
+ recreated.
+
+ - We need to affect the itemized output to know when xattrs are being updated.
+
+ - We need to affect the --link-dest option to avoid hard-linking two files
+ that differ in their xattrs (when --xattrs was specified).
+
+--- old/Makefile.in
++++ new/Makefile.in
+@@ -28,13 +28,13 @@ VERSION=@VERSION@
HEADERS=byteorder.h config.h errcode.h proto.h rsync.h smb_acls.h lib/pool_alloc.h
LIBOBJ=lib/wildmatch.o lib/compat.o lib/snprintf.o lib/mdfour.o \
OBJS3=progress.o pipe.o
DAEMON_OBJ = params.o loadparm.o clientserver.o access.o connection.o authenticate.o
popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
---- orig/backup.c 2004-10-06 00:13:09
-+++ backup.c 2005-03-03 01:20:46
-@@ -136,6 +136,7 @@ static int make_bak_dir(char *fullpath)
- do_lchown(fullpath, st.st_uid, st.st_gid);
- do_chmod(fullpath, st.st_mode);
- (void)DUP_ACL(end, fullpath, st.st_mode);
-+ (void)DUP_XATTR(end, fullpath );
+--- old/acls.c
++++ new/acls.c
+@@ -31,6 +31,7 @@ extern int read_only;
+ extern int list_only;
+ extern int orig_umask;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern unsigned int file_struct_len;
+
+ /* === ACL structures === */
+@@ -742,6 +743,10 @@ void receive_acl(struct file_struct *fil
+ type = SMB_ACL_TYPE_ACCESS;
+ racl_list = &access_acl_list;
+ ndx_ptr = (char*)file + file_struct_len;
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ ndx_ptr += 4;
++#endif
+ do {
+ char tag = read_byte(f);
+ int ndx;
+@@ -801,6 +806,10 @@ void cache_acl(struct file_struct *file,
+ racl = sxp->acc_acl;
+ racl_list = &access_acl_list;
+ ndx_ptr = (char*)file + file_struct_len;
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ ndx_ptr += 4;
++#endif
+ do {
+ if (!racl)
+ ndx = -1;
+@@ -921,6 +930,10 @@ int set_acl(const char *fname, const str
+
+ type = SMB_ACL_TYPE_ACCESS;
+ ndx_ptr = (char*)file + file_struct_len;
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ ndx_ptr += 4;
++#endif
+ do {
+ acl_duo *duo_item;
+ BOOL eq;
+--- old/backup.c
++++ new/backup.c
+@@ -30,6 +30,7 @@ extern char *backup_dir;
+
+ extern int am_root;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_devices;
+ extern int preserve_specials;
+ extern int preserve_links;
+@@ -136,6 +137,9 @@ static int make_bak_dir(char *fullpath)
+ #ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+ #endif
++#ifdef SUPPORT_XATTRS
++ sx.xattr = NULL;
++#endif
+ if (!(file = make_file(rel, NULL, NULL, 0, NO_FILTERS)))
+ continue;
+ #ifdef SUPPORT_ACLS
+@@ -144,6 +148,12 @@ static int make_bak_dir(char *fullpath)
+ cache_acl(file, &sx);
+ }
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs) {
++ get_xattr(rel, &sx);
++ cache_xattr(file, &sx);
++ }
++#endif
+ set_file_attrs(fullpath, file, NULL, 0);
+ free(file);
}
- }
- *p = '/';
-@@ -190,6 +191,7 @@ static int keep_backup(char *fname)
- return 0;
+@@ -195,6 +205,9 @@ static int keep_backup(char *fname)
+ #ifdef SUPPORT_ACLS
+ sx.acc_acl = sx.def_acl = NULL;
+ #endif
++#ifdef SUPPORT_XATTRS
++ sx.xattr = NULL;
++#endif
- PUSH_KEEP_BACKUP_ACL(file, fname, buf);
-+ PUSH_KEEP_BACKUP_XATTR(file, fname, buf);
+ if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
+ return 1; /* the file could have disappeared */
+@@ -208,6 +221,12 @@ static int keep_backup(char *fname)
+ cache_acl(file, &sx);
+ }
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs) {
++ get_xattr(fname, &sx);
++ cache_xattr(file, &sx);
++ }
++#endif
/* Check to see if this is a device file, or link */
if ((am_root && preserve_devices && IS_DEVICE(file->mode))
-@@ -267,6 +269,7 @@ static int keep_backup(char *fname)
- }
- set_file_attrs(buf, file, NULL, 0);
- CLEANUP_KEEP_BACKUP_ACL();
-+ CLEANUP_KEEP_BACKUP_XATTR();
- free(file);
-
- if (verbose > 1) {
---- orig/configure.in 2004-08-19 19:53:27
-+++ configure.in 2005-05-12 22:57:53
-@@ -827,6 +827,30 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+--- old/configure.in
++++ new/configure.in
+@@ -856,6 +856,35 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
AC_MSG_RESULT(no)
)
+AC_CHECK_HEADERS(attr/xattr.h)
++AC_CHECK_HEADERS(sys/xattr.h)
+AC_MSG_CHECKING(whether to support extended attributes)
+AC_ARG_ENABLE(xattr-support,
+AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
+ AC_MSG_RESULT(Using Linux xattrs)
+ AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs])
+ ;;
++ darwin*)
++ AC_MSG_RESULT(Using OS X xattrs)
++ AC_DEFINE(HAVE_OSX_XATTRS, 1, [True if you have Mac OS X xattrs])
++ ;;
+ *)
-+ AC_MSG_RESULT(Xattrs requested but not linux. Good luck)
++ AC_MSG_RESULT(Xattrs requested but not Linux or OS X. Good luck...)
+ ;;
+ esac
+ ;;
+ *)
+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NA_XATTRS, 1, [True if you don't have extended attributes])
++ AC_DEFINE(HAVE_NO_XATTRS, 1, [True if you don't have extended attributes])
+ esac ],
+ AC_MSG_RESULT(no)
-+ AC_DEFINE(HAVE_NO_XATTRL, 1, [True if you don't have extended attributes])
++ AC_DEFINE(HAVE_NO_XATTRS, 1, [True if you don't have extended attributes])
+)
+
AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
AC_OUTPUT
---- orig/flist.c 2006-01-31 02:37:33
-+++ flist.c 2005-10-16 23:03:04
-@@ -969,6 +969,8 @@ static struct file_struct *send_file_nam
- return NULL;
- if (MAKE_ACL(file, fname) < 0)
- return NULL;
-+ if (MAKE_XATTR(file, fname) < 0)
-+ return NULL;
+--- old/flist.c
++++ new/flist.c
+@@ -41,6 +41,7 @@ extern int one_file_system;
+ extern int copy_dirlinks;
+ extern int keep_dirlinks;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_links;
+ extern int preserve_hard_links;
+ extern int preserve_devices;
+@@ -498,7 +499,7 @@ static struct file_struct *receive_file_
+ char thisname[MAXPATHLEN];
+ unsigned int l1 = 0, l2 = 0;
+ int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
+-#ifdef SUPPORT_ACLS
++#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+ int xtra_len;
+ #endif
+ OFF_T file_length;
+@@ -610,10 +611,16 @@ static struct file_struct *receive_file_
+ xtra_len = (S_ISDIR(mode) ? 2 : 1) * 4;
+ else
+ xtra_len = 0;
++#elif defined SUPPORT_XATTRS
++ xtra_len = 0;
++#endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ xtra_len += 4;
+ #endif
+
+ alloc_len = file_struct_len + dirname_len + basename_len
+-#ifdef SUPPORT_ACLS
++#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+ + xtra_len
+ #endif
+ + linkname_len + sum_len;
+@@ -622,7 +629,7 @@ static struct file_struct *receive_file_
+ file = (struct file_struct *)bp;
+ memset(bp, 0, file_struct_len);
+ bp += file_struct_len;
+-#ifdef SUPPORT_ACLS
++#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+ bp += xtra_len;
+ #endif
+
+@@ -723,6 +730,10 @@ static struct file_struct *receive_file_
+ if (preserve_acls)
+ receive_acl(file, f);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ receive_xattr(file, f );
++#endif
- if (chmod_modes && !S_ISLNK(file->mode))
- file->mode = tweak_mode(file->mode, chmod_modes);
-@@ -981,9 +983,11 @@ static struct file_struct *send_file_nam
- flist->files[flist->count++] = file;
- send_file_entry(file, f);
- SEND_ACL(file, f);
-+ SEND_XATTR(file, f);
- } else {
- /* Cleanup unsent ACL(s). */
- SEND_ACL(file, -1);
-+ SEND_XATTR(file, -1);
- }
return file;
}
-@@ -1373,6 +1377,7 @@ struct file_list *recv_file_list(int f)
- file = receive_file_entry(flist, flags, f);
-
- RECEIVE_ACL(file, f);
-+ RECEIVE_XATTR(file, f );
+@@ -974,7 +985,7 @@ static struct file_struct *send_file_nam
+ unsigned short flags)
+ {
+ struct file_struct *file;
+-#ifdef SUPPORT_ACLS
++#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+ statx sx;
+ #endif
- if (S_ISREG(file->mode))
- stats.total_size += file->length;
-@@ -1397,6 +1402,7 @@ struct file_list *recv_file_list(int f)
- clean_flist(flist, relative_paths, 1);
+@@ -994,6 +1005,13 @@ static struct file_struct *send_file_nam
+ return NULL;
+ }
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs) {
++ sx.xattr = NULL;
++ if (get_xattr(fname, &sx) < 0)
++ return NULL;
++ }
++#endif
- SORT_FILE_ACL_INDEX_LISTS();
-+ SORT_FILE_XATTR_INDEX_LISTS();
+ maybe_emit_filelist_progress(flist->count + flist_count_offset);
- if (f >= 0) {
- recv_uid_list(f, flist);
---- orig/generator.c 2006-01-31 19:36:04
-+++ generator.c 2005-05-12 23:21:08
-@@ -907,6 +907,10 @@ static void recv_generator(char *fname,
- if (f_out == -1)
- SET_ACL(fname, file);
+@@ -1006,11 +1024,19 @@ static struct file_struct *send_file_nam
+ if (preserve_acls)
+ send_acl(&sx, f);
#endif
+#ifdef SUPPORT_XATTRS
-+ if (f_out == -1)
-+ SET_XATTR(fname, file);
++ if (preserve_xattrs)
++ send_xattr(&sx, f);
+#endif
- if (delete_during && f_out != -1 && !phase && dry_run < 2
- && (file->flags & FLAG_DEL_HERE))
- delete_in_dir(the_file_list, fname, file, &st);
---- orig/lib/sysxattr.c 2005-05-12 23:23:15
-+++ lib/sysxattr.c 2005-05-12 23:23:15
-@@ -0,0 +1,41 @@
-+/* Extended attribute support for rsync. */
-+/* This file Copyright (C) 2004 Red Hat, Inc. */
-+/* Written by Jay Fenlason */
-+
-+/* 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.
-+*/
+ } else {
+ #ifdef SUPPORT_ACLS
+ if (preserve_acls)
+ free_acl(&sx);
+ #endif
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs)
++ free_xattr(&sx);
++#endif
+ }
+ return file;
+ }
+--- old/lib/sysxattr.c
++++ new/lib/sysxattr.c
+@@ -0,0 +1,87 @@
++/*
++ * Extended attribute support for rsync.
++ *
++ * Copyright (C) 2004 Red Hat, Inc.
++ * Written by Jay Fenlason.
++ *
++ * 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.,
++ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
++ */
+
+#include "rsync.h"
++#include "sysxattr.h"
++
++#ifdef SUPPORT_XATTRS
+
-+#if defined(HAVE_LINUX_XATTRS)
++#if defined HAVE_LINUX_XATTRS
+
+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
+{
+ return lgetxattr(path, name, value, size);
+}
+
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
++{
++ return fgetxattr(filedes, name, value, size);
++}
++
+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
+{
+ return lsetxattr(path, name, value, size, flags);
+}
+
++int sys_lremovexattr(const char *path, const char *name)
++{
++ return lremovexattr(path, name);
++}
++
+ssize_t sys_llistxattr(const char *path, char *list, size_t size)
+{
+ return llistxattr(path, list, size);
+}
+
++#elif HAVE_OSX_XATTRS
++
++ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
++{
++ return getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
++}
++
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
++{
++ return fgetxattr(filedes, name, value, size, 0, 0);
++}
++
++int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
++{
++ return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW | flags);
++}
++
++int sys_lremovexattr(const char *path, const char *name)
++{
++ return removexattr(path, name, XATTR_NOFOLLOW);
++}
++
++ssize_t sys_llistxattr(const char *path, char *list, size_t size)
++{
++ return listxattr(path, list, size, XATTR_NOFOLLOW);
++}
++
+#else
+
-+#endif /* No xattrs */
---- orig/lib/sysxattr.h 2005-05-12 23:56:31
-+++ lib/sysxattr.h 2005-05-12 23:56:31
-@@ -0,0 +1,9 @@
-+#if defined(HAVE_LINUX_XATTRS)
++#error You need to create xattr compatibility functions.
++
++#endif
++
++#endif /* SUPPORT_XATTRS */
+--- old/lib/sysxattr.h
++++ new/lib/sysxattr.h
+@@ -0,0 +1,24 @@
++#ifdef SUPPORT_XATTRS
++
++#if defined HAVE_ATTR_XATTR_H
++#include <attr/xattr.h>
++#elif defined HAVE_SYS_XATTR_H
++#include <sys/xattr.h>
++#endif
++
++/* Linux 2.4 does not define this as a distinct errno value: */
++#ifndef ENOATTR
++#define ENOATTR ENODATA
++#endif
+
+ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size);
+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
++int sys_lremovexattr(const char *path, const char *name);
+ssize_t sys_llistxattr(const char *path, char *list, size_t size);
+
+#else
+
-+#endif /* No xattrs */
---- orig/options.c 2006-02-02 11:45:46
-+++ options.c 2006-01-31 03:16:24
-@@ -45,6 +45,7 @@ int copy_links = 0;
++/* No xattrs available */
++
++#endif
+--- old/options.c
++++ new/options.c
+@@ -48,6 +48,7 @@ int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_perms = 0;
int preserve_executability = 0;
int preserve_devices = 0;
-@@ -195,6 +196,7 @@ static void print_rsync_version(enum log
+@@ -201,6 +202,7 @@ static void print_rsync_version(enum log
char const *have_inplace = "no ";
char const *hardlinks = "no ";
char const *acls = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
STRUCT_STAT *dumstat;
-@@ -214,7 +216,9 @@ static void print_rsync_version(enum log
+@@ -220,7 +222,9 @@ static void print_rsync_version(enum log
#ifdef SUPPORT_ACLS
acls = "";
#endif
#ifdef SUPPORT_LINKS
links = "";
#endif
-@@ -228,9 +232,9 @@ static void print_rsync_version(enum log
- rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
- rprintf(f, "<http://rsync.samba.org/>\n");
- rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
-- "%shard links, %sACLs, %ssymlinks, batchfiles,\n",
-+ "%shard links, %sACLs, %sxattrs, %ssymlinks, batchfiles,\n",
- (int) (sizeof (OFF_T) * 8),
-- got_socketpair, hardlinks, acls, links);
-+ got_socketpair, hardlinks, acls, xattrs, links);
+@@ -236,8 +240,8 @@ static void print_rsync_version(enum log
+ rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, %shard links, %ssymlinks,\n",
+ (int) (sizeof (OFF_T) * 8), got_socketpair, hardlinks, links);
+
+- rprintf(f, " batchfiles, %sinplace, %sIPv6, %sACLs,\n",
+- have_inplace, ipv6, acls);
++ rprintf(f, " batchfiles, %sinplace, %sIPv6, %sACLs, %sxattrs,\n",
++ have_inplace, ipv6, acls, xattrs);
/* Note that this field may not have type ino_t. It depends
* on the complicated interaction between largefile feature
-@@ -300,6 +304,7 @@ void usage(enum logcode F)
- rprintf(F," -p, --perms preserve permissions\n");
- rprintf(F," -E, --executability preserve the file's executability\n");
+@@ -289,7 +293,7 @@ void usage(enum logcode F)
+ rprintf(F," -q, --quiet suppress non-error messages\n");
+ rprintf(F," --no-motd suppress daemon-mode MOTD (see manpage caveat)\n");
+ rprintf(F," -c, --checksum skip based on checksum, not mod-time & size\n");
+- rprintf(F," -a, --archive archive mode; same as -rlptgoD (no -H, -A)\n");
++ rprintf(F," -a, --archive archive mode; equals -rlptgoD (no -H,-A,-X)\n");
+ rprintf(F," --no-OPTION turn off an implied OPTION (e.g. --no-D)\n");
+ rprintf(F," -r, --recursive recurse into directories\n");
+ rprintf(F," -R, --relative use relative path names\n");
+@@ -314,6 +318,9 @@ void usage(enum logcode F)
+ #ifdef SUPPORT_ACLS
rprintf(F," -A, --acls preserve ACLs (implies --perms)\n");
+ #endif
++#ifdef SUPPORT_XATTRS
+ rprintf(F," -X, --xattrs preserve extended attributes (implies --perms)\n");
- rprintf(F," --chmod=CHMOD change destination permissions\n");
++#endif
rprintf(F," -o, --owner preserve owner (super-user only)\n");
rprintf(F," -g, --group preserve group\n");
-@@ -419,6 +424,9 @@ static struct poptOption long_options[]
+ rprintf(F," --devices preserve device files (super-user only)\n");
+@@ -436,6 +443,9 @@ static struct poptOption long_options[]
{"acls", 'A', POPT_ARG_NONE, 0, 'A', 0, 0 },
{"no-acls", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
{"no-A", 0, POPT_ARG_VAL, &preserve_acls, 0, 0, 0 },
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
-@@ -1084,6 +1092,17 @@ int parse_arguments(int *argc, const cha
+@@ -1117,6 +1127,17 @@ int parse_arguments(int *argc, const cha
return 0;
- #endif /* SUPPORT_ACLS */
+ #endif
+ case 'X':
+#ifdef SUPPORT_XATTRS
+ "extended attributes are not supported on this %s\n",
+ am_server ? "server" : "client");
+ return 0;
-+#endif /* SUPPORT_XATTRS */
++#endif
default:
/* A large opt value means that set_refuse_options()
-@@ -1527,6 +1546,8 @@ void server_options(char **args,int *arg
- argstr[x++] = 'H';
+@@ -1563,6 +1584,10 @@ void server_options(char **args,int *arg
if (preserve_acls)
argstr[x++] = 'A';
+ #endif
++#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs)
+ argstr[x++] = 'X';
++#endif
if (preserve_uid)
argstr[x++] = 'o';
if (preserve_gid)
---- orig/rsync.c 2006-01-31 19:35:44
-+++ rsync.c 2005-10-16 23:19:27
-@@ -162,12 +162,15 @@ int set_file_attrs(char *fname, struct f
- }
- #endif
-
-- /* If this is a directory, SET_ACL() will be called on the cleanup
-- * receive_generator() pass (if we called it here, we might clobber
-- * writability on the directory). Everything else is OK to do now. */
-+ /* If this is a directory, SET_ACL() and/or SET_XATTR() will be called
-+ * on the cleanup receive_generator() pass -- if we called it here, we
-+ * might clobber writability on the dir (SELinux security contexts are
-+ * stored in xattrs). Everything else is OK to do now. */
- if (!S_ISDIR(st->st_mode)) {
- if (SET_ACL(fname, file) == 0)
- updated = 1;
-+ if (SET_XATTR(fname, file) == 0)
-+ updated = 1;
- }
+--- old/rsync.c
++++ new/rsync.c
+@@ -33,6 +33,7 @@
+ extern int verbose;
+ extern int dry_run;
+ extern int preserve_acls;
++extern int preserve_xattrs;
+ extern int preserve_perms;
+ extern int preserve_executability;
+ extern int preserve_times;
+@@ -219,6 +220,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);
- if (verbose > 1 && flags & ATTRS_REPORT) {
---- orig/rsync.h 2006-01-31 19:27:00
-+++ rsync.h 2005-10-16 23:19:44
-@@ -688,6 +688,38 @@ struct chmod_mode_struct;
- #endif /* SUPPORT_ACLS */
- #include "smb_acls.h"
++#ifdef SUPPORT_XATTRS
++ if (preserve_xattrs && set_xattr(fname, file, sxp) == 0)
++ updated = 1;
++#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.
+--- old/rsync.h
++++ new/rsync.h
+@@ -500,6 +500,10 @@ struct idev {
+ #define ACLS_NEED_MASK 1
+ #endif
-+#ifdef HAVE_LINUX_XATTRS
++#ifndef HAVE_NO_XATTRS
+#define SUPPORT_XATTRS 1
+#endif
+
+ #define GID_NONE ((gid_t)-1)
+
+ #define HL_CHECK_MASTER 0
+@@ -694,6 +698,9 @@ typedef struct {
+ struct rsync_acl *acc_acl; /* access ACL */
+ struct rsync_acl *def_acl; /* default ACL */
+ #endif
+#ifdef SUPPORT_XATTRS
-+#ifdef HAVE_ATTR_XATTR_H
-+#include <attr/xattr.h>
++ item_list *xattr;
+#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"
+ } statx;
- /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo 2006-01-31 03:14:05
-+++ rsync.yo 2006-01-31 03:16:46
-@@ -318,6 +318,7 @@ to the detailed description below for a
- -p, --perms preserve permissions
+ #define ACL_READY(sx) ((sx).acc_acl != NULL)
+--- 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) [non-standard]
+ -X, --xattrs preserve extended attrs (implies -p) [n.s.]
- --chmod=CHMOD change destination permissions
-o, --owner preserve owner (super-user only)
-g, --group preserve group
-@@ -727,6 +728,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).
+ --devices preserve device files (super-user only)
+@@ -818,6 +819,11 @@ version makes it incompatible with sendi
+ rsync unless you double the bf(--acls) option (e.g. bf(-AA)). This
+ doubling is not needed when pulling files from an older rsync.
+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
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
---- 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.
-+*/
+--- old/xattr.c
++++ new/xattr.c
+@@ -0,0 +1,375 @@
++/*
++ * Extended Attribute support for rsync.
++ * Written by Jay Fenlason, vaguely based on the ACLs patch.
++ *
++ * Copyright (C) 2004 Red Hat, Inc.
++ * Copyright (C) 2006 Wayne Davison
++ *
++ * 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.,
++ * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
++ */
+
+#include "rsync.h"
+#include "lib/sysxattr.h"
+
+#ifdef SUPPORT_XATTRS
+
-+extern int preserve_xattrs;
+extern int dry_run;
++extern int read_only;
++extern int list_only;
++extern unsigned int file_struct_len;
+
+#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;
++ size_t name_len;
++ size_t datum_len;
+} 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] */
++static item_list empty_xattr = EMPTY_ITEM_LIST;
++static item_list rsync_xal_l = EMPTY_ITEM_LIST;
+
-+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;
++#ifdef HAVE_OSX_XATTRS
++#define UNIQUE_PREFIX "user.0S%." /* OSX */
++#define UPRE_LEN (sizeof UNIQUE_PREFIX - 1)
++#endif
+
+/* ------------------------------------------------------------------------- */
+
-+static void rsync_xal_free(rsync_xal *x)
++static void rsync_xal_free(item_list *xalp)
+{
+ size_t i;
++ rsync_xa *rxas = xalp->items;
+
-+ for (i = 0; i < x->count; i++) {
-+ free(x->rxas[i].name);
-+ /* free(x->rxas[i].value); */
++ for (i = 0; i < xalp->count; i++) {
++ free(rxas[i].name);
++ /* free(rxas[i].value); */
+ }
-+ x->count = 0;
++ xalp->count = 0;
+}
+
-+static int rsync_xal_compare_names(const void *x1, const void *x2)
++void free_xattr(statx *sxp)
+{
-+ const rsync_xa *xa1;
-+ const rsync_xa *xa2;
++ rsync_xal_free(sxp->xattr);
++ free(sxp->xattr);
++ sxp->xattr = NULL;
++}
+
-+ xa1 = x1;
-+ xa2 = x2;
++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 int rsync_xal_get(const char *fname, rsync_xal *x)
++static int rsync_xal_get(const char *fname, item_list *xalp)
+{
+ ssize_t name_size;
+ ssize_t datum_size;
+ char *ptr;
+
+ if (!namebuf) {
-+ namebuf_len = 100;
++ namebuf_len = 1024;
+ namebuf = new_array(char, namebuf_len);
-+ datumbuf_len = 100;
-+ datumbuf = new_array(char, datumbuf_len);
-+ if (!namebuf || !datumbuf)
++ if (!namebuf)
+ out_of_memory("rsync_xal_get");
+ }
+
++ /* The length returned includes all the '\0' terminators. */
+ name_size = sys_llistxattr(fname, namebuf, namebuf_len);
+ if (name_size > (ssize_t)namebuf_len) {
+ name_size = -1;
+ }
+ if (name_size < 0) {
+ if (errno == ENOTSUP)
-+ return -1;
++ return 0;
+ 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));
++ rsyserr(FERROR, errno, "%s: rsync_xal_get: llistxattr",
++ fname);
+ return -1;
+ }
-+ namebuf = realloc_array(namebuf, char, name_size + 1);
++ namebuf = realloc_array(namebuf, char, name_size + 1024);
+ if (!namebuf)
+ out_of_memory("rsync_xal_get");
-+ namebuf_len = name_size;
++ namebuf_len = name_size + 1024;
+ 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));
++ rsyserr(FERROR, errno,
++ "%s: rsync_xal_get: re-llistxattr failed",
++ fname);
+ return -1;
+ }
+ } else {
-+ rprintf(FERROR,
-+ "%s: rsync_xal_get: llistxattr failed: %s\n",
-+ fname, strerror(errno));
++ rsyserr(FERROR, errno,
++ "%s: rsync_xal_get: llistxattr failed:",
++ fname);
+ 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;
++ rsync_xa *rxas = EXPAND_ITEM_LIST(xalp, rsync_xa, RSYNC_XAL_INITIAL);
+
-+ 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;
-+ }
++ len = strlen(name) + 1;
++ datum_size = sys_lgetxattr(fname, name, NULL, 0);
+ 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) {
++ rsyserr(FERROR, errno,
++ "%s: rsync_xal_get: lgetxattr %s failed",
++ fname, name);
++ return -1;
++ }
++ ptr = new_array(char, len + datum_size);
++ if (!ptr)
++ out_of_memory("rsync_xal_get");
++ memcpy(ptr, name, len);
++ rxas->name_len = len;
++ rxas->name = ptr;
++ rxas->datum_len = datum_size;
++ rxas->datum = ptr + len;
++ if (datum_size) {
++ ssize_t size = sys_lgetxattr(fname, name, rxas->datum, datum_size);
++ if (size != datum_size) {
++ if (size < 0) {
++ rsyserr(FERROR, errno,
++ "rsync_xal_get: lgetxattr(%s,%s)"
++ " failed", fname, name);
++ } else {
+ rprintf(FERROR,
-+ "%s: rsync_xal_get: re-lgetxattr of %s failed: %s\n",
-+ name, fname, strerror(errno));
-+ return -1;
++ "rsync_xal_get: lgetxattr(%s,%s)"
++ " returned %ld instead of %ld\n",
++ fname, name,
++ (long)size, (long)datum_size);
+ }
-+ } 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);
+ }
++ if (xalp->count > 1)
++ qsort(xalp->items, xalp->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)
++/* Read the xattr(s) for this filename. */
++int get_xattr(const char *fname, statx *sxp)
+{
-+ 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! */
++ 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 ssize_t rsync_xal_find_matching(void)
++static int find_matching_xattr(item_list *xalp)
+{
-+ size_t i;
-+ size_t j;
++ 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 (rsync_xal_l.rxals[i].count != curr_rsync_xal.count)
++ if (lst[i].count != xalp->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))
++ 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)
++ || memcmp(rxas1[j].datum, rxas2[j].datum, rxas2[j].datum_len))
+ break;
+ }
+ /* no differences found. This is The One! */
-+ if (j == curr_rsync_xal.count)
-+ break;
++ if (j == xalp->count)
++ return i;
+ }
-+ if (i < rsync_xal_l.count)
-+ return i;
-+ return (ssize_t)-1;
++
++ return -1;
+}
+
-+/* Store curr_rsync_xal on the end of rsync_xal_l */
-+static void rsync_xal_store(void)
++/* Store *xalp on the end of rsync_xal_l */
++static void rsync_xal_store(item_list *xalp)
+{
-+ if (rsync_xal_l.count <= rsync_xal_l.alloc) {
-+ size_t new_alloc;
-+ void *new_xal;
-+
-+ new_alloc = rsync_xal_l.count < RSYNC_XAL_LIST_INITIAL ? RSYNC_XAL_LIST_INITIAL : rsync_xal_l.count * 2;
-+ new_xal = realloc_array(rsync_xal_l.rxals, rsync_xal, new_alloc);
-+ if (!new_xal)
-+ out_of_memory("rsync_xal_store");
-+ rsync_xal_l.alloc = new_alloc;
-+ rsync_xal_l.rxals = new_xal;
-+ }
-+ rsync_xal_l.rxals[rsync_xal_l.count] = curr_rsync_xal;
-+ rsync_xal_l.count++;
-+ curr_rsync_xal.count = 0;
-+ curr_rsync_xal.alloc = 0;
++ 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,
-+ * or clean up after an flist entry that's not being sent (f == -1) */
-+
-+void send_xattr(const struct file_struct *file, int f)
++/* Send the make_xattr()-generated xattr list for this flist entry. */
++void send_xattr(statx *sxp, int f)
+{
-+ ssize_t index;
-+
-+ if (!preserve_xattrs || !file)
-+ return;
-+
-+ if (f == -1) {
-+ rsync_xal_free(&curr_rsync_xal);
-+ return;
-+ }
-+ index = rsync_xal_find_matching();
-+ if (index != -1) {
++ int ndx = find_matching_xattr(sxp->xattr);
++ if (ndx != -1) {
+ write_byte(f, 'x');
-+ write_int(f, index);
-+ rsync_xal_free(&curr_rsync_xal);
++ write_int(f, ndx);
++ rsync_xal_free(sxp->xattr);
+ } else {
+ rsync_xa *rxa;
-+ size_t count;
-+
-+ count = curr_rsync_xal.count;
++ int count = sxp->xattr->count;
+ write_byte(f, 'X');
+ write_int(f, count);
-+ for (rxa = curr_rsync_xal.rxas; count--; rxa++) {
-+ write_int(f, rxa->name_len);
-+ write_int(f, rxa->datum_len);
++ for (rxa = sxp->xattr->items; count--; rxa++) {
++#ifdef HAVE_OSX_XATTRS
++ if (strncmp(rxa->name, "user.", 5) != 0
++ && strncmp(rxa->name, "system.", 7) != 0) {
++ write_int(f, rxa->name_len + UPRE_LEN);
++ write_int(f, rxa->datum_len);
++ write_buf(f, UNIQUE_PREFIX, UPRE_LEN);
++ } else
++#endif
++ {
++ write_int(f, rxa->name_len);
++ write_int(f, rxa->datum_len);
++ }
+ write_buf(f, rxa->name, rxa->name_len);
+ write_buf(f, rxa->datum, rxa->datum_len);
+ }
-+ rsync_xal_store();
++ rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
+ }
++ free_xattr(sxp);
+}
+
-+
+/* ------------------------------------------------------------------------- */
-+/* receive and build the rsync_xattr_lists */
+
++/* receive and build the rsync_xattr_lists */
+void receive_xattr(struct file_struct *file, int f)
+{
-+ char *fname;
-+ int tag;
++ static item_list temp_xattr = EMPTY_ITEM_LIST;
++ int tag = read_byte(f);
++ char *ndx_ptr = (char*)file + file_struct_len;
++ int ndx;
+
-+ if (!preserve_xattrs)
-+ return;
-+ fname = f_name(file, NULL);
-+ tag = read_byte(f);
-+ if (tag != 'X' && tag != 'x') {
-+ rprintf(FERROR,
-+ "%s: receive_xattr: unknown extended attribute type tag: %c\n",
-+ fname, tag);
-+ exit_cleanup(RERR_STREAMIO);
-+ }
-+
-+ if (fxil.alloc <= fxil.count) {
-+ void *new_ptr;
-+ size_t new_alloc;
-+
-+ if (fxil.count < RSYNC_XAL_LIST_INITIAL)
-+ new_alloc = fxil.alloc + RSYNC_XAL_LIST_INITIAL;
-+ else
-+ new_alloc = fxil.alloc * 2;
-+ new_ptr = realloc_array(fxil.filexalidxs, file_xal_index, new_alloc);
-+ if (!new_ptr)
-+ out_of_memory("receive_xattr");
-+ if (verbose >= 3) {
-+ rprintf(FINFO, "receive_xattr to %lu bytes, %s move\n",
-+ (unsigned long)(new_alloc * sizeof (file_xal_index)),
-+ fxil.filexalidxs == new_ptr ? "did not" : "did");
-+ }
-+
-+ fxil.filexalidxs = new_ptr;
-+ fxil.alloc = new_alloc;
-+ }
-+
-+ fxil.filexalidxs[fxil.count].file = file;
+ if (tag == 'X') {
-+ size_t count;
-+ size_t i;
-+
-+ fxil.filexalidxs[fxil.count].xalidx = rsync_xal_l.count;
-+
-+ count = read_int(f);
-+ curr_rsync_xal.count = count;
-+ curr_rsync_xal.alloc = count;
-+ curr_rsync_xal.rxas = new_array(rsync_xa, count);
-+ if (!curr_rsync_xal.rxas)
-+ out_of_memory("receive_xattr");
++ int i, count = read_int(f);
+ for (i = 0; i < count; i++) {
-+ size_t name_len;
-+ size_t datum_len;
+ char *ptr;
-+
-+ name_len = read_int(f);
-+ datum_len = read_int(f);
++ rsync_xa *rxa;
++ size_t name_len = read_int(f);
++ size_t datum_len = read_int(f);
++ if (name_len + datum_len < name_len)
++ out_of_memory("receive_xattr"); /* overflow */
++ rxa = EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
+ ptr = new_array(char, name_len + datum_len);
+ if (!ptr)
+ out_of_memory("receive_xattr");
+ read_buf(f, ptr, name_len);
+ read_buf(f, ptr + name_len, datum_len);
-+ curr_rsync_xal.rxas[i].name_len = name_len;
-+ curr_rsync_xal.rxas[i].datum_len = datum_len;
-+ curr_rsync_xal.rxas[i].name = ptr;
-+ curr_rsync_xal.rxas[i].datum = ptr + name_len;
++ rxa->name_len = name_len;
++ rxa->datum_len = datum_len;
++ rxa->name = ptr;
++ rxa->datum = ptr + name_len;
++#ifdef HAVE_OSX_XATTRS
++ if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
++ rxa->name_len -= UPRE_LEN;
++ memmove(rxa->name, rxa->name + UPRE_LEN, rxa->name_len);
++ }
++#endif
+ }
-+ rsync_xal_store();
-+ } else {
-+ size_t index;
-+
-+ index = read_int(f);
-+ if (index >= rsync_xal_l.count) {
-+ rprintf(FERROR, "%s: receive_xattr: xa index %lu out of range\n",
-+ fname, (unsigned long)index);
++ ndx = rsync_xal_l.count; /* pre-incremented count */
++ rsync_xal_store(&temp_xattr); /* adds item to rsync_xal_l */
++ } else if (tag == 'x') {
++ ndx = read_int(f);
++ if (ndx < 0 || (size_t)ndx >= rsync_xal_l.count) {
++ rprintf(FERROR, "%s: receive_xattr: xa index %d out of range\n",
++ f_name(file, NULL), ndx);
+ exit_cleanup(RERR_STREAMIO);
+ }
-+ fxil.filexalidxs[fxil.count].xalidx = index;
++ } else {
++ rprintf(FERROR,
++ "%s: receive_xattr: unknown extended attribute type tag: %c\n",
++ f_name(file, NULL), tag);
++ exit_cleanup(RERR_STREAMIO);
++ ndx = 0; /* silence a compiler warning... */
+ }
-+ fxil.count++;
-+}
-+
-+static int rsync_xal_set(const char *fname, rsync_xal *x)
-+{
-+ size_t i;
-+ int ret = 0;
+
-+ for (i = 0; i < x->count; i++) {
-+ int status = sys_lsetxattr(fname, x->rxas[i].name, x->rxas[i].datum, x->rxas[i].datum_len, 0);
-+ if (status < 0) {
-+ rprintf(FERROR, "%s: rsync_xal_set: lsetxattr %s failed: %s\n",
-+ fname, x->rxas[i].name, strerror(errno));
-+ ret = -1;
-+ }
-+ }
-+ return ret;
++ SIVAL(ndx_ptr, 0, ndx);
+}
+
-+/* for duplicating xattrs on backups when using backup_dir */
-+
-+int dup_xattr(const char *orig, const char *bak)
++/* 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)
+{
-+ int ret;
-+
-+ if (!preserve_xattrs)
-+ return 1;
++ char *ndx_ptr = (char*)file + file_struct_len;
++ int ndx;
+
-+ if (rsync_xal_get(orig, &backup_xal) < 0)
-+ ret = rsync_xal_set(bak, &backup_xal);
-+ else
-+ ret = 0;
-+ rsync_xal_free(&backup_xal);
-+ return ret;
-+}
-+
-+void push_keep_backup_xattr(const struct file_struct *file, const char *orig, const char *dest)
-+{
-+ if (!preserve_xattrs)
++ if (!sxp->xattr)
+ return;
+
-+ backup_orig_file = file;
-+ backup_orig_fname = orig;
-+ backup_dest_fname = dest;
-+ rsync_xal_get(orig, &backup_xal);
-+}
-+
-+static int set_keep_backup_xal(void)
-+{
-+ if (!preserve_xattrs)
-+ return 1;
-+ return rsync_xal_set(backup_dest_fname, &backup_xal);
-+}
++ ndx = find_matching_xattr(sxp->xattr);
++ if (ndx == -1)
++ rsync_xal_store(sxp->xattr); /* adds item to rsync_xal_l */
++ free_xattr(sxp);
+
-+void cleanup_keep_backup_xattr(void)
-+{
-+ if (!preserve_xattrs)
-+ return;
-+
-+ backup_orig_file = NULL;
-+ backup_orig_fname = null_string;
-+ backup_dest_fname = null_string;
-+ rsync_xal_free(&backup_xal);
++ SIVAL(ndx_ptr, 0, ndx);
+}
+
-+static int file_xal_index_compare(const void *x1, const void *x2)
++static int rsync_xal_set(const char *fname, item_list *xalp)
+{
-+ const file_xal_index *xa1;
-+ const file_xal_index *xa2;
++ rsync_xa *rxas = xalp->items;
++ size_t i;
++ int ret = 0;
+
-+ xa1 = x1;
-+ xa2 = x2;
-+ return xa1->file == xa2->file ? 0 : xa1->file < xa2->file ? -1 : 1;
++ for (i = 0; i < xalp->count; i++) {
++ int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len, 0);
++ if (status < 0) {
++ rsyserr(FERROR, errno, "%s: rsync_xal_set: lsetxattr %s failed",
++ fname, rxas[i].name);
++ ret = -1;
++ }
++ }
++ return ret;
+}
+
-+void sort_file_xattr_index_lists(void)
++/* Set extended attributes on indicated filename. */
++int set_xattr(const char *fname, const struct file_struct *file, UNUSED(statx *sxp))
+{
-+ if (!preserve_xattrs)
-+ return;
-+ qsort(fxil.filexalidxs, fxil.count, sizeof (file_xal_index), file_xal_index_compare);
-+}
++ int ndx;
++ char *ndx_ptr = (char*)file + file_struct_len;
++ item_list *lst = rsync_xal_l.items;
+
-+static int find_file_xal_index(const struct file_struct *file)
-+{
-+ int low = 0, high = fxil.count;
-+ const struct file_struct *file_mid;
++ if (dry_run)
++ return 1; /* FIXME: --dry-run needs to compute this value */
+
-+ if (!high--) {
-+ rprintf(FERROR, "find_file_xal_index: no entries\n");
-+ exit_cleanup(RERR_STREAMIO);
++ if (read_only || list_only) {
++ errno = EROFS;
+ return -1;
+ }
-+ do {
-+ int mid = (high + low) / 2;
-+ file_mid = fxil.filexalidxs[mid].file;
-+ if (file_mid == file)
-+ return fxil.filexalidxs[mid].xalidx;
-+ if (file_mid > file)
-+ high = mid - 1;
-+ else
-+ low = mid + 1;
-+ } while (low < high);
-+ if (low == high) {
-+ file_mid = fxil.filexalidxs[low].file;
-+ if (file_mid == file)
-+ return fxil.filexalidxs[low].xalidx;
-+ }
-+ rprintf(FERROR,
-+ "find_file_xal_index: can't find entry for file in list\n");
-+ exit_cleanup(RERR_STREAMIO);
-+ return -1;
-+}
-+
-+/* set extended attributes on rsync-ed or keep_backup-ed file */
+
-+int set_xattr(const char *fname, const struct file_struct *file)
-+{
-+ int xalidx;
-+ rsync_xal *x;
-+
-+ if (dry_run || !preserve_xattrs)
-+ return 1;
-+ if (file == backup_orig_file) {
-+ if (!strcmp(fname, backup_dest_fname))
-+ return set_keep_backup_xal();
-+ }
-+ xalidx = find_file_xal_index(file);
-+ x = &(rsync_xal_l.rxals[xalidx]);
-+ return rsync_xal_set(fname, x);
++ ndx = IVAL(ndx_ptr, 0);
++ return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
+}
+
+#endif /* SUPPORT_XATTRS */
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff