-/** \ingroup py_c
- * \file python/rpmfi-py.c
- */
+#include "rpmsystem-py.h"
-#include "system.h"
-
-#include <rpmlib.h>
+#include <rpm/rpmtypes.h>
+#include <rpm/rpmpgp.h>
#include "header-py.h"
#include "rpmfi-py.h"
-#include "debug.h"
-
-/*@access rpmfi @*/
-
-/*@null@*/
-static PyObject *
-rpmfi_Debug(/*@unused@*/ rpmfiObject * s, PyObject * args, PyObject * kwds)
- /*@globals _Py_NoneStruct @*/
- /*@modifies _Py_NoneStruct @*/
-{
- char * kwlist[] = {"debugLevel", NULL};
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "i", kwlist, &_rpmfi_debug))
- return NULL;
-
- Py_INCREF(Py_None);
- return Py_None;
-}
+struct rpmfiObject_s {
+ PyObject_HEAD
+ PyObject *md_dict; /*!< to look like PyModuleObject */
+ int active;
+ rpmfi fi;
+};
-/*@null@*/
static PyObject *
-rpmfi_FC(rpmfiObject * s)
- /*@*/
+rpmfi_FC(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFC(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FX(rpmfiObject * s)
- /*@*/
+rpmfi_FX(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFX(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_DC(rpmfiObject * s)
- /*@*/
+rpmfi_DC(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiDC(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_DX(rpmfiObject * s)
- /*@*/
+rpmfi_DX(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiDX(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_BN(rpmfiObject * s)
- /*@*/
+rpmfi_BN(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiBN(s->fi)));
+ return Py_BuildValue("s", rpmfiBN(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_DN(rpmfiObject * s)
- /*@*/
+rpmfi_DN(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiDN(s->fi)));
+ return Py_BuildValue("s", rpmfiDN(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FN(rpmfiObject * s)
- /*@modifies s @*/
+rpmfi_FN(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiFN(s->fi)));
+ return Py_BuildValue("s", rpmfiFN(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FFlags(rpmfiObject * s)
- /*@*/
+rpmfi_FFlags(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFFlags(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_VFlags(rpmfiObject * s)
- /*@*/
+rpmfi_VFlags(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiVFlags(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FMode(rpmfiObject * s)
- /*@*/
+rpmfi_FMode(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFMode(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FState(rpmfiObject * s)
- /*@*/
+rpmfi_FState(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFState(s->fi));
}
-/* XXX rpmfiMD5 */
-/*@null@*/
+/* XXX rpmfiFDigest */
static PyObject *
-rpmfi_MD5(rpmfiObject * s)
- /*@*/
-{
- const unsigned char * MD5;
- char fmd5[33];
- char * t;
- int i;
-
- MD5 = rpmfiMD5(s->fi);
- t = fmd5;
- if (MD5 != NULL)
- for (i = 0; i < 16; i++, t += 2)
- sprintf(t, "%02x", MD5[i]);
- *t = '\0';
- return Py_BuildValue("s", xstrdup(fmd5));
+rpmfi_Digest(rpmfiObject * s, PyObject * unused)
+{
+ char *digest = rpmfiFDigestHex(s->fi, NULL);
+ if (digest) {
+ PyObject *dig = Py_BuildValue("s", digest);
+ free(digest);
+ return dig;
+ } else {
+ Py_RETURN_NONE;
+ }
}
-/*@null@*/
static PyObject *
-rpmfi_FLink(rpmfiObject * s)
- /*@*/
+rpmfi_FLink(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiFLink(s->fi)));
+ return Py_BuildValue("s", rpmfiFLink(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FSize(rpmfiObject * s)
- /*@*/
+rpmfi_FSize(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("i", rpmfiFSize(s->fi));
+ return Py_BuildValue("L", rpmfiFSize(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FRdev(rpmfiObject * s)
- /*@*/
+rpmfi_FRdev(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFRdev(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FMtime(rpmfiObject * s)
- /*@*/
+rpmfi_FMtime(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFMtime(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FUser(rpmfiObject * s)
- /*@*/
+rpmfi_FUser(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiFUser(s->fi)));
+ return Py_BuildValue("s", rpmfiFUser(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FGroup(rpmfiObject * s)
- /*@*/
+rpmfi_FGroup(rpmfiObject * s, PyObject * unused)
{
- return Py_BuildValue("s", xstrdup(rpmfiFGroup(s->fi)));
+ return Py_BuildValue("s", rpmfiFGroup(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FColor(rpmfiObject * s)
- /*@*/
+rpmfi_FColor(rpmfiObject * s, PyObject * unused)
{
return Py_BuildValue("i", rpmfiFColor(s->fi));
}
-/*@null@*/
static PyObject *
-rpmfi_FClass(rpmfiObject * s)
- /*@*/
+rpmfi_FClass(rpmfiObject * s, PyObject * unused)
{
const char * FClass;
if ((FClass = rpmfiFClass(s->fi)) == NULL)
FClass = "";
- return Py_BuildValue("s", xstrdup(FClass));
-}
-
-#if Py_TPFLAGS_HAVE_ITER
-static PyObject *
-rpmfi_iter(rpmfiObject * s)
- /*@*/
-{
- Py_INCREF(s);
- return (PyObject *)s;
+ return Py_BuildValue("s", FClass);
}
-#endif
-/*@null@*/
static PyObject *
rpmfi_iternext(rpmfiObject * s)
- /*@globals _Py_NoneStruct @*/
- /*@modifies s, _Py_NoneStruct @*/
{
PyObject * result = NULL;
/* If more to do, return the file tuple. */
if (rpmfiNext(s->fi) >= 0) {
const char * FN = rpmfiFN(s->fi);
- int FSize = rpmfiFSize(s->fi);
+ rpm_loff_t FSize = rpmfiFSize(s->fi);
int FMode = rpmfiFMode(s->fi);
int FMtime = rpmfiFMtime(s->fi);
int FFlags = rpmfiFFlags(s->fi);
int VFlags = rpmfiVFlags(s->fi);
const char * FUser = rpmfiFUser(s->fi);
const char * FGroup = rpmfiFGroup(s->fi);
-/*@-shadow@*/
- const unsigned char * MD5 = rpmfiMD5(s->fi), *s = MD5;
-/*@=shadow@*/
- char FMD5[2*16+1], *t = FMD5;
- static const char hex[] = "0123456789abcdef";
- int gotMD5, i;
-
- gotMD5 = 0;
- if (s)
- for (i = 0; i < 16; i++) {
- gotMD5 |= *s;
- *t++ = hex[ (*s >> 4) & 0xf ];
- *t++ = hex[ (*s++ ) & 0xf ];
- }
- *t = '\0';
result = PyTuple_New(13);
if (FN == NULL) {
PyTuple_SET_ITEM(result, 0, Py_None);
} else
PyTuple_SET_ITEM(result, 0, Py_BuildValue("s", FN));
- PyTuple_SET_ITEM(result, 1, PyInt_FromLong(FSize));
+ PyTuple_SET_ITEM(result, 1, PyLong_FromLongLong(FSize));
PyTuple_SET_ITEM(result, 2, PyInt_FromLong(FMode));
PyTuple_SET_ITEM(result, 3, PyInt_FromLong(FMtime));
PyTuple_SET_ITEM(result, 4, PyInt_FromLong(FFlags));
PyTuple_SET_ITEM(result, 11, Py_None);
} else
PyTuple_SET_ITEM(result, 11, Py_BuildValue("s", FGroup));
- if (!gotMD5) {
- Py_INCREF(Py_None);
- PyTuple_SET_ITEM(result, 12, Py_None);
- } else
- PyTuple_SET_ITEM(result, 12, Py_BuildValue("s", FMD5));
+ PyTuple_SET_ITEM(result, 12, rpmfi_Digest(s, NULL));
} else
s->active = 0;
return result;
}
-static PyObject *
-rpmfi_Next(rpmfiObject * s)
- /*@globals _Py_NoneStruct @*/
- /*@modifies s, _Py_NoneStruct @*/
-{
- PyObject * result = NULL;
-
- result = rpmfi_iternext(s);
-
- if (result == NULL) {
- Py_INCREF(Py_None);
- return Py_None;
- }
-
- return result;
-}
-
-#ifdef NOTYET
-/*@null@*/
-static PyObject *
-rpmfi_NextD(rpmfiObject * s)
- /*@*/
-{
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-/*@null@*/
-static PyObject *
-rpmfi_InitD(rpmfiObject * s)
- /*@*/
-{
- Py_INCREF(Py_None);
- return Py_None;
-}
-#endif
-
-/*@-fullinitblock@*/
-/*@unchecked@*/ /*@observer@*/
static struct PyMethodDef rpmfi_methods[] = {
- {"Debug", (PyCFunction)rpmfi_Debug, METH_VARARGS|METH_KEYWORDS,
- NULL},
{"FC", (PyCFunction)rpmfi_FC, METH_NOARGS,
NULL},
{"FX", (PyCFunction)rpmfi_FX, METH_NOARGS,
NULL},
{"FState", (PyCFunction)rpmfi_FState, METH_NOARGS,
NULL},
- {"MD5", (PyCFunction)rpmfi_MD5, METH_NOARGS,
+ {"MD5", (PyCFunction)rpmfi_Digest, METH_NOARGS,
+ NULL},
+ {"Digest", (PyCFunction)rpmfi_Digest, METH_NOARGS,
NULL},
{"FLink", (PyCFunction)rpmfi_FLink, METH_NOARGS,
NULL},
NULL},
{"FClass", (PyCFunction)rpmfi_FClass, METH_NOARGS,
NULL},
- {"next", (PyCFunction)rpmfi_Next, METH_NOARGS,
-"fi.next() -> (FN, FSize, FMode, FMtime, FFlags, FRdev, FInode, FNlink, FState, VFlags, FUser, FGroup, FMD5))\n\
-- Retrieve next file info tuple.\n" },
-#ifdef NOTYET
- {"NextD", (PyCFunction)rpmfi_NextD, METH_NOARGS,
- NULL},
- {"InitD", (PyCFunction)rpmfi_InitD, METH_NOARGS,
- NULL},
-#endif
{NULL, NULL} /* sentinel */
};
-/*@=fullinitblock@*/
/* ---------- */
static void
-rpmfi_dealloc(/*@only@*/ /*@null@*/ rpmfiObject * s)
- /*@modifies s @*/
+rpmfi_dealloc(rpmfiObject * s)
{
- if (s) {
- s->fi = rpmfiFree(s->fi);
- PyObject_Del(s);
- }
-}
-
-static int
-rpmfi_print(rpmfiObject * s, FILE * fp, /*@unused@*/ int flags)
- /*@globals fileSystem @*/
- /*@modifies s, fp, fileSystem @*/
-{
- if (!(s && s->fi))
- return -1;
-
- s->fi = rpmfiInit(s->fi, 0);
- while (rpmfiNext(s->fi) >= 0)
- fprintf(fp, "%s\n", rpmfiFN(s->fi));
- return 0;
-}
-
-static PyObject * rpmfi_getattro(PyObject * o, PyObject * n)
- /*@*/
-{
- return PyObject_GenericGetAttr(o, n);
-}
-
-static int rpmfi_setattro(PyObject * o, PyObject * n, PyObject * v)
- /*@*/
-{
- return PyObject_GenericSetAttr(o, n, v);
+ s->fi = rpmfiFree(s->fi);
+ Py_TYPE(s)->tp_free((PyObject *)s);
}
static int
rpmfi_length(rpmfiObject * s)
- /*@*/
{
return rpmfiFC(s->fi);
}
-/*@null@*/
static PyObject *
rpmfi_subscript(rpmfiObject * s, PyObject * key)
- /*@modifies s @*/
{
int ix;
ix = (int) PyInt_AsLong(key);
rpmfiSetFX(s->fi, ix);
- return Py_BuildValue("s", xstrdup(rpmfiFN(s->fi)));
+ return Py_BuildValue("s", rpmfiFN(s->fi));
}
-/*@unchecked@*/ /*@observer@*/
static PyMappingMethods rpmfi_as_mapping = {
- (inquiry) rpmfi_length, /* mp_length */
+ (lenfunc) rpmfi_length, /* mp_length */
(binaryfunc) rpmfi_subscript, /* mp_subscript */
(objobjargproc)0, /* mp_ass_subscript */
};
-/** \ingroup py_c
- */
static int rpmfi_init(rpmfiObject * s, PyObject *args, PyObject *kwds)
- /*@globals rpmGlobalMacroContext @*/
- /*@modifies s, rpmGlobalMacroContext @*/
{
- hdrObject * ho = NULL;
- PyObject * to = NULL;
- rpmts ts = NULL; /* XXX FIXME: fiFromHeader should be a ts method. */
- int tagN = RPMTAG_BASENAMES;
- int flags = 0;
- char * kwlist[] = {"header", "tag", "flags", NULL};
-
-if (_rpmfi_debug < 0)
-fprintf(stderr, "*** rpmfi_init(%p,%p,%p)\n", s, args, kwds);
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|Oi:rpmfi_init", kwlist,
- &hdr_Type, &ho, &to, &flags))
- return -1;
-
- if (to != NULL) {
- tagN = tagNumFromPyObject(to);
- if (tagN == -1) {
- PyErr_SetString(PyExc_KeyError, "unknown header tag");
- return -1;
- }
- }
- s->fi = rpmfiNew(ts, hdrGetHeader(ho), tagN, flags);
s->active = 0;
-
return 0;
}
-/** \ingroup py_c
- */
-static void rpmfi_free(/*@only@*/ rpmfiObject * s)
- /*@modifies s @*/
-{
-if (_rpmfi_debug)
-fprintf(stderr, "%p -- fi %p\n", s, s->fi);
- s->fi = rpmfiFree(s->fi);
-
- PyObject_Del((PyObject *)s);
-}
-
-/** \ingroup py_c
- */
-static PyObject * rpmfi_alloc(PyTypeObject * subtype, int nitems)
- /*@*/
+static PyObject * rpmfi_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
{
- PyObject * s = PyType_GenericAlloc(subtype, nitems);
+ PyObject * to = NULL;
+ Header h = NULL;
+ rpmfi fi = NULL;
+ rpmTagVal tagN = RPMTAG_BASENAMES;
+ int flags = 0;
+ char * kwlist[] = {"header", "tag", "flags", NULL};
-if (_rpmfi_debug < 0)
-fprintf(stderr, "*** rpmfi_alloc(%p,%d) ret %p\n", subtype, nitems, s);
- return s;
-}
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&|Oi:rpmfi_init", kwlist,
+ hdrFromPyObject, &h, &to, &flags))
+ return NULL;
-/** \ingroup py_c
- */
-/*@null@*/
-static PyObject * rpmfi_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds)
- /*@globals rpmGlobalMacroContext @*/
- /*@modifies rpmGlobalMacroContext @*/
-{
- rpmfiObject * s = (void *) PyObject_New(rpmfiObject, subtype);
+ fi = rpmfiNew(NULL, h, tagN, flags);
- /* Perform additional initialization. */
- if (rpmfi_init(s, args, kwds) < 0) {
- rpmfi_free(s);
+ if (fi == NULL) {
+ PyErr_SetString(PyExc_ValueError, "invalid file data in header");
return NULL;
}
-if (_rpmfi_debug)
-fprintf(stderr, "%p ++ fi %p\n", s, s->fi);
-
- return (PyObject *)s;
+ return rpmfi_Wrap(subtype, fi);
}
-/**
- */
-/*@unchecked@*/ /*@observer@*/
static char rpmfi_doc[] =
"";
-/*@-fullinitblock@*/
PyTypeObject rpmfi_Type = {
- PyObject_HEAD_INIT(&PyType_Type)
- 0, /* ob_size */
+ PyVarObject_HEAD_INIT(&PyType_Type, 0)
"rpm.fi", /* tp_name */
sizeof(rpmfiObject), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor) rpmfi_dealloc, /* tp_dealloc */
- (printfunc) rpmfi_print, /* tp_print */
+ 0, /* tp_print */
(getattrfunc)0, /* tp_getattr */
(setattrfunc)0, /* tp_setattr */
- (cmpfunc)0, /* tp_compare */
+ 0, /* tp_compare */
(reprfunc)0, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
(hashfunc)0, /* tp_hash */
(ternaryfunc)0, /* tp_call */
(reprfunc)0, /* tp_str */
- (getattrofunc) rpmfi_getattro, /* tp_getattro */
- (setattrofunc) rpmfi_setattro, /* tp_setattro */
+ PyObject_GenericGetAttr, /* tp_getattro */
+ PyObject_GenericSetAttr, /* tp_setattro */
0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT, /* tp_flags */
+ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
rpmfi_doc, /* tp_doc */
-#if Py_TPFLAGS_HAVE_ITER
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
- (getiterfunc) rpmfi_iter, /* tp_iter */
+ PyObject_SelfIter, /* tp_iter */
(iternextfunc) rpmfi_iternext, /* tp_iternext */
rpmfi_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc) rpmfi_init, /* tp_init */
- (allocfunc) rpmfi_alloc, /* tp_alloc */
+ 0, /* tp_alloc */
(newfunc) rpmfi_new, /* tp_new */
- (freefunc) rpmfi_free, /* tp_free */
+ 0, /* tp_free */
0, /* tp_is_gc */
-#endif
};
-/*@=fullinitblock@*/
/* ---------- */
return s->fi;
}
-rpmfiObject *
-rpmfi_Wrap(rpmfi fi)
+PyObject * rpmfi_Wrap(PyTypeObject *subtype, rpmfi fi)
{
- rpmfiObject *s = PyObject_New(rpmfiObject, &rpmfi_Type);
+ rpmfiObject *s = (rpmfiObject *)subtype->tp_alloc(subtype, 0);
+ if (s == NULL) return NULL;
- if (s == NULL)
- return NULL;
s->fi = fi;
s->active = 0;
- return s;
+ return (PyObject *) s;
}
-rpmfiObject *
-hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
-{
- hdrObject * ho = (hdrObject *)s;
- PyObject * to = NULL;
- rpmts ts = NULL; /* XXX FIXME: fiFromHeader should be a ts method. */
- rpmTag tagN = RPMTAG_BASENAMES;
- int flags = 0;
- char * kwlist[] = {"tag", "flags", NULL};
-
- if (!PyArg_ParseTupleAndKeywords(args, kwds, "|Oi:fiFromHeader", kwlist,
- &to, &flags))
- return NULL;
-
- if (to != NULL) {
- tagN = tagNumFromPyObject(to);
- if (tagN == -1) {
- PyErr_SetString(PyExc_KeyError, "unknown header tag");
- return NULL;
- }
- }
- return rpmfi_Wrap( rpmfiNew(ts, hdrGetHeader(ho), tagN, flags) );
-}
projects / platform / upstream / rpm.git / blobdiff