Adding filter-attribute-mods patch; updating patches.

[rsync/rsync-patches.git] / osx-xattr-nodev.diff

diff --git a/osx-xattr-nodev.diff b/osx-xattr-nodev.diff
index a0950d6..08db30c 100644 (file)
--- a/osx-xattr-nodev.diff
+++ b/osx-xattr-nodev.diff
@@ -8,11 +8,11 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/flist.c b/flist.c
-index 09b4fc5..a948194 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -1466,6 +1466,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1476,6 +1476,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
  #endif
  #ifdef SUPPORT_XATTRS
                if (preserve_xattrs) {
@@ -21,10 +21,9 @@ index 09b4fc5..a948194 100644
                                io_error |= IOERR_GENERAL;
                                return NULL;
 diff --git a/xattrs.c b/xattrs.c
-index 2d0e050..3c70d8a 100644
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -282,6 +282,10 @@ int get_xattr(const char *fname, stat_x *sxp)
+@@ -284,6 +284,10 @@ int get_xattr(const char *fname, stat_x *sxp)
  {
        sxp->xattr = new(item_list);
        *sxp->xattr = empty_xattr;
@@ -35,7 +34,7 @@ index 2d0e050..3c70d8a 100644
        if (rsync_xal_get(fname, sxp->xattr) < 0) {
                free_xattr(sxp);
                return -1;
-@@ -865,6 +869,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -884,6 +888,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
                return -1;
        }