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]
/
checksum-xattr.diff
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index
b8c6b81
..
c707287
100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-8,9
+8,10
@@
To use this patch, run these commands for a successful build:
./configure (optional if already run)
make
./configure (optional if already run)
make
---- old/flist.c
-+++ new/flist.c
-@@ -1193,7 +1193,8 @@ struct file_struct *make_file(const char
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -1214,7 +1214,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
}
#endif
}
#endif
@@
-20,9
+21,10
@@
To use this patch, run these commands for a successful build:
file_checksum(thisname, tmp_sum, st.st_size);
F_PATHNAME(file) = pathname;
file_checksum(thisname, tmp_sum, st.st_size);
F_PATHNAME(file) = pathname;
---- old/generator.c
-+++ new/generator.c
-@@ -627,7 +627,8 @@ int unchanged_file(char *fn, struct file
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -683,7 +683,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
of the file time to determine whether to sync */
if (always_checksum > 0 && S_ISREG(st->st_mode)) {
char sum[MAX_DIGEST_LEN];
@@
-32,8
+34,10
@@
To use this patch, run these commands for a successful build:
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
---- old/support/xsums
-+++ new/support/xsums
+diff --git a/support/xsums b/support/xsums
+new file mode 100644
+--- /dev/null
++++ b/support/xsums
@@ -0,0 +1,118 @@
+#!/usr/bin/perl -w
+use strict;
@@ -0,0 +1,118 @@
+#!/usr/bin/perl -w
+use strict;
@@
-153,9
+157,10
@@
To use this patch, run these commands for a successful build:
+ -h, --help Display this help message.
+EOT
+}
+ -h, --help Display this help message.
+EOT
+}
---- old/xattrs.c
-+++ new/xattrs.c
-@@ -32,6 +32,8 @@ extern int read_only;
+diff --git a/xattrs.c b/xattrs.c
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -33,6 +33,8 @@ 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;
@@
-164,18
+169,18
@@
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
-@@ -63,6 +65,8 @@ extern int checksum_seed;
- #define RPRE_LEN ((int)sizeof RSYNC_PREFIX - 1)
-
+@@ -65,6 +67,8 @@ extern int checksum_seed;
#define XSTAT_ATTR RSYNC_PREFIX "%stat"
#define XSTAT_ATTR RSYNC_PREFIX "%stat"
+ #define XACC_ACL_ATTR RSYNC_PREFIX "%aacl"
+ #define XDEF_ACL_ATTR RSYNC_PREFIX "%dacl"
+#define MD4_ATTR RSYNC_PREFIX "%md4"
+#define MD5_ATTR RSYNC_PREFIX "%md5"
typedef struct {
char *datum, *name;
+#define MD4_ATTR RSYNC_PREFIX "%md4"
+#define MD5_ATTR RSYNC_PREFIX "%md5"
typedef struct {
char *datum, *name;
-@@ -797,6 +801,39 @@ int set_xattr(const char *fname, const s
- return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
+@@ -829,6 +833,39 @@ int del_def_xattr_acl(const char *fname)
}
}
+ #endif
+int get_sum_xattr(const char *fname, STRUCT_STAT *stp, char *sum)
+{
+int get_sum_xattr(const char *fname, STRUCT_STAT *stp, char *sum)
+{
@@
-189,7
+194,7
@@
To use this patch, run these commands for a successful build:
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)
+ return 0;
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)
+ return 0;
-+ rsyserr(FERROR, errno, "failed to read xattr %s for %s",
++ rsyserr(FERROR
_XFER
, errno, "failed to read xattr %s for %s",
+ mdattr, full_fname(fname));
+ return 0;
+ }
+ mdattr, full_fname(fname));
+ return 0;
+ }