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
Added the munge-links.diff patch.
[rsync/rsync-patches.git]
/
xattrs.diff
diff --git
a/xattrs.diff
b/xattrs.diff
index
10fce12
..
cf0eab1
100644
(file)
--- a/
xattrs.diff
+++ b/
xattrs.diff
@@
-55,7
+55,7
@@
diff --git a/xattrs.c b/xattrs.c
/* For large datums, we store a flag and a checksum. */
name_offset = 1 + MAX_DIGEST_LEN;
sum_init(checksum_seed);
/* For large datums, we store a flag and a checksum. */
name_offset = 1 + MAX_DIGEST_LEN;
sum_init(checksum_seed);
-@@ -3
06,7 +308
,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -3
48,7 +350
,7 @@ static int find_matching_xattr(item_list *xalp)
|| rxas1[j].datum_len != rxas2[j].datum_len
|| strcmp(rxas1[j].name, rxas2[j].name))
break;
|| rxas1[j].datum_len != rxas2[j].datum_len
|| strcmp(rxas1[j].name, rxas2[j].name))
break;
@@
-64,7
+64,7
@@
diff --git a/xattrs.c b/xattrs.c
if (memcmp(rxas1[j].datum + 1,
rxas2[j].datum + 1,
MAX_DIGEST_LEN) != 0)
if (memcmp(rxas1[j].datum + 1,
rxas2[j].datum + 1,
MAX_DIGEST_LEN) != 0)
-@@ -3
43,13 +345
,22 @@ int send_xattr(stat_x *sxp, int f)
+@@ -3
85,13 +387
,22 @@ int send_xattr(stat_x *sxp, int f)
{
int ndx = find_matching_xattr(sxp->xattr);
{
int ndx = find_matching_xattr(sxp->xattr);
@@
-90,7
+90,7
@@
diff --git a/xattrs.c b/xattrs.c
for (rxa = sxp->xattr->items; count--; rxa++) {
size_t name_len = rxa->name_len;
const char *name = rxa->name;
for (rxa = sxp->xattr->items; count--; rxa++) {
size_t name_len = rxa->name_len;
const char *name = rxa->name;
-@@ -
368,8 +379
,8 @@ int send_xattr(stat_x *sxp, int f)
+@@ -
410,8 +421
,8 @@ int send_xattr(stat_x *sxp, int f)
name_len += UPRE_LEN;
}
#endif
name_len += UPRE_LEN;
}
#endif
@@
-101,7
+101,7
@@
diff --git a/xattrs.c b/xattrs.c
#ifndef HAVE_LINUX_XATTRS
if (name_len > rxa->name_len) {
write_buf(f, USER_PREFIX, UPRE_LEN);
#ifndef HAVE_LINUX_XATTRS
if (name_len > rxa->name_len) {
write_buf(f, USER_PREFIX, UPRE_LEN);
-@@ -
377,7 +388
,7 @@ int send_xattr(stat_x *sxp, int f)
+@@ -
419,7 +430
,7 @@ int send_xattr(stat_x *sxp, int f)
}
#endif
write_buf(f, name, name_len);
}
#endif
write_buf(f, name, name_len);
@@
-110,7
+110,7
@@
diff --git a/xattrs.c b/xattrs.c
write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
else
write_buf(f, rxa->datum, rxa->datum_len);
write_buf(f, rxa->datum + 1, MAX_DIGEST_LEN);
else
write_buf(f, rxa->datum, rxa->datum_len);
-@@ -4
27,7 +438
,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+@@ -4
69,7 +480
,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
if (cmp > 0)
same = 0;
cmp = rec_cnt ? strcmp(snd_rxa->name, rec_rxa->name) : -1;
if (cmp > 0)
same = 0;
@@
-119,7
+119,7
@@
diff --git a/xattrs.c b/xattrs.c
same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
&& memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
MAX_DIGEST_LEN) == 0;
same = cmp == 0 && snd_rxa->datum_len == rec_rxa->datum_len
&& memcmp(snd_rxa->datum + 1, rec_rxa->datum + 1,
MAX_DIGEST_LEN) == 0;
-@@ -
470,6 +481
,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -
514,6 +525
,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
int cnt, prior_req = 0;
rsync_xa *rxa;
int cnt, prior_req = 0;
rsync_xa *rxa;
@@
-129,7
+129,7
@@
diff --git a/xattrs.c b/xattrs.c
lst += F_XATTR(file);
for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
if (rxa->datum_len <= MAX_FULL_DATUM)
lst += F_XATTR(file);
for (rxa = lst->items, cnt = lst->count; cnt--; rxa++) {
if (rxa->datum_len <= MAX_FULL_DATUM)
-@@ -5
24,6 +538
,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+@@ -5
70,6 +584
,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
rsync_xa *rxa;
int rel_pos, cnt, num, got_xattr_data = 0;
rsync_xa *rxa;
int rel_pos, cnt, num, got_xattr_data = 0;
@@
-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");
exit_cleanup(RERR_STREAMIO);
if (F_XATTR(file) < 0) {
rprintf(FERROR, "recv_xattr_request: internal data error!\n");
exit_cleanup(RERR_STREAMIO);
-@@ -
585,7 +602
,22 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -
632,7 +649
,22 @@ void receive_xattr(struct file_struct *file, int f)
#else
int need_sort = 1;
#endif
#else
int need_sort = 1;
#endif
@@
-163,7
+163,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"
if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -
598,7 +630
,7 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -
645,7 +677
,7 @@ void receive_xattr(struct file_struct *file, int f)
return;
}
return;
}
@@
-172,7
+172,7
@@
diff --git a/xattrs.c b/xattrs.c
(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
temp_xattr.count = 0;
}
(void)EXPAND_ITEM_LIST(&temp_xattr, rsync_xa, count);
temp_xattr.count = 0;
}
-@@ -6
06,9 +638
,10 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -6
53,9 +685
,10 @@ void receive_xattr(struct file_struct *file, int f)
for (num = 1; num <= count; num++) {
char *ptr, *name;
rsync_xa *rxa;
for (num = 1; num <= count; num++) {
char *ptr, *name;
rsync_xa *rxa;