A few more sqlite fixes.

[rsync-patches.git] / checksum-xattr.diff

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index 7aaee819f30799b4fd71c23ec1d493f6bfc68549..d6b09372fb17c931f7e381ec15f1e6e6cced277d 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
 
-based-on: 3bd9f51917ed5718275c6132006be155239a0550
+based-on: 1e9ee19a716b72454dfeab663802c626b81cdf2e
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
-@@ -1310,7 +1310,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1303,7 +1303,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  #endif
  
        if (always_checksum && am_sender && S_ISREG(st.st_mode)) {
@@ -25,7 +25,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -571,7 +571,8 @@ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+@@ -574,7 +574,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];
@@ -267,7 +267,7 @@ diff --git a/xattrs.c b/xattrs.c
  
  typedef struct {
        char *datum, *name;
-@@ -244,7 +250,9 @@ static int rsync_xal_get(const char *fname, item_list *xalp)
+@@ -247,7 +253,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
@@ -278,7 +278,7 @@ diff --git a/xattrs.c b/xattrs.c
                                continue;
                }
  
-@@ -956,6 +964,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -957,6 +965,39 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif