X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/cfb291f03e0882cba9037be2a2756a6af41fb76a..a6bd51d5a77eac779f8c917bbba08fa841837bc7:/key.c diff --git a/key.c b/key.c index d820cfa..2ec8a61 100644 --- a/key.c +++ b/key.c @@ -1015,46 +1015,48 @@ static const gmap_ops keydatastruct_gmops = { keydatastruct_gmdelentry }; +static int populate_struct(key_data *kd, PyObject *map) +{ + PyObject *it = 0, *name = 0, *val = 0; + const char *p; + int rc = -1; + + if (!PyMapping_Check(map)) TYERR("subkeys must be an iterable mapping"); + if ((it = PyObject_GetIter(map)) == 0) goto end; + while ((name = PyIter_Next(it)) != 0) { + if ((p = TEXT_STR(name)) == 0 || + (val = PyObject_GetItem(map, name)) == 0) + goto end; + if (!KEYDATA_PYCHECK(val)) + TYERR("subkey objects must be instances of KeyData"); + if (key_structfind(kd, p)) VALERR("duplicate tag"); + key_structset(kd, p, KEYDATA_KD(val)); + Py_DECREF(name); name = 0; + Py_DECREF(val); val = 0; + } + if (PyErr_Occurred()) goto end; + rc = 0; +end: + Py_XDECREF(it); Py_XDECREF(name); Py_XDECREF(val); + return (rc); +} + static PyObject *keydatastruct_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { PyObject *sub = 0; - PyObject *it = 0, *name = 0, *val = 0; - char *p; keydata_pyobj *me = 0; key_data *kd = 0; - static const char *const kwlist[] = { "subkeys", 0 }; - Py_XINCREF(arg); Py_XINCREF(kw); - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:new", KWLIST, &sub)) - goto end; + if (!PyArg_ParseTuple(arg, "|O:new", &sub)) goto end; kd = key_newstruct(); - if (sub) { - if (!PyMapping_Check(sub)) - TYERR("subkeys must be an iterable mapping"); - if ((it = PyObject_GetIter(sub)) == 0) - goto end; - while ((name = PyIter_Next(it)) != 0) { - if ((p = TEXT_STR(name)) == 0 || - (val = PyObject_GetItem(sub, name)) == 0) - goto end; - if (!KEYDATA_PYCHECK(val)) - TYERR("subkey objects must be subclasses of KeyData"); - key_structset(kd, p, KEYDATA_KD(val)); - Py_DECREF(name); name = 0; - Py_DECREF(val); val = 0; - } - if (PyErr_Occurred()) - goto end; - Py_DECREF(it); it = 0; - } + if (sub && populate_struct(kd, sub)) goto end; + if (kw && populate_struct(kd, kw)) goto end; me = (keydata_pyobj *)ty->tp_alloc(ty, 0); me->gmops = &keydatastruct_gmops; - me->kd = kd; + me->kd = kd; kd = 0; end: - if (kd && !me) key_drop(kd); - Py_XDECREF(name); Py_XDECREF(val); Py_XDECREF(it); - Py_XDECREF(arg); Py_XDECREF(kw); + if (kd) key_drop(kd); return ((PyObject *)me); } @@ -1299,6 +1301,21 @@ static void key_pydealloc(PyObject *me) FREEOBJ(me); } +static Py_hash_t key_pyhash(PyObject *me) + { return ((Py_hash_t)KEY_K(me)); } + +static PyObject *key_pyrichcompare(PyObject *me, PyObject *you, int op) +{ + if (!KEY_PYCHECK(you)) RETURN_NOTIMPL; + switch (op) { + case Py_EQ: return (getbool(KEY_K(me) == KEY_K(you))); + case Py_NE: return (getbool(KEY_K(me) == KEY_K(you))); + default: TYERR("ordering makes no sense"); + } +end: + return (0); +} + static PyObject *kmeth_delete(PyObject *me) { int err; @@ -1331,27 +1348,21 @@ end: return (0); } -static PyObject *kmeth_extract(PyObject *me, PyObject *arg, PyObject *kw) +static PyObject *kmeth_extractline(PyObject *me, PyObject *arg, PyObject *kw) { key_filter f = { 0, 0 }; - PyObject *file; - PyObject *nameobj; - char *name; - FILE *fp; - static const char *const kwlist[] = { "file", "filter", 0 }; - - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:extract", KWLIST, - &PyFile_Type, &file, - convfilter, &f) || - (fp = PyFile_AsFile(file)) == 0 || - (nameobj = PyFile_Name(file)) == 0 || - (name = TEXT_STR(nameobj)) == 0) + dstr d = DSTR_INIT; + PyObject *rc = 0; + static const char *const kwlist[] = { "filter", 0 }; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:extract", KWLIST, + convfilter, &f)) goto end; - if (key_extract(KEY_KF(me), KEY_K(me), fp, &f)) - OSERR(name); - RETURN_ME; + key_extractline(KEY_KF(me), KEY_K(me), &d, &f); + rc = TEXT_FROMSTRLEN(d.buf, d.len); end: - return (0); + dstr_destroy(&d); + return (rc); } static PyObject *kmeth_fingerprint(PyObject *me, @@ -1489,7 +1500,7 @@ static const PyMethodDef key_pymethods[] = { NAMETH(delete, "KEY.delete()") NAMETH(expire, "KEY.expire()") METH (used, "KEY.used(TIME)") - KWMETH(extract, "KEY.extract(FILE, [filter = ])") + KWMETH(extractline, "KEY.extractline([filter = ])") KWMETH(fingerprint, "KEY.fingerprint(HASH, [filter = '-secret'])") #undef METHNAME { 0 } @@ -1527,7 +1538,7 @@ static const PyTypeObject key_pytype_skel = { 0, /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ 0, /* @tp_as_mapping@ */ - 0, /* @tp_hash@ */ + key_pyhash, /* @tp_hash@ */ 0, /* @tp_call@ */ 0, /* @tp_str@ */ 0, /* @tp_getattro@ */ @@ -1541,7 +1552,7 @@ static const PyTypeObject key_pytype_skel = { 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ - 0, /* @tp_richcompare@ */ + key_pyrichcompare, /* @tp_richcompare@ */ 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ @@ -1619,7 +1630,7 @@ static void pythonreporter(const char *file, int line, if (ri->stop) return; - if (!ri->func) + if (ri->func == Py_None) key_moan(file, line, msg, 0); else if ((res = PyObject_CallFunction(ri->func, "sis", file, line, msg)) == 0) @@ -1631,17 +1642,16 @@ static void pythonreporter(const char *file, int line, static PyObject *keyfile_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { - struct reportinfo ri = { 0, 0 }; + struct reportinfo ri = { Py_None, 0 }; char *file = 0; unsigned how = KOPEN_READ; keyfile_pyobj *rc = 0; static const char *const kwlist[] = { "file", "how", "report", 0 }; - Py_XINCREF(arg); Py_XINCREF(kw); if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|iO:new", KWLIST, &file, &how, &ri.func)) goto end; - if (ri.func && !PyCallable_Check(ri.func)) + if (ri.func != Py_None && !PyCallable_Check(ri.func)) TYERR("reporter function not callable"); if ((rc = (keyfile_pyobj *)ty->tp_alloc(ty, 0)) == 0) goto end; @@ -1660,7 +1670,6 @@ end: rc = 0; } done: - Py_XDECREF(arg); Py_XDECREF(kw); return ((PyObject *)rc); } @@ -1686,73 +1695,81 @@ end: return (0); } -static PyObject *kfmeth_merge(PyObject *me, PyObject *arg, PyObject *kw) +static PyObject *kfmeth_mergeline(PyObject *me, PyObject *arg, PyObject *kw) { - struct reportinfo ri = { 0, 0 }; - char *name; - PyObject *x = 0; - FILE *fp = 0; - int rc; - static const char *const kwlist[] = { "file", "report", 0 }; + struct reportinfo ri = { Py_None, 0 }; + const char *file, *line; + int lno, rc; + static const char *const kwlist[] = { "name", "lno", "line", "report", 0 }; - Py_XINCREF(arg); Py_XINCREF(kw); - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O:merge", KWLIST, - &PyFile_Type, &x, &ri.func)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "sis|O:merge", KWLIST, + &file, &lno, &line, &ri.func)) goto end; - if (ri.func && !PyCallable_Check(ri.func)) + if (ri.func != Py_None && !PyCallable_Check(ri.func)) TYERR("reporter function not callable"); - if ((fp = PyFile_AsFile(x)) == 0) - goto end; - x = PyFile_Name(x); - if ((name = TEXT_STR(x)) == 0) - goto end; - rc = key_merge(KEYFILE_KF(me), name, fp, pythonreporter, &ri); + rc = key_mergeline(KEYFILE_KF(me), file, lno, line, pythonreporter, &ri); if (ri.stop) goto end; if (rc != 0) KEYERR(rc); - Py_XDECREF(arg); Py_XDECREF(kw); RETURN_ME; end: - Py_XDECREF(arg); Py_XDECREF(kw); return (0); } -static PyObject *kfmeth_byid(PyObject *me, PyObject *arg) +static PyObject *kfmeth_byid(PyObject *me, PyObject *arg, PyObject *kw) { uint32 id; key *k; + PyObject *failp = Py_True; PyObject *rc = 0; + static const char *const kwlist[] = { "id", "fail", 0 }; - if (!PyArg_ParseTuple(arg, "O&:byid", convu32, &id)) goto end; - if ((k = key_byid(KEYFILE_KF(me), id)) == 0) KEYERR(KERR_NOTFOUND); - rc = key_pywrap(me, k); + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O:byid", KWLIST, + convu32, &id, &failp)) + goto end; + if ((k = key_byid(KEYFILE_KF(me), id)) != 0) rc = key_pywrap(me, k); + else if (PyObject_IsTrue(failp)) KEYERR(KERR_NOTFOUND); + else RETURN_NONE; end: return (rc); } -static PyObject *kfmeth_bytype(PyObject *me, PyObject *arg) +static PyObject *kfmeth_bytype(PyObject *me, PyObject *arg, PyObject *kw) { char *type; key *k; + PyObject *failp = Py_True; PyObject *rc = 0; + static const char *const kwlist[] = { "type", "fail", 0 }; - if (!PyArg_ParseTuple(arg, "s:bytype", &type)) goto end; - if ((k = key_bytype(KEYFILE_KF(me), type)) == 0) RETURN_NONE; - rc = key_pywrap(me, k); + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|O:bytype", KWLIST, + &type, &failp)) + goto end; + if ((k = key_bytype(KEYFILE_KF(me), type)) != 0) rc = key_pywrap(me, k); + else if (PyObject_IsTrue(failp)) KEYERR(KERR_NOTFOUND); + else RETURN_NONE; end: return (rc); } -static PyObject *kfmeth_bytag(PyObject *me, PyObject *arg) +static PyObject *kfmeth_bytag(PyObject *me, PyObject *arg, PyObject *kw) { PyObject *tagobj; key *k; + PyObject *failp = Py_True; + PyObject *rc = 0; + static const char *const kwlist[] = { "type", "fail", 0 }; - if (!PyArg_ParseTuple(arg, "O:bytag", &tagobj)) return (0); - if ((k = bytag(me, tagobj)) == 0) RETURN_NONE; - else return (key_pywrap(me, k)); + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O|O:bytag", KWLIST, + &tagobj, &failp)) + goto end; + if ((k = bytag(me, tagobj)) != 0) rc = key_pywrap(me, k); + else if (PyObject_IsTrue(failp)) KEYERR(KERR_NOTFOUND); + else RETURN_NONE; +end: + return (rc); } static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw) @@ -1817,12 +1834,13 @@ static PyObject *kfget_filep(PyObject *me, void *hunoz) static const PyMethodDef keyfile_pymethods[] = { #define METHNAME(func) kfmeth_##func NAMETH(save, "KF.save()") - KWMETH(merge, "KF.merge(FILE, [report = ])") + KWMETH(mergeline, "KF.mergeline(NAME, LNO, LINE, " + "[report = ])") KWMETH(newkey, "KF.newkey(ID, TYPE, [exptime = KEXP_FOREVER]) " "-> KEY") - METH (byid, "KF.byid(KEYID) -> KEY|None") - METH (bytype, "KF.bytype(TYPE) -> KEY|None") - METH (bytag, "KF.bytag(TAG) -> KEY|None") + KWMETH(byid, "KF.byid(KEYID, [fail = True]) -> KEY|None") + KWMETH(bytype, "KF.bytype(TYPE, [fail = True]) -> KEY|None") + KWMETH(bytag, "KF.bytag(TAG, [fail = True]) -> KEY|None") KWMETH(qtag, "KF.qtag(TAG, [new = KD]) -> FULLTAG, KEY, OLDKD") GMAP_ROMETHODS #undef METHNAME