X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7f0bf1cb30e4c9cb751903ae1e7b235760bcfd00..e897210106a2626b8a627fde067949f6275981d5:/osx-xattr-nodev.diff

diff --git a/osx-xattr-nodev.diff b/osx-xattr-nodev.diff
index 2e3e0de..3b87663 100644
--- a/osx-xattr-nodev.diff
+++ b/osx-xattr-nodev.diff
@@ -11,14 +11,14 @@ To use this patch, run these commands for a successful build:
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1342,6 +1373,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1355,6 +1355,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)
- 				return NULL;
+ 			if (get_xattr(fname, &sx) < 0) {
+ 				io_error |= IOERR_GENERAL;
 diff --git a/xattrs.c b/xattrs.c
 --- a/xattrs.c
 +++ b/xattrs.c
@@ -33,7 +33,7 @@ diff --git a/xattrs.c b/xattrs.c
  	if (rsync_xal_get(fname, sxp->xattr) < 0) {
  		free_xattr(sxp);
  		return -1;
-@@ -856,6 +860,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -861,6 +865,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
  		return -1;
  	}