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
Change "long" to "uint32" in the create_time struct.
[rsync/rsync-patches.git]
/
xattrs.diff
diff --git
a/xattrs.diff
b/xattrs.diff
index
4446c7c
..
422f4e3
100644
(file)
--- a/
xattrs.diff
+++ b/
xattrs.diff
@@
-10,10
+10,11
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
+based-on: patch/master/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
-@@ -19
0,13 +190
,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -19
1,13 +191
,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;
@@
-30,15
+31,15
@@
diff --git a/compat.c b/compat.c
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
-@@ -21,6 +21,7 @@
-
+@@ -22,6 +22,7 @@
#include "rsync.h"
#include "ifuncs.h"
#include "rsync.h"
#include "ifuncs.h"
+ #include "inums.h"
+#include "io.h"
#include "lib/sysxattrs.h"
#ifdef SUPPORT_XATTRS
+#include "io.h"
#include "lib/sysxattrs.h"
#ifdef SUPPORT_XATTRS
-@@ -3
3,6 +34
,7 @@ extern int read_only;
+@@ -3
4,6 +35
,7 @@ extern int read_only;
extern int list_only;
extern int preserve_xattrs;
extern int checksum_seed;
extern int list_only;
extern int preserve_xattrs;
extern int checksum_seed;
@@
-46,7
+47,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
-@@ -24
6,7 +248
,7 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -24
9,7 +251
,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
+56,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
48,7 +350
,7 @@ static int find_matching_xattr(item_list *xalp)
+@@ -3
65,7 +367
,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
+65,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)
-@@ -
385,13 +387,22 @@ int send_xattr(stat_x *sxp, int f
)
+@@ -
402,13 +404,22 @@ int send_xattr(int f, stat_x *sxp
)
{
int ndx = find_matching_xattr(sxp->xattr);
{
int ndx = find_matching_xattr(sxp->xattr);
@@
-90,7
+91,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;
-@@ -4
10,8 +421,8 @@ int send_xattr(stat_x *sxp, int f
)
+@@ -4
27,8 +438,8 @@ int send_xattr(int f, stat_x *sxp
)
name_len += UPRE_LEN;
}
#endif
name_len += UPRE_LEN;
}
#endif
@@
-101,7
+102,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);
-@@ -4
19,7 +430,7 @@ int send_xattr(stat_x *sxp, int f
)
+@@ -4
36,7 +447,7 @@ int send_xattr(int f, stat_x *sxp
)
}
#endif
write_buf(f, name, name_len);
}
#endif
write_buf(f, name, name_len);
@@
-110,7
+111,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
69,7 +480
,7 @@ int xattr_diff(struct file_struct *file, stat_x *sxp, int find_all)
+@@ -4
86,7 +497
,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
+120,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;
-@@ -5
14,6 +525
,9 @@ void send_xattr_request(const char *fname, struct file_struct *file, int f_out)
+@@ -5
31,6 +542
,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
+130,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
70,6 +584
,9 @@ int recv_xattr_request(struct file_struct *file, int f_in)
+@@ -5
87,6 +601
,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;
@@
-138,8
+139,8
@@
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
);
-@@ -6
32,7 +649,22 @@ void receive_xattr(struct file_struct *file, int f
)
+ exit_cleanup(RERR_
PROTOCOL
);
+@@ -6
49,7 +666,22 @@ void receive_xattr(int f, struct file_struct *file
)
#else
int need_sort = 1;
#endif
#else
int need_sort = 1;
#endif
@@
-163,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"
if (ndx < 0 || (size_t)ndx > rsync_xal_l.count) {
rprintf(FERROR, "receive_xattr: xa index %d out of"
-@@ -6
45,7 +677,7 @@ void receive_xattr(struct file_struct *file, int f
)
+@@ -6
62,7 +694,7 @@ void receive_xattr(int f, struct file_struct *file
)
return;
}
return;
}
@@
-172,7
+173,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
53,9 +685,10 @@ void receive_xattr(struct file_struct *file, int f
)
+@@ -6
70,9 +702,10 @@ void receive_xattr(int f, struct file_struct *file
)
for (num = 1; num <= count; num++) {
char *ptr, *name;
rsync_xa *rxa;
for (num = 1; num <= count; num++) {
char *ptr, *name;
rsync_xa *rxa;