Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
2e3e0de
..
08db30c
100644
(file)
--- a/
osx-xattr-nodev.diff
+++ b/
osx-xattr-nodev.diff
@@
-8,21
+8,22
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -1
342,6 +1373
,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -1
476,6 +1476
,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;
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
+ sx.st.st_mode = file->mode;
- sx.xattr = NULL;
- if (get_xattr(fname, &sx) < 0)
+ if (get_xattr(fname, &sx) < 0) {
+ io_error |= IOERR_GENERAL;
return NULL;
diff --git a/xattrs.c b/xattrs.c
--- a/xattrs.c
+++ b/xattrs.c
return NULL;
diff --git a/xattrs.c b/xattrs.c
--- a/xattrs.c
+++ b/xattrs.c
-@@ -28
1,6 +281
,10 @@ int get_xattr(const char *fname, stat_x *sxp)
+@@ -28
4,6 +284
,10 @@ int get_xattr(const char *fname, stat_x *sxp)
{
sxp->xattr = new(item_list);
*sxp->xattr = empty_xattr;
{
sxp->xattr = new(item_list);
*sxp->xattr = empty_xattr;
@@
-33,7
+34,7
@@
diff --git a/xattrs.c b/xattrs.c
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
-@@ -8
56,6 +860
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -8
84,6 +888
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
return -1;
}
return -1;
}