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
The patches for 3.0.4pre1.
[rsync/rsync-patches.git]
/
osx-xattr-nodev.diff
diff --git
a/osx-xattr-nodev.diff
b/osx-xattr-nodev.diff
index
2e3e0de
..
9a82005
100644
(file)
--- 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
diff --git a/flist.c b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -13
42,6 +1373
,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
+@@ -13
55,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;
#endif
#ifdef SUPPORT_XATTRS
if (preserve_xattrs) {
+ sx.st.st_mode = file->mode;
sx.xattr = NULL;
- if (get_xattr(fname, &sx) < 0)
-
return NUL
L;
+ if (get_xattr(fname, &sx) < 0)
{
+
io_error |= IOERR_GENERA
L;
diff --git a/xattrs.c b/xattrs.c
--- a/xattrs.c
+++ b/xattrs.c
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;
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
64,6 +868
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
return -1;
}
return -1;
}