FreeBSD support from Paul Querna

3 files changed, 230 insertions, 4 deletions

diff --git a/Lib/xattr/__init__.py b/Lib/xattr/__init__.py
index 8f85363..5ccfd2b 100644
--- a/Lib/xattr/__init__.py
+++ b/Lib/xattr/__init__.py
@@ -7,7 +7,7 @@ The xattr type wraps a path or file descriptor with a dict-like interface
 that exposes these extended attributes.
 """
 
-__version__ = '0.1'
+__version__ = '0.3'
 from constants import *
 import _xattr
 
diff --git a/Modules/xattr/_xattr.c b/Modules/xattr/_xattr.c
index 3980a49..2e72f05 100644
--- a/Modules/xattr/_xattr.c
+++ b/Modules/xattr/_xattr.c
@@ -1,6 +1,232 @@
 #include "Python.h"
+#ifdef __FreeBSD__
+#include <sys/extattr.h>
+#else
 #include <sys/xattr.h>
-#ifndef XATTR_NOFOLLOW
+#endif
+
+#ifdef __FreeBSD__
+
+/* FreeBSD compatibility API */
+#define XATTR_XATTR_NOFOLLOW 0x0001
+#define XATTR_XATTR_CREATE 0x0002
+#define XATTR_XATTR_REPLACE 0x0004
+#define XATTR_XATTR_NOSECURITY 0x0008
+
+
+/* Converts a freebsd format attribute list into a NULL terminated list.
+ * While the man page on extattr_list_file says it is NULL terminated, 
+ * it is actually the first byte that is the length of the
+ * following attribute.
+ */
+static void convert_bsd_list(char *namebuf, size_t size)
+{
+    size_t offset = 0;
+    while(offset < size) {
+        int length = (int) namebuf[offset];
+        memmove(namebuf+offset, namebuf+offset+1, length);
+        namebuf[offset+length] = '\0';
+        offset += length+1;
+    }
+}
+
+static ssize_t xattr_getxattr(const char *path, const char *name,
+                              void *value, ssize_t size, u_int32_t position, 
+                              int options)
+{
+    if (position != 0 || 
+        !(options == 0 || options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return extattr_get_link(path, EXTATTR_NAMESPACE_USER,
+                                name, value, size);
+    }
+    else {
+        return extattr_get_file(path, EXTATTR_NAMESPACE_USER,
+                                name, value, size);
+    }
+}
+
+static ssize_t xattr_setxattr(const char *path, const char *name,
+                              void *value, ssize_t size, u_int32_t position,
+                              int options)
+{
+    int rv = 0;
+    int nofollow;
+
+    if (position != 0) {
+        return -1;
+    }
+
+    nofollow = options & XATTR_XATTR_NOFOLLOW;
+    options &= ~XATTR_XATTR_NOFOLLOW;
+
+    if (options == XATTR_XATTR_CREATE ||
+        options == XATTR_XATTR_REPLACE) {
+
+        /* meh. FreeBSD doesn't really have this in it's
+         * API... Oh well. 
+         */
+    }
+    else if (options != 0) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        rv = extattr_set_link(path, EXTATTR_NAMESPACE_USER,
+                                name, value, size);
+    }
+    else {
+        rv = extattr_set_file(path, EXTATTR_NAMESPACE_USER,
+                                name, value, size);
+    }
+
+    /* freebsd returns the written length on success, not zero. */
+    if (rv >= 0) {
+        return 0;
+    }
+    else {
+        return rv;
+    }
+}
+
+static ssize_t xattr_removexattr(const char *path, const char *name,
+                                 int options)
+{
+    if (!(options == 0 ||
+          options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return extattr_delete_link(path, EXTATTR_NAMESPACE_USER, name);
+    }
+    else {
+        return extattr_delete_file(path, EXTATTR_NAMESPACE_USER, name);
+    }
+}
+
+
+static ssize_t xattr_listxattr(const char *path, char *namebuf,
+                               size_t size, int options)
+{
+    ssize_t rv = 0;
+    if (!(options == 0 ||
+          options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        rv = extattr_list_link(path, EXTATTR_NAMESPACE_USER, namebuf, size);
+    }
+    else {
+        rv = extattr_list_file(path, EXTATTR_NAMESPACE_USER, namebuf, size);
+    }
+
+    if (rv > 0 && namebuf) {
+        convert_bsd_list(namebuf, rv);
+    }
+
+    return rv;
+}
+
+static ssize_t xattr_fgetxattr(int fd, const char *name, void *value,
+                               ssize_t size, u_int32_t position, int options)
+{
+    if (position != 0 ||
+        !(options == 0 || options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return -1;
+    }
+    else {
+        return extattr_get_fd(fd, EXTATTR_NAMESPACE_USER, name, value, size);
+    }
+}
+
+static ssize_t xattr_fsetxattr(int fd, const char *name, void *value,
+                               ssize_t size, u_int32_t position, int options)
+{
+    int rv = 0;
+    int nofollow;
+
+    if (position != 0) {
+        return -1;
+    }
+
+    nofollow = options & XATTR_XATTR_NOFOLLOW;
+    options &= ~XATTR_XATTR_NOFOLLOW;
+
+    if (options == XATTR_XATTR_CREATE ||
+        options == XATTR_XATTR_REPLACE) {
+        /* freebsd noop */
+    }
+    else if (options != 0) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return -1;
+    }
+    else {
+        rv = extattr_set_fd(fd, EXTATTR_NAMESPACE_USER, 
+                            name, value, size);
+    }
+
+    /* freebsd returns the written length on success, not zero. */
+    if (rv >= 0) {
+        return 0;
+    }
+    else {
+        return rv;
+    }
+}
+
+static ssize_t xattr_fremovexattr(int fd, const char *name, int options)
+{
+
+    if (!(options == 0 ||
+          options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return -1;
+    }
+    else {
+        return extattr_delete_fd(fd, EXTATTR_NAMESPACE_USER, name);
+    }
+}
+
+
+static ssize_t xattr_flistxattr(int fd, char *namebuf, size_t size, int options)
+{
+    ssize_t rv = 0;
+
+    if (!(options == 0 ||
+          options == XATTR_XATTR_NOFOLLOW)) {
+        return -1;
+    }
+
+    if (options & XATTR_XATTR_NOFOLLOW) {
+        return -1;
+    }
+    else {
+        rv = extattr_list_fd(fd, EXTATTR_NAMESPACE_USER, namebuf, size);
+    }
+
+    if (rv > 0 && namebuf) {
+        convert_bsd_list(namebuf, rv);
+    }
+
+    return rv;
+}
+
+#elif !defined(XATTR_NOFOLLOW)
 /* Linux compatibility API */
 #define XATTR_XATTR_NOFOLLOW 0x0001
 #define XATTR_XATTR_CREATE 0x0002
diff --git a/setup.py b/setup.py
index 9f8fce2..9965b4b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ ez_setup.use_setuptools()
 
 from setuptools import setup, Extension
 
-VERSION = '0.2'
+VERSION = '0.3'
 DESCRIPTION = "Python wrapper for extended filesystem attributes"
 LONG_DESCRIPTION = """
 Extended attributes extend the basic attributes of files and directories
@@ -39,7 +39,7 @@ setup(
     url="http://undefined.org/python/#xattr",
     license="MIT License",
     packages=['xattr'],
-    platforms=['MacOS X', 'Linux'],
+    platforms=['MacOS X', 'Linux', 'FreeBSD'],
     package_dir={'xattr': 'Lib/xattr'},
     ext_modules=[
         Extension("xattr._xattr", ["Modules/xattr/_xattr.c"]),