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
Got rid of patch fuzz.
[rsync/rsync-patches.git]
/
xattrs.diff
diff --git
a/xattrs.diff
b/xattrs.diff
index
6cfc8d0
..
16548fb
100644
(file)
--- a/
xattrs.diff
+++ b/
xattrs.diff
@@
-12,7
+12,7
@@
To use this patch, run these commands for a successful build:
--- old/compat.c
+++ new/compat.c
--- old/compat.c
+++ new/compat.c
-@@ -1
48,13 +148
,6 @@ void setup_protocol(int f_out,int f_in)
+@@ -1
63,13 +163
,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;
@@
-28,15
+28,15
@@
To use this patch, run these commands for a successful build:
if (delete_mode && !(delete_before+delete_during+delete_after)) {
--- old/xattrs.c
+++ new/xattrs.c
if (delete_mode && !(delete_before+delete_during+delete_after)) {
--- old/xattrs.c
+++ new/xattrs.c
-@@ -20,6 +20,7 @@
- */
+@@ -21,6 +21,7 @@
#include "rsync.h"
#include "rsync.h"
+ #include "ifuncs.h"
+#include "io.h"
#include "lib/sysxattrs.h"
#ifdef SUPPORT_XATTRS
+#include "io.h"
#include "lib/sysxattrs.h"
#ifdef SUPPORT_XATTRS
-@@ -3
2,6 +33
,7 @@ extern int read_only;
+@@ -3
3,6 +34
,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;
@@
-44,7
+44,7
@@
To use this patch, run these commands for a successful build:
#define RSYNC_XAL_INITIAL 5
#define RSYNC_XAL_LIST_INITIAL 100
#define RSYNC_XAL_INITIAL 5
#define RSYNC_XAL_LIST_INITIAL 100
-@@ -23
2,7 +234
,7 @@ static int rsync_xal_get(const char *fna
+@@ -23
3,7 +235
,7 @@ static int rsync_xal_get(const char *fna
if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
return -1;
if (!(ptr = get_xattr_data(fname, name, &datum_len, 0)))
return -1;
@@
-53,7
+53,7
@@
To use this patch, run these commands for a successful build:
/* 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);
-@@ -29
6,7 +298
,7 @@ static int find_matching_xattr(item_list
+@@ -29
7,7 +299
,7 @@ static int find_matching_xattr(item_list
|| 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;
@@
-62,7
+62,7
@@
To use this patch, run these commands for a successful build:
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)
-@@ -33
3,34 +335
,43 @@ int send_xattr(statx *sxp, int f)
+@@ -33
4,34 +336
,43 @@ int send_xattr(statx *sxp, int f)
{
int ndx = find_matching_xattr(sxp->xattr);
{
int ndx = find_matching_xattr(sxp->xattr);
@@
-116,7
+116,7
@@
To use this patch, run these commands for a successful build:
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);
-@@ -41
0,7 +421
,7 @@ int xattr_diff(struct file_struct *file,
+@@ -41
1,7 +422
,7 @@ int xattr_diff(struct file_struct *file,
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;
@@
-125,7
+125,7
@@
To use this patch, run these commands for a successful build:
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;
-@@ -45
3,6 +464
,9 @@ void send_xattr_request(const char *fnam
+@@ -45
4,6 +465
,9 @@ void send_xattr_request(const char *fnam
int j, cnt, prior_req = -1;
rsync_xa *rxa;
int j, cnt, prior_req = -1;
rsync_xa *rxa;
@@
-135,7
+135,7
@@
To use this patch, run these commands for a successful build:
lst += F_XATTR(file);
cnt = lst->count;
for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) {
lst += F_XATTR(file);
cnt = lst->count;
for (rxa = lst->items, j = 0; j < cnt; rxa++, j++) {
-@@ -52
4,6 +538
,9 @@ void recv_xattr_request(struct file_stru
+@@ -52
5,6 +539
,9 @@ void recv_xattr_request(struct file_stru
rsync_xa *rxa;
int rel_pos, cnt;
rsync_xa *rxa;
int rel_pos, cnt;
@@
-145,7
+145,7
@@
To use this patch, run these commands for a successful build:
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);
-@@ -57
0,7 +587
,22 @@ void receive_xattr(struct file_struct *f
+@@ -57
1,7 +588
,22 @@ void receive_xattr(struct file_struct *f
{
static item_list temp_xattr = EMPTY_ITEM_LIST;
int count;
{
static item_list temp_xattr = EMPTY_ITEM_LIST;
int count;
@@
-169,7
+169,7
@@
To use this patch, run these commands for a successful build:
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"
-@@ -58
3,7 +615
,7 @@ void receive_xattr(struct file_struct *f
+@@ -58
4,7 +616
,7 @@ void receive_xattr(struct file_struct *f
return;
}
return;
}
@@
-178,7
+178,7
@@
To use this patch, run these commands for a successful build:
(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;
}
-@@ -59
1,9 +623
,10 @@ void receive_xattr(struct file_struct *f
+@@ -59
2,9 +624
,10 @@ void receive_xattr(struct file_struct *f
while (count--) {
char *ptr, *name;
rsync_xa *rxa;
while (count--) {
char *ptr, *name;
rsync_xa *rxa;