[PATCH v4 6/8] ntdll: Add support for FreeBSD style extended attributes.

[Erich E. Hoover]

From: "Erich E. Hoover"

Co-authored-by: Joel Holdsworth 
Signed-off-by: Joel Holdsworth 
---
 configure              | 11 +++++++----
 configure.ac           |  2 +-
 dlls/ntdll/unix/file.c | 21 ++++++++++++++++++++-
 include/config.h.in    |  3 +++
 4 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 46f576c3b14..a0937b39a4e 100755
--- a/configure
+++ b/configure
@@ -9105,12 +9105,15 @@ then :
 fi

-       for ac_header in attr/xattr.h
+       for ac_header in attr/xattr.h sys/extattr.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
-if test "x$ac_cv_header_attr_xattr_h" = xyes
+  as_ac_Header=`printf "%s\n" "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test "x$"$as_ac_Header"" = x"yes"
 then :
-  printf "%s\n" "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h
+  cat >>confdefs.h <<_ACEOF
+#define `printf "%s\n" "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
  HAVE_XATTR=1
 fi

diff --git a/configure.ac b/configure.ac
index 2bd616d4e02..93abc2064e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,7 +635,7 @@ AC_CHECK_HEADERS([libprocstat.h],,,
 #include <sys/queue.h>
 #endif])

-AC_CHECK_HEADERS(attr/xattr.h, [HAVE_XATTR=1])
+AC_CHECK_HEADERS(attr/xattr.h sys/extattr.h, [HAVE_XATTR=1])
 AC_CHECK_HEADERS(sys/xattr.h, [HAVE_XATTR=1]
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]], [[getxattr("", "", "", 0, 0, 0);]])],
         [AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [Define if xattr functions take additional arguments (Mac OS X)])])])
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 8d159ca4178..fa85b99899a 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -104,6 +104,10 @@
 #elif defined(HAVE_SYS_XATTR_H)
 #include <sys/xattr.h>
 #endif
+#ifdef HAVE_SYS_EXTATTR_H
+#undef XATTR_ADDITIONAL_OPTIONS
+#include <sys/extattr.h>
+#endif
 #include <time.h>
 #include <unistd.h>

@@ -173,7 +177,14 @@ typedef struct

#define MAX_IGNORED_FILES 4

-#define SAMBA_XATTR_DOS_ATTRIB  "user.DOSATTRIB"
+#ifndef XATTR_USER_PREFIX
+# define XATTR_USER_PREFIX "user."
+#endif
+#ifndef XATTR_USER_PREFIX_LEN
+# define XATTR_USER_PREFIX_LEN (sizeof(XATTR_USER_PREFIX) - 1)
+#endif
+
+#define SAMBA_XATTR_DOS_ATTRIB  XATTR_USER_PREFIX "DOSATTRIB"
 #define XATTR_ATTRIBS_MASK      (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM)

struct file_identity
@@ -371,6 +382,8 @@ static int xattr_fremove( int filedes, const char *name )
     return fremovexattr( filedes, name, 0 );
 #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
     return fremovexattr( filedes, name );
+#elif defined(HAVE_SYS_EXTATTR_H)
+    return extattr_delete_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN] );
 #else
     errno = ENOSYS;
     return -1;
@@ -384,6 +397,9 @@ static int xattr_fset( int filedes, const char *name, void *value, size_t size )
     return fsetxattr( filedes, name, value, size, 0, 0 );
 #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
     return fsetxattr( filedes, name, value, size, 0 );
+#elif defined(HAVE_SYS_EXTATTR_H)
+    return extattr_set_fd( filedes, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN],
+                           value, size );
 #else
     errno = ENOSYS;
     return -1;
@@ -397,6 +413,9 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si
     return getxattr( path, name, value, size, 0, 0 );
 #elif defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_XATTR_H)
     return getxattr( path, name, value, size );
+#elif defined(HAVE_SYS_EXTATTR_H)
+    return extattr_get_file( path, EXTATTR_NAMESPACE_USER, &name[XATTR_USER_PREFIX_LEN],
+                             value, size );
 #else
     errno = ENOSYS;
     return -1;
diff --git a/include/config.h.in b/include/config.h.in
index f6988317641..782d6b2a056 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -577,6 +577,9 @@
 /* Define to 1 if you have the <sys/event.h> header file. */
 #undef HAVE_SYS_EVENT_H

+/* Define to 1 if you have the <sys/extattr.h> header file. */
+#undef HAVE_SYS_EXTATTR_H
+
 /* Define to 1 if you have the <sys/filio.h> header file. */
 #undef HAVE_SYS_FILIO_H