popt_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \
--- old/acls.c
+++ new/acls.c
-@@ -29,6 +29,7 @@ extern int am_root;
- extern int dry_run;
+@@ -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 === */
-@@ -740,6 +741,10 @@ void receive_acl(struct file_struct *fil
+@@ -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;
do {
char tag = read_byte(f);
int ndx;
-@@ -799,6 +804,10 @@ void cache_acl(struct file_struct *file,
+@@ -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;
do {
if (!racl)
ndx = -1;
-@@ -914,6 +923,10 @@ int set_acl(const char *fname, const str
+@@ -921,6 +930,10 @@ int set_acl(const char *fname, const str
type = SMB_ACL_TYPE_ACCESS;
ndx_ptr = (char*)file + file_struct_len;
}
--- old/lib/sysxattr.c
+++ new/lib/sysxattr.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,81 @@
+/*
+ * Extended attribute support for rsync.
+ *
+ 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);
+ 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);
+#endif /* No xattrs */
--- old/lib/sysxattr.h
+++ new/lib/sysxattr.h
-@@ -0,0 +1,25 @@
+@@ -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
-+#endif
-+
-+#if defined HAVE_LINUX_XATTRS || defined HAVE_OSX_XATTRS
+
+/* Linux 2.4 does not define this as a distinct errno value: */
+#ifndef ENOATTR
+#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
+
-+/* No xattrs */
++/* No xattrs available */
+
+#endif
--- old/options.c
extern int preserve_perms;
extern int preserve_executability;
extern int preserve_times;
-@@ -229,6 +230,10 @@ int set_file_attrs(char *fname, struct f
- if (preserve_acls && set_acl(fname, file, sxp) == 0)
- updated = 1;
- #endif
+@@ -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);
+
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs && set_xattr(fname, file, sxp) == 0)
+ updated = 1;
+#endif
-
- #ifdef HAVE_CHMOD
- if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+ #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
@@ -501,6 +501,10 @@ struct idev {
transfer. The resulting value is treated as though it was the permissions
--- old/xattr.c
+++ new/xattr.c
-@@ -0,0 +1,368 @@
+@@ -0,0 +1,375 @@
+/*
+ * Extended Attribute support for rsync.
+ * Written by Jay Fenlason, vaguely based on the ACLs patch.
+#ifdef SUPPORT_XATTRS
+
+extern int dry_run;
++extern int read_only;
++extern int list_only;
+extern unsigned int file_struct_len;
+
+#define RSYNC_XAL_INITIAL 5
+static item_list rsync_xal_l = EMPTY_ITEM_LIST;
+
+#ifdef HAVE_OSX_XATTRS
-+static char unique_prefix[] = "user.0S%."; /* OSX */
-+static int upre_len = sizeof unique_prefix - 1;
++#define UNIQUE_PREFIX "user.0S%." /* OSX */
++#define UPRE_LEN (sizeof UNIQUE_PREFIX - 1)
+#endif
+
+/* ------------------------------------------------------------------------- */
+#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->name_len + UPRE_LEN);
+ write_int(f, rxa->datum_len);
-+ write_buf(f, unique_prefix, upre_len);
++ write_buf(f, UNIQUE_PREFIX, UPRE_LEN);
+ } else
+#endif
+ {
+ 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);
++ 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
+ }
+ if (dry_run)
+ return 1; /* FIXME: --dry-run needs to compute this value */
+
++ if (read_only || list_only) {
++ errno = EROFS;
++ return -1;
++ }
++
+ ndx = IVAL(ndx_ptr, 0);
+ return rsync_xal_set(fname, lst + ndx); /* TODO: This needs to return 1 if no xattrs changed! */
+}