The patches for 3.0.0pre6.

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

diff --git a/checksum-xattr.diff b/checksum-xattr.diff
index f4e8d30..2cac1f5 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
 
---- old/flist.c
-+++ new/flist.c
-@@ -1183,7 +1183,8 @@ struct file_struct *make_file(const char
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -1211,7 +1211,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
        }
  #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;
---- old/generator.c
-+++ new/generator.c
-@@ -626,7 +626,8 @@ int unchanged_file(char *fn, struct file
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -637,7 +637,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];
@@ -32,8 +34,10 @@ To use this patch, run these commands for a successful build:
                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;
@@ -153,8 +157,9 @@ To use this patch, run these commands for a successful build:
 + -h, --help        Display this help message.
 +EOT
 +}
---- old/xattrs.c
-+++ new/xattrs.c
+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;
@@ -173,7 +178,7 @@ To use this patch, run these commands for a successful build:
  
  typedef struct {
        char *datum, *name;
-@@ -825,6 +829,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -841,6 +845,39 @@ int del_def_xattr_acl(const char *fname)
  }
  #endif
  
@@ -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;
-+              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;
 +      }