diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/paxmodule.c | 12 | ||||
| -rwxr-xr-x | scripts/pypaxctl | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/scripts/paxmodule.c b/scripts/paxmodule.c index 3e335b4..14a7dcc 100644 --- a/scripts/paxmodule.c +++ b/scripts/paxmodule.c @@ -56,7 +56,7 @@ static PyObject * pax_getflags(PyObject *, PyObject *); static PyObject * pax_setbinflags(PyObject *, PyObject *); static PyObject * pax_setstrflags(PyObject *, PyObject *); #ifdef XTPAX -static PyObject * pax_deleteflags(PyObject *, PyObject *); +static PyObject * pax_deletextpax(PyObject *, PyObject *); #endif static PyMethodDef PaxMethods[] = { @@ -64,7 +64,7 @@ static PyMethodDef PaxMethods[] = { {"setbinflags", pax_setbinflags, METH_VARARGS, "Set the pax flags using binary."}, {"setstrflags", pax_setstrflags, METH_VARARGS, "Set the pax flags using string."}, #ifdef XTPAX - {"deleteflags", pax_deleteflags, METH_VARARGS, "Delete the XATTR_PAX field."}, + {"deletextpax", pax_deletextpax, METH_VARARGS, "Delete the XATTR_PAX field."}, #endif {NULL, NULL, 0, NULL} }; @@ -647,20 +647,20 @@ pax_setstrflags(PyObject *self, PyObject *args) #ifdef XTPAX static PyObject * -pax_deleteflags(PyObject *self, PyObject *args) +pax_deletextpax(PyObject *self, PyObject *args) { const char *f_name; int fd; if(!PyArg_ParseTuple(args, "s", &f_name)) { - PyErr_SetString(PaxError, "pax_deleteflags: PyArg_ParseTuple failed"); + PyErr_SetString(PaxError, "pax_deletextpax: PyArg_ParseTuple failed"); return NULL; } if((fd = open(f_name, O_RDONLY)) < 0) { - PyErr_SetString(PaxError, "pax_deleteflags: open() failed"); + PyErr_SetString(PaxError, "pax_deletextpax: open() failed"); return NULL; } @@ -668,7 +668,7 @@ pax_deleteflags(PyObject *self, PyObject *args) return Py_BuildValue(""); else { - PyErr_SetString(PaxError, "pax_deleteflags: fremovexattr() failed"); + PyErr_SetString(PaxError, "pax_deletextpax: fremovexattr() failed"); return NULL; } } diff --git a/scripts/pypaxctl b/scripts/pypaxctl index 809d074..8cba7a7 100755 --- a/scripts/pypaxctl +++ b/scripts/pypaxctl @@ -24,7 +24,7 @@ import pax xattr_available = True try: - from pax import deleteflags + from pax import deletextpax except ImportError: xattr_available = False @@ -76,9 +76,9 @@ def main(): else: for elf in args: try: - pax.deleteflags(elf) + pax.deletextpax(elf) except pax.error: - print('pax_deleteflags: XATTR_PAX not supported') + print('pax_deletextpax: XATTR_PAX not supported') sys.exit(1) if __name__ == '__main__': |