Restore unintentially removed code.

[rsync.git/patches.git] / hfs-compression.diff

diff --git a/hfs-compression.diff b/hfs-compression.diff
index b65bbe232cb67d5e988af05c377197e44e41bb68..ccc2d97c8044b502fb044e2629af44bea99bb64d 100644 (file)
--- a/hfs-compression.diff
+++ b/hfs-compression.diff
@@ -766,14 +766,9 @@ diff --git a/xattrs.c b/xattrs.c
                          still_abbrev:
                                if (am_generator)
                                        continue;
-@@ -812,14 +871,8 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
-                               ret = -1;
-                               continue;
+@@ -817,9 +876,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+                               goto still_abbrev;
                        }
--                      if (len != rxas[i].datum_len) {
--                              free(ptr);
--                              goto still_abbrev;
--                      }
  
 -                      sum_init(checksum_seed);
 -                      sum_update(ptr, len);
@@ -782,7 +777,7 @@ diff --git a/xattrs.c b/xattrs.c
                        if (memcmp(sum, rxas[i].datum + 1, MAX_DIGEST_LEN) != 0) {
                                free(ptr);
                                goto still_abbrev;
-@@ -888,6 +941,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
+@@ -888,6 +945,10 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
                }
        }
  
@@ -793,7 +788,7 @@ diff --git a/xattrs.c b/xattrs.c
        return ret;
  }
  
-@@ -934,7 +991,7 @@ char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
+@@ -934,7 +995,7 @@ char *get_xattr_acl(const char *fname, int is_access_acl, size_t *len_p)
  {
        const char *name = is_access_acl ? XACC_ACL_ATTR : XDEF_ACL_ATTR;
        *len_p = 0; /* no extra data alloc needed from get_xattr_data() */
@@ -802,7 +797,7 @@ diff --git a/xattrs.c b/xattrs.c
  }
  
  int set_xattr_acl(const char *fname, int is_access_acl, const char *buf, size_t buf_len)
-@@ -1082,6 +1139,21 @@ int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
+@@ -1082,6 +1143,21 @@ int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst)
        int ret = do_stat(fname, fst);
        if ((ret < 0 || get_stat_xattr(fname, -1, fst, xst) < 0) && xst)
                xst->st_mode = 0;