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
Fixed a failing hunk.
[rsync/rsync-patches.git]
/
checksum-xattr.diff
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index
b8c6b81
..
f4e8d30
100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-10,7
+10,7
@@
To use this patch, run these commands for a successful build:
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -11
93,7 +119
3,8 @@ struct file_struct *make_file(const char
+@@ -11
83,7 +118
3,8 @@ struct file_struct *make_file(const char
}
#endif
}
#endif
@@
-22,7
+22,7
@@
To use this patch, run these commands for a successful build:
F_PATHNAME(file) = pathname;
--- old/generator.c
+++ new/generator.c
F_PATHNAME(file) = pathname;
--- old/generator.c
+++ new/generator.c
-@@ -62
7,7 +627
,8 @@ int unchanged_file(char *fn, struct file
+@@ -62
6,7 +626
,8 @@ int unchanged_file(char *fn, struct file
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];
@@
-155,7
+155,7
@@
To use this patch, run these commands for a successful build:
+}
--- old/xattrs.c
+++ new/xattrs.c
+}
--- old/xattrs.c
+++ new/xattrs.c
-@@ -3
2,6 +32
,8 @@ extern int read_only;
+@@ -3
3,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
+164,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)
-
+@@ -66,6 +68,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);
+@@ -825,6 +829,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)
+{