Preliminary xattr support for FreeBSD supplied by Wesley W. Terpstra

(with an extra fix by me).  Untested, but looks promising.

diff --git a/xattrs.diff b/xattrs.diff
index 37b97536ce35213da034a6e0777845c4f80c88b9..d337e5051c9f3b4675123a3a0dff1a374604ff40 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -145,12 +145,13 @@ TODO:
        if ((am_root && preserve_devices && IS_DEVICE(file->mode))
 --- old/configure.in
 +++ new/configure.in
-@@ -856,6 +856,35 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
+@@ -856,6 +856,40 @@ samba_cv_HAVE_ACL_GET_PERM_NP=yes,samba_
    AC_MSG_RESULT(no)
  )
  
 +AC_CHECK_HEADERS(attr/xattr.h)
 +AC_CHECK_HEADERS(sys/xattr.h)
++AC_CHECK_HEADERS(sys/extattr.h)
 +AC_MSG_CHECKING(whether to support extended attributes)
 +AC_ARG_ENABLE(xattr-support,
 +AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
@@ -165,6 +166,10 @@ TODO:
 +            AC_MSG_RESULT(Using OS X xattrs)
 +            AC_DEFINE(HAVE_OSX_XATTRS, 1, [True if you have Mac OS X xattrs])
 +            ;;
++      freebsd*)
++            AC_MSG_RESULT(Using FreeBSD extattrs)
++            AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs])
++            ;;
 +      *)
 +            AC_MSG_RESULT(Xattrs requested but not Linux or OS X.  Good luck...)
 +            ;;
@@ -283,7 +288,7 @@ TODO:
  }
 --- old/lib/sysxattr.c
 +++ new/lib/sysxattr.c
-@@ -0,0 +1,87 @@
+@@ -0,0 +1,136 @@
 +/*
 + * Extended attribute support for rsync.
 + *
@@ -322,9 +327,9 @@ TODO:
 +      return fgetxattr(filedes, name, value, size);
 +}
 +
-+int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size, int flags)
++int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size)
 +{
-+      return lsetxattr(path, name, value, size, flags);
++      return lsetxattr(path, name, value, size, 0);
 +}
 +
 +int sys_lremovexattr(const char *path, const char *name)
@@ -349,9 +354,9 @@ TODO:
 +      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)
++int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size)
 +{
-+      return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW | flags);
++      return setxattr(path, name, value, size, 0, XATTR_NOFOLLOW);
 +}
 +
 +int sys_lremovexattr(const char *path, const char *name)
@@ -364,6 +369,55 @@ TODO:
 +      return listxattr(path, list, size, XATTR_NOFOLLOW);
 +}
 +
++#elif HAVE_FREEBSD_XATTRS
++
++ssize_t sys_lgetxattr(const char *path, const char *name, void *value, size_t size)
++{
++      return extattr_get_link(path, EXTATTR_NAMESPACE_USER, name, value, size);
++}
++
++ssize_t sys_fgetxattr(int filedes, const char *name, void *value, size_t size)
++{
++      return extattr_get_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size);
++}
++
++int sys_lsetxattr(const char *path, const char *name, const void *value, size_t size)
++{
++      return extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size);
++}
++
++int sys_lremovexattr(const char *path, const char *name)
++{
++      return extattr_delete_link(path, EXTATTR_NAMESPACE_USER, name);
++}
++
++ssize_t sys_llistxattr(const char *path, char *list, size_t size)
++{
++      unsigned char keylen;
++      ssize_t off, len = extattr_list_link(path, EXTATTR_NAMESPACE_USER, list, size);
++
++      if (len <= 0 || (size_t)len > size)
++              return len;
++
++      /* FreeBSD puts a single-byte length before each string, with no '\0'
++       * terminator.  We need to change this into a series of null-terminted
++       * strings.  Since the size is the same, we can simply transform the
++       * output in place. */
++      for (off = 0; off < len; ) {
++              keylen = ((unsigned char*)list)[off];
++              if (off + keylen >= len) {
++                      /* Should be impossible, but kernel bugs happen! */
++                      errno = EINVAL;
++                      return -1;
++              }
++              memmove(list+off, list+off+1, keylen);
++              off += keylen;
++              list[off++] = '\0';
++      }
++
++      return len;
++}
++
 +#else
 +
 +#error You need to create xattr compatibility functions.
@@ -373,13 +427,15 @@ TODO:
 +#endif /* SUPPORT_XATTRS */
 --- old/lib/sysxattr.h
 +++ new/lib/sysxattr.h
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,26 @@
 +#ifdef SUPPORT_XATTRS
 +
 +#if defined HAVE_ATTR_XATTR_H
 +#include <attr/xattr.h>
 +#elif defined HAVE_SYS_XATTR_H
 +#include <sys/xattr.h>
++#elif defined HAVE_SYS_EXTATTR_H
++#include <sys/extattr.h>
 +#endif
 +
 +/* Linux 2.4 does not define this as a distinct errno value: */
@@ -389,7 +445,7 @@ TODO:
 +
 +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_lsetxattr(const char *path, const char *name, const void *value, size_t size);
 +int sys_lremovexattr(const char *path, const char *name);
 +ssize_t sys_llistxattr(const char *path, char *list, size_t size);
 +
@@ -573,7 +629,7 @@ TODO:
  transfer.  The resulting value is treated as though it was the permissions
 --- old/xattr.c
 +++ new/xattr.c
-@@ -0,0 +1,375 @@
+@@ -0,0 +1,376 @@
 +/*
 + * Extended Attribute support for rsync.
 + * Written by Jay Fenlason, vaguely based on the ACLs patch.
@@ -622,9 +678,11 @@ TODO:
 +static item_list empty_xattr = EMPTY_ITEM_LIST;
 +static item_list rsync_xal_l = EMPTY_ITEM_LIST;
 +
-+#ifdef HAVE_OSX_XATTRS
-+#define UNIQUE_PREFIX "user.0S%." /* OSX */
-+#define UPRE_LEN (sizeof UNIQUE_PREFIX - 1)
++#ifndef HAVE_LINUX_XATTRS
++/* Linux extended attributes keep the namespace in the key.
++ * Let's do the same for all other platforms. */
++#define USER_PREFIX "user."
++#define UPRE_LEN (sizeof USER_PREFIX - 1)
 +#endif
 +
 +/* ------------------------------------------------------------------------- */
@@ -818,18 +876,17 @@ TODO:
 +              write_byte(f, 'X');
 +              write_int(f, count);
 +              for (rxa = sxp->xattr->items; count--; rxa++) {
-+#ifdef HAVE_OSX_XATTRS
-+                      if (strncmp(rxa->name, "user.", 5) != 0
-+                       && strncmp(rxa->name, "system.", 7) != 0) {
-+                              write_int(f, rxa->name_len + UPRE_LEN);
-+                              write_int(f, rxa->datum_len);
-+                              write_buf(f, UNIQUE_PREFIX, UPRE_LEN);
-+                      } else
++#ifdef HAVE_LINUX_XATTRS
++                      /* Linux already puts the namespace in the key. */
++                      write_int(f, rxa->name_len);
++                      write_int(f, rxa->datum_len);
++#else
++                      /* Other platforms need the namespace added in,
++                       * so use the "user." namespace for all keys. */
++                      write_int(f, rxa->name_len + UPRE_LEN);
++                      write_int(f, rxa->datum_len);
++                      write_buf(f, USER_PREFIX, UPRE_LEN);
 +#endif
-+                      {
-+                              write_int(f, rxa->name_len);
-+                              write_int(f, rxa->datum_len);
-+                      }
 +                      write_buf(f, rxa->name, rxa->name_len);
 +                      write_buf(f, rxa->datum, rxa->datum_len);
 +              }
@@ -867,8 +924,8 @@ TODO:
 +                      rxa->datum_len = datum_len;
 +                      rxa->name = ptr;
 +                      rxa->datum = ptr + name_len;
-+#ifdef HAVE_OSX_XATTRS
-+                      if (strncmp(rxa->name, UNIQUE_PREFIX, UPRE_LEN) == 0) {
++#ifndef HAVE_LINUX_XATTRS
++                      if (strncmp(rxa->name, USER_PREFIX, UPRE_LEN) == 0) {
 +                              rxa->name_len -= UPRE_LEN;
 +                              memmove(rxa->name, rxa->name + UPRE_LEN, rxa->name_len);
 +                      }
@@ -919,7 +976,7 @@ TODO:
 +      int ret = 0;
 +
 +      for (i = 0; i < xalp->count; i++) {
-+              int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len, 0);
++              int status = sys_lsetxattr(fname, rxas[i].name, rxas[i].datum, rxas[i].datum_len);
 +              if (status < 0) {
 +                      rsyserr(FERROR, errno, "%s: rsync_xal_set: lsetxattr %s failed",
 +                              fname, rxas[i].name);