Updated patches to work with the current trunk.

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

diff --git a/osx-xattr-nodev.diff b/osx-xattr-nodev.diff
index 452181b..a0950d6 100644 (file)
--- a/osx-xattr-nodev.diff
+++ b/osx-xattr-nodev.diff
@@ -9,20 +9,22 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/flist.c b/flist.c
+index 09b4fc5..a948194 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -1408,6 +1408,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1466,6 +1466,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
  #endif
  #ifdef SUPPORT_XATTRS
                if (preserve_xattrs) {
 +                      sx.st.st_mode = file->mode;
-                       sx.xattr = NULL;
                        if (get_xattr(fname, &sx) < 0) {
                                io_error |= IOERR_GENERAL;
+                               return NULL;
 diff --git a/xattrs.c b/xattrs.c
+index 2d0e050..3c70d8a 100644
 --- a/xattrs.c
 +++ b/xattrs.c
-@@ -281,6 +281,10 @@ int get_xattr(const char *fname, stat_x *sxp)
+@@ -282,6 +282,10 @@ int get_xattr(const char *fname, stat_x *sxp)
  {
        sxp->xattr = new(item_list);
        *sxp->xattr = empty_xattr;
@@ -33,7 +35,7 @@ diff --git a/xattrs.c b/xattrs.c
        if (rsync_xal_get(fname, sxp->xattr) < 0) {
                free_xattr(sxp);
                return -1;
-@@ -864,6 +868,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -865,6 +869,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
                return -1;
        }