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
Adding filter-attribute-mods patch; updating patches.
[rsync/rsync-patches.git]
/
checksum-xattr.diff
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index
9b5d729
..
1f8d6bc
100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-8,11
+8,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: 181c9faf928faad08ef095f4667afe460ec3bef6
diff --git a/flist.c b/flist.c
diff --git a/flist.c b/flist.c
-index 09b4fc5..3295724 100644
--- a/flist.c
+++ b/flist.c
--- a/flist.c
+++ b/flist.c
-@@ -12
68,7 +1268
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -12
77,7 +1277
,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
#endif
if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
@@
-23,7
+23,6
@@
index 09b4fc5..3295724 100644
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
}
diff --git a/generator.c b/generator.c
extra_len += SUM_EXTRA_CNT * EXTRA_LEN;
}
diff --git a/generator.c b/generator.c
-index 12007a1..2587bc9 100644
--- a/generator.c
+++ b/generator.c
@@ -531,7 +531,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
--- a/generator.c
+++ b/generator.c
@@ -531,7 +531,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
@@
-38,7
+37,6
@@
index 12007a1..2587bc9 100644
diff --git a/support/xsums b/support/xsums
new file mode 100644
diff --git a/support/xsums b/support/xsums
new file mode 100644
-index 0000000..31d2537
--- /dev/null
+++ b/support/xsums
@@ -0,0 +1,118 @@
--- /dev/null
+++ b/support/xsums
@@ -0,0 +1,118 @@
@@
-161,7
+159,6
@@
index 0000000..31d2537
+EOT
+}
diff --git a/xattrs.c b/xattrs.c
+EOT
+}
diff --git a/xattrs.c b/xattrs.c
-index 2d0e050..f364a2a 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -34,6 +34,8 @@ extern int read_only;
--- a/xattrs.c
+++ b/xattrs.c
@@ -34,6 +34,8 @@ extern int read_only;
@@
-184,7
+181,7
@@
index 2d0e050..f364a2a 100644
typedef struct {
char *datum, *name;
typedef struct {
char *datum, *name;
-@@ -2
39,7 +245
,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -2
41,7 +247
,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
|| (am_root < 0
&& (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
|| strcmp(name+RPRE_LEN+1, XACC_ACL_SUFFIX) == 0
|| (am_root < 0
&& (strcmp(name+RPRE_LEN+1, XSTAT_SUFFIX) == 0
|| strcmp(name+RPRE_LEN+1, XACC_ACL_SUFFIX) == 0
@@
-195,7
+192,7
@@
index 2d0e050..f364a2a 100644
continue;
}
continue;
}
-@@ -
895,6 +903
,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -
914,6 +922
,39 @@ int del_def_xattr_acl(const char *fname)
}
#endif
}
#endif