One more fix to get the consistent-chmod value right.

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

diff --git a/xattrs.diff b/xattrs.diff
index 7869106..9160705 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -275,7 +275,7 @@ TODO:
  }
 --- old/lib/sysxattr.c
 +++ new/lib/sysxattr.c
-@@ -0,0 +1,71 @@
+@@ -0,0 +1,81 @@
 +/*
 + * Extended attribute support for rsync.
 + *
@@ -307,6 +307,11 @@ TODO:
 +      return lgetxattr(path, name, value, size);
 +}
 +
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
++{
++      return fgetxattr(filedes, name, value, size);
++}
++
 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
 +{
 +      return lsetxattr(path, name, value, size, flags);
@@ -329,6 +334,11 @@ TODO:
 +      return getxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
 +}
 +
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
++{
++      return fgetxattr(filedes, name, value, size, 0, 0);
++}
++
 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
 +{
 +      return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW | flags);
@@ -349,7 +359,7 @@ TODO:
 +#endif /* No xattrs */
 --- old/lib/sysxattr.h
 +++ new/lib/sysxattr.h
-@@ -0,0 +1,25 @@
+@@ -0,0 +1,26 @@
 +#ifdef SUPPORT_XATTRS
 +#if defined HAVE_ATTR_XATTR_H
 +#include <attr/xattr.h>
@@ -366,6 +376,7 @@ TODO:
 +#endif
 +
 +ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size);
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size);
 +int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags);
 +int sys_lremovexattr(const char *path, const char *name);
 +ssize_t sys_llistxattr(const char *path, char *list, size_t size);
@@ -484,17 +495,17 @@ TODO:
  extern int preserve_perms;
  extern int preserve_executability;
  extern int preserve_times;
-@@ -229,6 +230,10 @@ int set_file_attrs(char *fname, struct f
-       if (preserve_acls && set_acl(fname, file, sxp) == 0)
-               updated = 1;
- #endif
+@@ -219,6 +220,10 @@ int set_file_attrs(char *fname, struct f
+       if (daemon_chmod_modes && !S_ISLNK(new_mode))
+               new_mode = tweak_mode(new_mode, daemon_chmod_modes);
+ 
 +#ifdef SUPPORT_XATTRS
 +      if (preserve_xattrs && set_xattr(fname, file, sxp) == 0)
 +              updated = 1;
 +#endif
- 
- #ifdef HAVE_CHMOD
-       if ((sxp->st.st_mode & CHMOD_BITS) != (new_mode & CHMOD_BITS)) {
+ #ifdef SUPPORT_ACLS
+       /* It's OK to call set_acl() now, even for a dir, as the generator
+        * will enable owner-writability using chmod, if necessary.
 --- old/rsync.h
 +++ new/rsync.h
 @@ -501,6 +501,10 @@ struct idev {