The patches for 3.1.1pre2.

[rsync-patches.git] / xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index accfa1000130ca490b73d9d4f7fd7b5e46d5edc0..e6840e94e4bd4645999e54de93109988ae0b2dae 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -140,7 +140,7 @@ diff --git a/xattrs.c b/xattrs.c
        if (F_XATTR(file) < 0) {
                rprintf(FERROR, "recv_xattr_request: internal data error!\n");
                exit_cleanup(RERR_PROTOCOL);
-@@ -662,7 +679,22 @@ void receive_xattr(int f, struct file_struct *file)
+@@ -663,7 +680,22 @@ void receive_xattr(int f, struct file_struct *file)
  #else
        int need_sort = 1;
  #endif
@@ -164,7 +164,7 @@ diff --git a/xattrs.c b/xattrs.c
  
        if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
                rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -675,7 +707,7 @@ void receive_xattr(int f, struct file_struct *file)
+@@ -676,7 +708,7 @@ void receive_xattr(int f, struct file_struct *file)
                return;
        }
  
@@ -173,7 +173,7 @@ diff --git a/xattrs.c b/xattrs.c
                (void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
                temp_xattr.count = 0;
        }
-@@ -683,9 +715,10 @@ void receive_xattr(int f, struct file_struct *file)
+@@ -684,9 +716,10 @@ void receive_xattr(int f, struct file_struct *file)
        for (num = 1; num <= count; num++) {
                char *ptr, *name;
                rsync_xa *rxa;