Fixed failing hunks.

[rsync/rsync-patches.git] / xattrs.diff

diff --git a/xattrs.diff b/xattrs.diff
index bf4f6af..cf46b67 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -164,7 +164,7 @@ TODO:
  extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;
  extern int preserve_links;
  extern int preserve_hard_links;
  extern int preserve_devices;

-@@ -862,6 +863,10 @@ static struct file_struct *recv_file_ent
+@@ -865,6 +866,10 @@ static struct file_struct *recv_file_ent

        if (preserve_acls)
                receive_acl(file, f);
  #endif
        if (preserve_acls)
                receive_acl(file, f);
  #endif


@@ -173,9 +173,9 @@ TODO:
 +              receive_xattr(file, f );
 +#endif
  
 +              receive_xattr(file, f );
 +#endif
  

-       return file;
- }
-@@ -1134,7 +1139,7 @@ static struct file_struct *send_file_nam
+       if (S_ISREG(mode) || S_ISLNK(mode))
+               stats.total_size += file_length;
+@@ -1137,7 +1142,7 @@ static struct file_struct *send_file_nam

                                          int flags, int filter_flags)
  {
        struct file_struct *file;
                                          int flags, int filter_flags)
  {
        struct file_struct *file;


@@ -184,7 +184,7 @@ TODO:
        statx sx;
  #endif
  
        statx sx;
  #endif
  

-@@ -1153,6 +1158,13 @@ static struct file_struct *send_file_nam
+@@ -1156,6 +1161,13 @@ static struct file_struct *send_file_nam

                        return NULL;
        }
  #endif
                        return NULL;
        }
  #endif


@@ -198,7 +198,7 @@ TODO:
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  

-@@ -1164,6 +1176,10 @@ static struct file_struct *send_file_nam
+@@ -1167,6 +1179,10 @@ static struct file_struct *send_file_nam

                if (preserve_acls)
                        send_acl(&sx, f);
  #endif
                if (preserve_acls)
                        send_acl(&sx, f);
  #endif


@@ -553,7 +553,7 @@ TODO:
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)
   -o, --owner                 preserve owner (super-user only)
   -g, --group                 preserve group
       --devices               preserve device files (super-user only)

-@@ -818,6 +819,11 @@ The ACL-sending protocol used by this ve
+@@ -835,6 +836,11 @@ The ACL-sending protocol used by this ve

  the patch that was shipped with 2.6.8.  Sending ACLs to an older version
  of the ACL patch is not supported.
  
  the patch that was shipped with 2.6.8.  Sending ACLs to an older version
  of the ACL patch is not supported.