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
Updated patches to work with the current trunk.
[rsync/rsync-patches.git]
/
xattrs.diff
diff --git
a/xattrs.diff
b/xattrs.diff
index
80c283a
..
635d852
100644
(file)
--- a/
xattrs.diff
+++ b/
xattrs.diff
@@
-14,7
+14,7
@@
based-on: patch/acls
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -1
92,13 +192
,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
89,13 +189
,6 @@ void setup_protocol(int f_out,int f_in)
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
if (protocol_version < 30) {
if (append_mode == 1)
append_mode = 2;
@@
-139,7
+139,7
@@
diff --git a/xattrs.c b/xattrs.c
+
if (F_XATTR(file) < 0) {
rprintf(FERROR, "recv_xattr_request: internal data error!\n");
+
if (F_XATTR(file) < 0) {
rprintf(FERROR, "recv_xattr_request: internal data error!\n");
- exit_cleanup(RERR_
STREAMIO
);
+ exit_cleanup(RERR_
PROTOCOL
);
@@ -649,7 +666,22 @@ void receive_xattr(int f, struct file_struct *file)
#else
int need_sort = 1;
@@ -649,7 +666,22 @@ void receive_xattr(int f, struct file_struct *file)
#else
int need_sort = 1;