[gentoo-commits] proj/elfix:master commit in: scripts/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     126136fabaa7f90ff7d987ae6453ba0d1bb5f720
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 00:17:19 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 00:17:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=126136fa

scripts/{setup.py,paxmodule.c}: build with/without xattr support

---
 scripts/paxmodule.c |   17 +++++++++++++++++
 scripts/setup.py    |   22 +++++++++++++++++-----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c
index a106ff5..b665412 100644
--- a/scripts/paxmodule.c
+++ b/scripts/paxmodule.c
@@ -21,7 +21,10 @@
 #include <string.h>
 
 #include <gelf.h>
+
+#ifdef XATTR
 #include <attr/xattr.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -29,7 +32,10 @@
 #include <unistd.h>
 
 #define BUF_SIZE	7	//Buffer size for holding human readable flags
+
+#ifdef XATTR
 #define PAX_NAMESPACE	"user.pax"
+#endif
 
 
 static PyObject * pax_getflags(PyObject *, PyObject *);
@@ -106,6 +112,7 @@ get_pt_flags(int fd)
 }
 
 
+#ifdef XATTR
 uint16_t
 get_xt_flags(int fd)
 {
@@ -114,6 +121,7 @@ get_xt_flags(int fd)
 	fgetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t));
 	return xt_flags;
 }
+#endif
 
 
 void
@@ -161,6 +169,7 @@ pax_getflags(PyObject *self, PyObject *args)
 		return NULL;
 	}
 
+#ifdef XATTR
 	flags = get_xt_flags(fd);
 	if( flags != UINT16_MAX )
 	{
@@ -169,13 +178,16 @@ pax_getflags(PyObject *self, PyObject *args)
 	}
 	else
 	{
+#endif
 		flags = get_pt_flags(fd);
 		if( flags != UINT16_MAX )
 		{
 			memset(buf, 0, BUF_SIZE);
 			bin2string(flags, buf);
 		}
+#ifdef XATTR
 	}
+#endif
 
 	close(fd);
 
@@ -237,11 +249,13 @@ set_pt_flags(int fd, uint16_t pt_flags)
 }
 
 
+#ifdef XATTR
 void
 set_xt_flags(int fd, uint16_t xt_flags)
 {
 	fsetxattr(fd, PAX_NAMESPACE, &xt_flags, sizeof(uint16_t), 0);
 }
+#endif
 
 
 static PyObject *
@@ -266,7 +280,10 @@ pax_setflags(PyObject *self, PyObject *args)
 	flags = (uint16_t) iflags;
 
 	set_pt_flags(fd, flags);
+
+#ifdef XATTR
 	set_xt_flags(fd, flags);
+#endif
 
 	close(fd);
 

diff --git a/scripts/setup.py b/scripts/setup.py
index 3170930..40aecdb 100755
--- a/scripts/setup.py
+++ b/scripts/setup.py
@@ -1,12 +1,24 @@
 #!/usr/bin/env python
 
+import os
 from distutils.core import setup, Extension
 
-module1 = Extension(
-	name='pax',
-	sources = ['paxmodule.c'],
-	libraries = ['elf', 'attr'],
-)
+xattr = os.getenv('XATTR')
+
+if xattr != None:
+	module1 = Extension(
+		name='pax',
+		sources = ['paxmodule.c'],
+		libraries = ['elf', 'attr'],
+		define_macros = [('XATTR', None)]
+	)
+else:
+	module1 = Extension(
+		name='pax',
+		sources = ['paxmodule.c'],
+		libraries = ['elf'],
+		undef_macros = ['XATTR']
+	)
 
 setup(
 	name = 'PaxPython',