X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fsys-xattr.c;h=fc03f7ee95a97fd728e63f2933e00a6284de2132;hb=4058c2be43ec605cdcc57e9d678251339349cb5f;hp=352d5941bc59c458b8d838e5b8fb98c269d55eba;hpb=eee68bbd945161fa2497e917e306aa09f2a78147;p=mono.git

diff --git a/support/sys-xattr.c b/support/sys-xattr.c
index 352d5941bc5..fc03f7ee95a 100644
--- a/support/sys-xattr.c
+++ b/support/sys-xattr.c
@@ -1,25 +1,40 @@
 /*
- * Wrapper functions for <sys/xattr.h> and <sys/extattr.h>
+ * Wrapper functions for <sys/xattr.h> (or <attr/xattr.h>) and <sys/extattr.h>
  *
  * Authors:
  *   Daniel Drake (dsd@gentoo.org)
+ *   Jonathan Pryor (jonpryor@vt.edu)
  *
  * Copyright (C) 2005 Daniel Drake
+ * Copyright (C) 2006 Jonathan Pryor
  */
 
 #include <config.h>
 
-#if defined(HAVE_SYS_XATTR_H) || defined(HAVE_SYS_EXTATTR_H)
+#if defined(HAVE_SYS_XATTR_H) || defined(HAVE_ATTR_ATTR_H) || defined(HAVE_SYS_EXTATTR_H)
 
 #include <sys/types.h>
 
+/*
+ * Where available, we prefer to use the libc implementation of the xattr
+ * syscalls. However, we also support using libattr for this on systems where
+ * libc does not provide this (e.g. glibc-2.2 and older)
+ * (configure-time magic is used to select which library to link to)
+ */
 #ifdef HAVE_SYS_XATTR_H
+// libc
 #include <sys/xattr.h>
-#endif
+#define EA_UNIX
+#elif HAVE_ATTR_ATTR_H
+// libattr
+#include <attr/xattr.h>
+#define EA_UNIX
+#endif /* HAVE_SYS_XATTR_H */
 
 #ifdef HAVE_SYS_EXTATTR_H
 #include <sys/extattr.h>
 #include <sys/uio.h>
+#define EA_BSD
 #endif
 
 #include <unistd.h>
@@ -79,7 +94,7 @@ G_BEGIN_DECLS
 // HELPER FUNCTIONS
 //
 
-#ifdef HAVE_SYS_EXTATTR_H
+#ifdef EA_BSD
 
 struct BsdNamespaceInfo {
 	const char *name;
@@ -307,19 +322,19 @@ bsd_flistxattr (int fd, void *list, mph_size_t size)
 	return full_size;
 }
 
-#endif /* HAVE_SYS_EXTATTR_H */
+#endif /* EA_BSD */
 
 //
 // THE PROVIDED API
 //
 
 gint32
-Mono_Posix_Syscall_setxattr (const char *path, const char *name, void *value, mph_size_t size, gint32 flags)
+Mono_Posix_Syscall_setxattr (const char *path, const char *name, unsigned char *value, mph_size_t size, gint32 flags)
 {
 	gint32 ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 	{
 		int _flags;
 		if (Mono_Posix_FromXattrFlags (flags, &_flags) == -1)
@@ -330,7 +345,7 @@ Mono_Posix_Syscall_setxattr (const char *path, const char *name, void *value, mp
 		ret = setxattr (path, name, value, (size_t) size, _flags);
 #endif /* __APPLE__ */
 	}
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -341,26 +356,26 @@ Mono_Posix_Syscall_setxattr (const char *path, const char *name, void *value, mp
 		ret = extattr_set_file (path, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 
 #if !__APPLE__
 gint32
-Mono_Posix_Syscall_lsetxattr (const char *path, const char *name, void *value, mph_size_t size, gint32 flags)
+Mono_Posix_Syscall_lsetxattr (const char *path, const char *name, unsigned char *value, mph_size_t size, gint32 flags)
 {
 	gint32 ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 	{
 		int _flags;
 		if (Mono_Posix_FromXattrFlags (flags, &_flags) == -1)
 			return -1;
 		ret = lsetxattr (path, name, value, size, _flags);
 	}
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -371,19 +386,19 @@ Mono_Posix_Syscall_lsetxattr (const char *path, const char *name, void *value, m
 		ret = extattr_set_link (path, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 #endif /* !__APPLE__ */
 
 gint32
-Mono_Posix_Syscall_fsetxattr (int fd, const char *name, void *value, mph_size_t size, gint32 flags)
+Mono_Posix_Syscall_fsetxattr (int fd, const char *name, unsigned char *value, mph_size_t size, gint32 flags)
 {
 	gint32 ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 	{
 		int _flags;
 		if (Mono_Posix_FromXattrFlags (flags, &_flags) == -1)
@@ -394,7 +409,7 @@ Mono_Posix_Syscall_fsetxattr (int fd, const char *name, void *value, mph_size_t
 		ret = fsetxattr (fd, name, value, (size_t) size, _flags);
 #endif /* __APPLE__ */
 	}
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -405,24 +420,24 @@ Mono_Posix_Syscall_fsetxattr (int fd, const char *name, void *value, mph_size_t
 		ret = extattr_set_fd (fd, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 
 mph_ssize_t
-Mono_Posix_Syscall_getxattr (const char *path, const char *name, void *value, mph_size_t size)
+Mono_Posix_Syscall_getxattr (const char *path, const char *name, unsigned char *value, mph_size_t size)
 {
 	mph_ssize_t ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
 	ret = getxattr (path, name, value, (size_t) size, 0, 0);
 #else /* __APPLE__ */
 	ret = getxattr (path, name, value, (size_t) size);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -431,21 +446,21 @@ Mono_Posix_Syscall_getxattr (const char *path, const char *name, void *value, mp
 		ret = extattr_get_file (path, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 
 #if !__APPLE__
 mph_ssize_t
-Mono_Posix_Syscall_lgetxattr (const char *path, const char *name, void *value, mph_size_t size)
+Mono_Posix_Syscall_lgetxattr (const char *path, const char *name, unsigned char *value, mph_size_t size)
 {
 	mph_ssize_t ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 	ret = lgetxattr (path, name, value, (size_t) size);
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -454,25 +469,25 @@ Mono_Posix_Syscall_lgetxattr (const char *path, const char *name, void *value, m
 		ret = extattr_get_link (path, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 #endif /* !__APPLE__ */
 
 mph_ssize_t
-Mono_Posix_Syscall_fgetxattr (int fd, const char *name, void *value, mph_size_t size)
+Mono_Posix_Syscall_fgetxattr (int fd, const char *name, unsigned char *value, mph_size_t size)
 {
 	mph_ssize_t ret;
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
 	ret = fgetxattr (fd, name, value, (size_t) size, 0, 0);
 #else /* __APPLE__ */
 	ret = fgetxattr (fd, name, value, (size_t) size);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -481,55 +496,55 @@ Mono_Posix_Syscall_fgetxattr (int fd, const char *name, void *value, mph_size_t
 		ret = extattr_get_fd (fd, namespace, _name, value, (size_t) size);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 
 mph_ssize_t
-Mono_Posix_Syscall_listxattr (const char *path, void *list, mph_size_t size)
+Mono_Posix_Syscall_listxattr (const char *path, unsigned char *list, mph_size_t size)
 {
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
-	return listxattr (path, list, (size_t) size, 0);
+	return listxattr (path, (char*) list, (size_t) size, 0);
 #else /* __APPLE__ */
-	return listxattr (path, list, (size_t) size);
+	return listxattr (path, (char*) list, (size_t) size);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	return bsd_listxattr (path, list, size);
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 }
 
 #if !__APPLE__
 mph_ssize_t
-Mono_Posix_Syscall_llistxattr (const char *path, void *list, mph_size_t size)
+Mono_Posix_Syscall_llistxattr (const char *path, unsigned char *list, mph_size_t size)
 {
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
-	return llistxattr (path, list, (size_t) size);
-#else /* HAVE_SYS_XATTR_H */
+#ifdef EA_UNIX
+	return llistxattr (path, (char*) list, (size_t) size);
+#else /* EA_UNIX */
 	return bsd_llistxattr (path, list, size);
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 }
 #endif /* !__APPLE__ */
 
 mph_ssize_t
-Mono_Posix_Syscall_flistxattr (int fd, void *list, mph_size_t size)
+Mono_Posix_Syscall_flistxattr (int fd, unsigned char *list, mph_size_t size)
 {
 	mph_return_if_size_t_overflow (size);
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
-	return flistxattr (fd, list, (size_t) size, 0);
+	return flistxattr (fd, (char*) list, (size_t) size, 0);
 #else /* __APPLE__ */
-	return flistxattr (fd, list, (size_t) size);
+	return flistxattr (fd, (char*) list, (size_t) size);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	return bsd_flistxattr (fd, list, size);
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 }
 
 gint32
@@ -537,13 +552,13 @@ Mono_Posix_Syscall_removexattr (const char *path, const char *name)
 {
 	gint32 ret;
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
 	ret = removexattr (path, name, 0);
 #else /* __APPLE__ */
 	ret = removexattr (path, name);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -552,7 +567,7 @@ Mono_Posix_Syscall_removexattr (const char *path, const char *name)
 		ret = extattr_delete_file (path, namespace, _name);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
@@ -563,9 +578,9 @@ Mono_Posix_Syscall_lremovexattr (const char *path, const char *name)
 {
 	gint32 ret;
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 	ret = lremovexattr (path, name);
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -574,7 +589,7 @@ Mono_Posix_Syscall_lremovexattr (const char *path, const char *name)
 		ret = extattr_delete_link (path, namespace, _name);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
@@ -585,13 +600,13 @@ Mono_Posix_Syscall_fremovexattr (int fd, const char *name)
 {
 	gint32 ret;
 
-#ifdef HAVE_SYS_XATTR_H
+#ifdef EA_UNIX
 #if __APPLE__
 	ret = fremovexattr (fd, name, 0);
 #else /* __APPLE__ */
 	ret = fremovexattr (fd, name);
 #endif /* __APPLE__ */
-#else /* HAVE_SYS_XATTR_H */
+#else /* EA_UNIX */
 	{
 		char *_name;
 		int namespace;
@@ -600,14 +615,14 @@ Mono_Posix_Syscall_fremovexattr (int fd, const char *name)
 		ret = extattr_delete_fd (fd, namespace, _name);
 		g_free (_name);
 	}
-#endif /* HAVE_SYS_XATTR_H */
+#endif /* EA_UNIX */
 
 	return ret;
 }
 
 G_END_DECLS
 
-#endif /* HAVE_SYS_XATTR_H || HAVE_SYS_EXTATTR_H */
+#endif /* HAVE_SYS_XATTR_H || HAVE_ATTR_ATTR_H || HAVE_SYS_EXTATTR_H */
 
 /*
  * vim: noexpandtab