[PATCH v2 1/8] ntdll: Implement retrieving DOS attributes in [fd_]get_file_info().

[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 | 38 +++++++++++++++++++++++++++++++++++++-
 include/config.h.in    |  3 +++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index 6425e4da5f8..9c6fb443e1f 100755
--- a/configure
+++ b/configure
@@ -9105,6 +9105,17 @@ then :
 fi

+       for ac_header in attr/xattr.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
+then :
+  printf "%s\n" "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h
+ HAVE_XATTR=1
+fi
+
+done
+

DLLFLAGS=""

diff --git a/configure.ac b/configure.ac
index 1e733962b75..fd59bd6948d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -635,6 +635,8 @@ AC_CHECK_HEADERS([libprocstat.h],,,
 #include <sys/queue.h>
 #endif])

+AC_CHECK_HEADERS(attr/xattr.h, [HAVE_XATTR=1])
+
 dnl **** Check for working dll ****

AC_SUBST(DLLFLAGS,"")
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 7eb8dbe7ad4..12d83bd9d0c 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -98,6 +98,9 @@
 #ifdef HAVE_SYS_STATFS_H
 #include <sys/statfs.h>
 #endif
+#ifdef HAVE_ATTR_XATTR_H
+#include <attr/xattr.h>
+#endif
 #include <time.h>
 #include <unistd.h>

@@ -167,6 +170,9 @@ typedef struct

#define MAX_IGNORED_FILES 4

+#define SAMBA_XATTR_DOS_ATTRIB  "user.DOSATTRIB"
+#define XATTR_ATTRIBS_MASK      (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM)
+
 struct file_identity
 {
     dev_t dev;
@@ -355,6 +361,18 @@ NTSTATUS errno_to_status( int err )
     }
 }

+
+static int xattr_get( const char *path, const char *name, void *value, size_t size )
+{
+#if defined(HAVE_ATTR_XATTR_H)
+    return getxattr( path, name, value, size );
+#else
+    errno = ENOSYS;
+    return -1;
+#endif
+}
+
+
 /* get space from the current directory data buffer, allocating a new one if necessary */
 static void *get_dir_data_space( struct dir_data *data, unsigned int size )
 {
@@ -1451,6 +1469,18 @@ static inline ULONG get_file_attributes( const struct stat *st )
 }

+/* decode the xattr-stored DOS attributes */
+static int get_file_xattr( char *hexattr, int attrlen )
+{
+    if (attrlen > 2 && hexattr[0] == '0' && hexattr[1] == 'x')
+    {
+        hexattr[attrlen] = 0;
+        return strtol( hexattr+2, NULL, 16 ) & XATTR_ATTRIBS_MASK;
+    }
+    return 0;
+}
+
+
 static BOOL fd_is_mount_point( int fd, const struct stat *st )
 {
     struct stat parent;
@@ -1479,7 +1509,8 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON
 static int get_file_info( const char *path, struct stat *st, ULONG *attr )
 {
     char *parent_path;
-    int ret;
+    char hexattr[11];
+    int len, ret;

*attr = 0;
     ret = lstat( path, st );
@@ -1505,6 +1536,11 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
         free( parent_path );
     }
     *attr |= get_file_attributes( st );
+
+    len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 );
+    if (len != -1)
+        *attr |= get_file_xattr( hexattr, len );
+
     return ret;
 }

diff --git a/include/config.h.in b/include/config.h.in
index de1bf6c61eb..25f09636b3a 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -25,6 +25,9 @@
 /* Define to 1 if you have the <asm/user.h> header file. */
 #undef HAVE_ASM_USER_H

+/* Define to 1 if you have the <attr/xattr.h> header file. */
+#undef HAVE_ATTR_XATTR_H
+
 /* Define to 1 if you have the <capi20.h> header file. */
 #undef HAVE_CAPI20_H