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
Renamed flags.diff fileflags.diff.
[rsync/rsync-patches.git]
/
xattrs.diff
diff --git
a/xattrs.diff
b/xattrs.diff
index
0768dae
..
c9465e7
100644
(file)
--- a/
xattrs.diff
+++ b/
xattrs.diff
@@
-13,7
+13,7
@@
To use this patch, run these commands for a successful build:
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
75,13 +175
,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
87,13 +187
,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;
@@
-46,7
+46,7
@@
diff --git a/xattrs.c b/xattrs.c
#define RSYNC_XAL_INITIAL 5
#define RSYNC_XAL_LIST_INITIAL 100
#define RSYNC_XAL_INITIAL 5
#define RSYNC_XAL_LIST_INITIAL 100
-@@ -2
42,7 +244
,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -2
39,7 +241
,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
return -1;
if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
return -1;
@@
-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
10,7 +312
,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -3
07,7 +309
,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)
-@@ -34
7,34 +349
,43 @@ int send_xattr(stat_x *sxp, int f)
+@@ -34
4,34 +346
,43 @@ int send_xattr(stat_x *sxp, int f)
{
int ndx = find_matching_xattr(sxp->xattr);
{
int ndx = find_matching_xattr(sxp->xattr);
@@
-118,7
+118,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);
-@@ -42
4,7 +435
,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+@@ -42
1,7 +432
,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;
@@
-127,7
+127,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;
-@@ -46
7,6 +478
,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -46
4,6 +475
,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;
@@
-137,7
+137,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
40,6 +554
,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+@@ -5
18,6 +532
,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;
@@
-147,7
+147,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);
-@@ -5
96,7 +613
,22 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -5
74,7 +591
,22 @@ void receive_xattr(struct file_struct *file, int f)
{
static item_list temp_xattr = EMPTY_ITEM_LIST;
int count, num;
{
static item_list temp_xattr = EMPTY_ITEM_LIST;
int count, num;
@@
-171,7
+171,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"
-@@ -
609,7 +641
,7 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -
587,7 +619
,7 @@ void receive_xattr(struct file_struct *file, int f)
return;
}
return;
}
@@
-180,7
+180,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;
}
-@@ -
617,9 +649
,10 @@ void receive_xattr(struct file_struct *file, int f)
+@@ -
595,9 +627
,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;