From 4e5b00baca3c0bd7012fb0705ea3f5b252f5f674 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iusty@k1024.org>
Date: Sat, 21 Dec 2002 01:46:19 +0000
Subject: [PATCH] Added support for variable type parameters, in order to wrap
 both forms like get... and fget... in the same call.

---
 xattr.c | 104 +++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 92 insertions(+), 12 deletions(-)

diff --git a/xattr.c b/xattr.c
index 96b2a89..7831c4d 100644
--- a/xattr.c
+++ b/xattr.c
@@ -1,54 +1,109 @@
 #include <Python.h>
 #include <attr/xattr.h>
 
+static int convertObj(PyObject *myobj, int *ishandle, int *filehandle, char **filename) {
+    if(PyString_Check(myobj)) {
+        *ishandle = 0;
+        *filename = PyString_AS_STRING(myobj);
+    } else if(PyInt_Check(myobj)) {
+        *ishandle = 1;
+        *filehandle = PyInt_AS_LONG(myobj);
+    } else if(PyFile_Check(myobj)) {
+        *ishandle = 1;
+        *filehandle = fileno(PyFile_AsFile(myobj));
+        if(*filehandle == -1) {
+            PyErr_SetFromErrno(PyExc_IOError);
+            return 0;
+        }
+    } else {
+        PyErr_SetString(PyExc_TypeError, "argument 1 must be string or int");
+        return 0;
+    }
+    return 1;
+}
+
 static PyObject *
 pygetxattr(PyObject *self, PyObject *args)
 {
+    PyObject *myarg;
     char *file;
+    int filedes;
+    int ishandle;
     char *attrname;
     char *buf;
     int nalloc, nret;
     PyObject *res;
     
-    if (!PyArg_ParseTuple(args, "ss", &file, &attrname))
+    /* Parse the arguments */
+    if (!PyArg_ParseTuple(args, "Os", &myarg, &attrname))
         return NULL;
 
-    if((nalloc = getxattr(file, attrname, NULL, 0)) == -1) {
+    if(!convertObj(myarg, &ishandle, &filedes, &file))
+        return NULL;
+
+    /* Find out the needed size of the buffer */
+    nalloc = ishandle ? 
+        fgetxattr(filedes, attrname, NULL, 0) : 
+        getxattr(file, attrname, NULL, 0);
+    if(nalloc == -1) {
         return PyErr_SetFromErrno(PyExc_IOError);
     }
 
+    /* Try to allocate the memory, using Python's allocator */
     if((buf = PyMem_Malloc(nalloc)) == NULL) {
         PyErr_NoMemory();
         return NULL;
     }
 
-    if((nret = getxattr(file, attrname, buf, nalloc)) == -1) {
+    /* Now retrieve the attribute value */
+    nret = ishandle ? 
+        fgetxattr(filedes, attrname, buf, nalloc) :
+        getxattr(file, attrname, buf, nalloc);
+    if(nret == -1) {
         return PyErr_SetFromErrno(PyExc_IOError);
     }
 
+    /* Create the string which will hold the result */
     res = PyString_FromStringAndSize(buf, nret);
+
+    /* Free the buffer, now it is no longer needed */
     PyMem_Free(buf);
+
+    /* Return the result */
     return res;
 }
 
 static PyObject *
 pysetxattr(PyObject *self, PyObject *args)
 {
+    PyObject *myarg;
     char *file;
+    int ishandle, filedes;
     char *attrname;
     char *buf;
     char mode = 0;
     int bufsize, nret;
     int flags;
     
-    if (!PyArg_ParseTuple(args, "sss#|b", &file, &attrname, &buf, &bufsize, &mode))
+    /* Parse the arguments */
+    if (!PyArg_ParseTuple(args, "Oss#|b", &myarg, &attrname, &buf, &bufsize, &mode))
+        return NULL;
+    if(!convertObj(myarg, &ishandle, &filedes, &file))
         return NULL;
 
+    /* Check the flags and convert them to libattr values */
     flags = mode == 1 ? XATTR_CREATE : mode == 2 ? XATTR_REPLACE : 0;
-    if((nret = setxattr(file, attrname, buf, bufsize, flags)) == -1) {
+
+    /* Set the attribute's value */
+    nret = ishandle ?
+        fsetxattr(filedes, attrname, buf, bufsize, flags) :
+        setxattr(file, attrname, buf, bufsize, flags);
+
+    if(nret == -1) {
         return PyErr_SetFromErrno(PyExc_IOError);
     }
 
+    /* Return the result */
     Py_INCREF(Py_None);
     return Py_None;
 }
@@ -56,16 +111,28 @@ pysetxattr(PyObject *self, PyObject *args)
 static PyObject *
 pyremovexattr(PyObject *self, PyObject *args)
 {
+    PyObject *myarg;
     char *file;
+    int ishandle, filedes;
     char *attrname;
+    int nret;
     
-    if (!PyArg_ParseTuple(args, "ss", &file, &attrname))
+    /* Parse the arguments */
+    if (!PyArg_ParseTuple(args, "Os", &myarg, &attrname))
         return NULL;
 
-    if(removexattr(file, attrname) == -1) {
+    if(!convertObj(myarg, &ishandle, &filedes, &file))
+        return NULL;
+
+    /* Remove the attribute */
+    nret = ishandle ?
+        fremovexattr(filedes, attrname) :
+        removexattr(file, attrname);
+
+    if(nret == -1)
         return PyErr_SetFromErrno(PyExc_IOError);
-    }
 
+    /* Return the result */
     Py_INCREF(Py_None);
     return Py_None;
 }
@@ -73,19 +140,29 @@ pyremovexattr(PyObject *self, PyObject *args)
 static PyObject *
 pylistxattr(PyObject *self, PyObject *args)
 {
-    char *file;
+    char *file = NULL;
+    int filedes = -1;
     char *buf;
+    int ishandle;
     int nalloc, nret;
+    PyObject *myarg;
     PyObject *mytuple;
     int nattrs;
     char *s;
     
     /* Parse the arguments */
-    if (!PyArg_ParseTuple(args, "s", &file))
+    if (!PyArg_ParseTuple(args, "O", &myarg))
+        return NULL;
+    
+    if(!convertObj(myarg, &ishandle, &filedes, &file))
         return NULL;
 
     /* Find out the needed size of the buffer */
-    if((nalloc = listxattr(file, NULL, 0)) == -1) {
+    nalloc = ishandle ?
+        flistxattr(filedes, NULL, 0) :
+        listxattr(file, NULL, 0);
+
+    if(nalloc == -1) {
         return PyErr_SetFromErrno(PyExc_IOError);
     }
 
@@ -96,7 +173,10 @@ pylistxattr(PyObject *self, PyObject *args)
     }
 
     /* Now retrieve the list of attributes */
-    if((nret = listxattr(file, buf, nalloc)) == -1) {
+    nret = ishandle ? 
+        flistxattr(filedes, buf, nalloc) : 
+        listxattr(file, buf, nalloc);
+    if(nret == -1) {
         return PyErr_SetFromErrno(PyExc_IOError);
     }
 
-- 
2.39.5