Split the major & minor device numbers.

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

diff --git a/xattrs.diff b/xattrs.diff
index 2b8412d..eb9c105 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -10,6 +10,9 @@ TODO:
 
  - This patch needs to be rewritten to more efficiently handle large xattrs.
 
+ - Extraneous xattr values need to be removed from files that are not being
+   recreated.
+
  - We need to affect the itemized output to know when xattrs are being updated.
 
  - We need to affect the --link-dest option to avoid hard-linking two files
@@ -227,6 +230,15 @@ TODO:
  
        return file;
  }
+@@ -974,7 +985,7 @@ static struct file_struct *send_file_nam
+                                         unsigned short flags)
+ {
+       struct file_struct *file;
+-#ifdef SUPPORT_ACLS
++#if defined SUPPORT_ACLS || defined SUPPORT_XATTRS
+       statx sx;
+ #endif
+ 
 @@ -994,6 +1005,13 @@ static struct file_struct *send_file_nam
                        return NULL;
        }
@@ -263,7 +275,7 @@ TODO:
  }
 --- old/lib/sysxattr.c
 +++ new/lib/sysxattr.c
-@@ -0,0 +1,61 @@
+@@ -0,0 +1,71 @@
 +/*
 + * Extended attribute support for rsync.
 + *
@@ -300,6 +312,11 @@ TODO:
 +      return lsetxattr(path, name, value, size, flags);
 +}
 +
++int sys_lremovexattr(const char *path, const char *name)
++{
++      return lremovexattr(path, name);
++}
++
 +ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 +{
 +      return llistxattr(path, list, size);
@@ -317,6 +334,11 @@ TODO:
 +      return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW | flags);
 +}
 +
++int sys_lremovexattr(const char *path, const char *name)
++{
++      return removexattr(path, name, XATTR_NOFOLLOW);
++}
++
 +ssize_t sys_llistxattr(const char *path, char *list, size_t size)
 +{
 +      return listxattr(path, list, size, XATTR_NOFOLLOW);
@@ -327,7 +349,7 @@ TODO:
 +#endif /* No xattrs */
 --- old/lib/sysxattr.h
 +++ new/lib/sysxattr.h
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,25 @@
 +#ifdef SUPPORT_XATTRS
 +#if defined HAVE_ATTR_XATTR_H
 +#include <attr/xattr.h>
@@ -338,8 +360,14 @@ TODO:
 +
 +#if defined HAVE_LINUX_XATTRS || defined HAVE_OSX_XATTRS
 +
++/* Linux 2.4 does not define this as a distinct errno value: */
++#ifndef ENOATTR
++#define ENOATTR ENODATA
++#endif
++
 +ssize_t sys_lgetxattr(const char *path, 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);
 +
 +#else
@@ -456,17 +484,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 {
@@ -523,7 +551,7 @@ TODO:
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,367 @@
+@@ -0,0 +1,368 @@
 +/*
 + * Extended Attribute support for rsync.
 + * Written by Jay Fenlason, vaguely based on the ACLs patch.
@@ -686,8 +714,9 @@ TODO:
 +                              } else {
 +                                      rprintf(FERROR,
 +                                          "rsync_xal_get: lgetxattr(%s,%s)"
-+                                          " returned %d instead of %d\n",
-+                                          fname, name, size, datum_size);
++                                          " returned %ld instead of %ld\n",
++                                          fname, name,
++                                          (long)size, (long)datum_size);
 +                              }
 +                              return -1;
 +                      }