if (PyObject_SetAttrString(me, "err", x)) goto end;
Py_DECREF(x); x = 0;
- x = PyString_FromString(key_strerror(err)); if (!x) goto end;
+ x = TEXT_FROMSTR(key_strerror(err)); if (!x) goto end;
if (PyObject_SetAttrString(me, "errstring", x)) goto end;
Py_DECREF(x); x = 0;
if (err >= 0 && err < N(tab)) errtag = tab[err];
else errtag = "<unknown>";
if ((x = PyObject_GetAttrString(me, "errstring")) == 0 ||
- (errstr = PyString_AsString(x)) == 0)
+ (errstr = TEXT_STR(x)) == 0)
goto done;
- rc = PyString_FromFormat("%s (%ld): %s", errtag, -err, errstr);
+ rc = TEXT_FORMAT("%s (%ld): %s", errtag, -err, errstr);
done:
Py_XDECREF(x);
/*----- Data structures ---------------------------------------------------*/
typedef struct keydata_pyobj {
- PyObject_HEAD
+ GMAP_PYOBJ_HEAD
key_data *kd;
} keydata_pyobj;
#define KEYDATA_PYCHECK(o) PyObject_TypeCheck(o, keydata_pytype)
#define KEYDATA_KD(o) (((keydata_pyobj *)(o))->kd)
-typedef struct subkeyiter_pyobj {
- PyObject_HEAD
- key_subkeyiter i;
- PyObject *kdobj;
-} subkeyiter_pyobj;
-
-static PyTypeObject *subkeyiter_pytype;
-#define SUBKEYITER_PYCHECK(o) PyObject_TypeCheck(o, subkeyiter_pytype);
-#define SUBKEYITER_I(o) (&((subkeyiter_pyobj *)(o))->i)
-#define SUBKEYITER_KDOBJ(o) (((subkeyiter_pyobj *)(o))->kdobj)
-
typedef struct keyfile_pyobj {
- PyObject_HEAD
+ GMAP_PYOBJ_HEAD
key_file kf;
} keyfile_pyobj;
#define KEY_KFOBJ(o) (((key_pyobj *)(o))->kfobj)
#define KEY_KF(o) KEYFILE_KF(KEY_KFOBJ(o))
-typedef struct keyiter_pyobj {
- PyObject_HEAD
- key_iter i;
- PyObject *kfobj;
-} keyiter_pyobj;
-
-static PyTypeObject *keyiter_pytype;
-#define KEYITER_PYCHECK(o) PyObject_TypeCheck(o, keyiter_pytype)
-#define KEYITER_I(o) (&((keyiter_pyobj *)(o))->i)
-#define KEYITER_KFOBJ(o) (((keyiter_pyobj *)(o))->kfobj)
-#define KEYITER_KF(o) KEYFILE_KF(KEYITER_KFOBJ(o))
-
typedef struct keyattrs_pyobj {
- PyObject_HEAD
+ GMAP_PYOBJ_HEAD
PyObject *kobj;
} keyattrs_pyobj;
#define KEYATTRS_KF(o) KEY_KF(KEYATTRS_KOBJ(o))
#define KEYATTRS_K(o) KEY_K(KEYATTRS_KOBJ(o))
-typedef struct keyattriter_pyobj {
- PyObject_HEAD
- key_attriter i;
- PyObject *kobj;
-} keyattriter_pyobj;
-
-static PyTypeObject *keyattriter_pytype;
-#define KEYATTRITER_PYCHECK(o) PyObject_TypeCheck(o, keyattriter_pytype)
-#define KEYATTRITER_I(o) (&((keyattriter_pyobj *)(o))->i)
-#define KEYATTRITER_KOBJ(o) (((keyattriter_pyobj *)(o))->kobj)
-#define KEYATTRITER_K(o) KEY_K(KEYATTRITER_KOBJ(o))
-#define KEYATTRITER_KFOBJ(o) KEY_KFOBJ(KEYATTRITER_KOBJ(o))
-#define KEYATTRITER_KF(o) KEY_KF(KEYATTRITER_KOBJ(o))
-
/*----- Filters -----------------------------------------------------------*/
static int convfilter(PyObject *x, void *p)
int err;
int rc = 0;
- if ((fs = PyString_AsString(x)) != 0) {
+ if ((fs = TEXT_STR(x)) != 0) {
if ((err = key_readflags(fs, &end, &f->f, &f->m)) != 0)
KEYERR(err);
if (*end)
return (1);
else {
PyErr_Clear();
- if ((fs = PyString_AsString(x)) != 0) {
+ if ((fs = TEXT_STR(x)) != 0) {
if ((err = key_readflags(fs, &end, f, 0)) != 0)
KEYERR(err);
if (*end)
if (!PyArg_ParseTuple(arg, "O&:key_writeflags", convuint, &f)) return (0);
key_writeflags(f, &d);
- rc = PyString_FromStringAndSize(d.buf, d.len);
+ rc = TEXT_FROMSTRLEN(d.buf, d.len);
dstr_destroy(&d);
return (rc);
}
/*----- Key data ----------------------------------------------------------*/
+static const gmap_ops keydatastruct_gmops;
+
static PyObject *keydata_pywrap(key_data *kd)
{
PyTypeObject *ty;
keydata_pyobj *kdobj;
+ const gmap_ops *gmops = 0;
switch (kd->e & KF_ENCMASK) {
case KENC_BINARY: ty = keydatabin_pytype; break;
case KENC_ENCRYPT: ty = keydataenc_pytype; break;
case KENC_MP: ty = keydatamp_pytype; break;
- case KENC_STRUCT: ty = keydatastruct_pytype; break;
+ case KENC_STRUCT:
+ ty = keydatastruct_pytype;
+ gmops = &keydatastruct_gmops;
+ break;
case KENC_STRING: ty = keydatastr_pytype; break;
case KENC_EC: ty = keydataec_pytype; break;
default: abort();
}
kdobj = PyObject_NEW(keydata_pyobj, ty);
+ kdobj->gmops = gmops;
kdobj->kd = kd;
return ((PyObject *)kdobj);
}
convfilter, &f))
return (0);
key_write(KEYDATA_KD(me), &d, &f);
- rc = PyString_FromStringAndSize(d.buf, d.len);
+ rc = TEXT_FROMSTRLEN(d.buf, d.len);
dstr_destroy(&d);
return (rc);
}
static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t n;
+ struct bin pp;
PyObject *rc = 0;
key_data *kd;
- if (!PyArg_ParseTuple(arg, "s#:lock", &p, &n))
+ if (!PyArg_ParseTuple(arg, "O&:lock", convbin, &pp))
goto end;
- key_lock(&kd, KEYDATA_KD(me), p, n);
+ key_lock(&kd, KEYDATA_KD(me), pp.p, pp.sz);
rc = keydata_pywrap(kd);
end:
return (rc);
static PyObject *kdmeth_decode(PyObject *me, PyObject *arg)
{
- const char *p;
- Py_ssize_t n;
+ struct bin in;
key_data *kd;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:decode", &p, &n)) goto end;
- if ((kd = key_decode(p, n)) == 0) KEYERR(KERR_MALFORMED);
- rc = keydata_pywrap(kd);
+ if (!PyArg_ParseTuple(arg, "O&:decode", convbin, &in)) goto end;
+ if ((kd = key_decode(in.p, in.sz)) == 0) KEYERR(KERR_MALFORMED);
+ rc = keydata_pywrap(kd);
end:
return (rc);
}
};
static const PyTypeObject keydata_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyData", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *keydatabin_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- char *p;
- Py_ssize_t n;
+ struct bin in;
unsigned f = 0;
keydata_pyobj *me = 0;
static const char *const kwlist[] = { "key", "flags", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", KWLIST,
- &p, &n, convflags, &f))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
+ convbin, &in, convflags, &f))
goto end;
me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
- me->kd = key_newbinary(f & ~KF_ENCMASK, p, n);
+ me->kd = key_newbinary(f & ~KF_ENCMASK, in.p, in.sz);
end:
return ((PyObject *)me);
}
};
static const PyTypeObject keydatabin_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataBinary", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *keydataenc_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- char *p;
- Py_ssize_t n;
+ struct bin in;
unsigned f = 0;
keydata_pyobj *me = 0;
static const char *const kwlist[] = { "key", "flags", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O&:new", KWLIST,
- &p, &n, convflags, &f))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
+ convbin, &in, convflags, &f))
goto end;
me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
- me->kd = key_newencrypted(f & ~KF_ENCMASK, p, n);
+ me->kd = key_newencrypted(f & ~KF_ENCMASK, in.p, in.sz);
end:
return ((PyObject *)me);
}
static PyObject *kdemeth_lock(PyObject *me, PyObject *arg)
{
- char *hunoz;
- Py_ssize_t hukairz;
- if (!PyArg_ParseTuple(arg, "s#:lock", &hunoz, &hukairz)) goto end;
+ struct bin hunoz;
+ if (!PyArg_ParseTuple(arg, "O&:lock", convbin, &hunoz)) goto end;
KEYERR(KERR_WRONGTYPE);
end:
return (0);
static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t n;
+ struct bin pp;
int err;
PyObject *rc = 0;
key_data *kd;
- if (!PyArg_ParseTuple(arg, "s#:unlock", &p, &n))
+ if (!PyArg_ParseTuple(arg, "O&:unlock", convbin, &pp))
goto end;
- if ((err = key_unlock(&kd, KEYDATA_KD(me), p, n)) != 0)
+ if ((err = key_unlock(&kd, KEYDATA_KD(me), pp.p, pp.sz)) != 0)
KEYERR(err);
rc = keydata_pywrap(kd);
end:
};
static const PyTypeObject keydataenc_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataEncrypted", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject keydatamp_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataMP", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
}
static PyObject *kdsget_str(PyObject *me, void *hunoz)
- { return (PyString_FromString(KEYDATA_KD(me)->u.p)); }
+ { return (TEXT_FROMSTR(KEYDATA_KD(me)->u.p)); }
static const PyGetSetDef keydatastr_pygetset[] = {
#define GETSETNAME(op, name) kds##op##_##name
};
static const PyTypeObject keydatastr_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataString", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject keydataec_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataECPt", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0 /* @tp_is_gc@ */
};
-static PyObject *subkeyiter_make(PyObject *kdobj)
+static void *keydatastruct_gmlookup(PyObject *me, PyObject *k, unsigned *f)
{
- subkeyiter_pyobj *me = PyObject_NEW(subkeyiter_pyobj, subkeyiter_pytype);
- me->kdobj = kdobj;
- Py_INCREF(kdobj);
- key_mksubkeyiter(&me->i, KEYDATA_KD(kdobj));
- return ((PyObject *)me);
+ key_data *kd = KEYDATA_KD(me);
+ const char *tag;
+ key_struct *ks;
+
+ assert((kd->e&KF_ENCMASK) == KENC_STRUCT);
+ if ((tag = TEXT_STR(k)) == 0) return (0);
+ if (f) { key_split(&kd); KEYDATA_KD(me) = kd; }
+ ks = sym_find(&kd->u.s, tag, -1, f ? sizeof(key_struct) : 0, f);
+ if (ks && f && !*f) ks->k = 0;
+ return (ks);
}
-static PyObject *subkeyiter_pynext(PyObject *me)
+static void keydatastruct_gmiterinit(PyObject *me, void *i)
{
- const char *tag;
- if (!key_nextsubkey(SUBKEYITER_I(me), &tag, 0))
- return (0);
- return (PyString_FromString(tag));
+ key_data *kd = KEYDATA_KD(me);
+
+ assert((kd->e&KF_ENCMASK) == KENC_STRUCT);
+ sym_mkiter(i, &kd->u.s);
}
-static void subkeyiter_pydealloc(PyObject *me)
+static void *keydatastruct_gmiternext(PyObject *me, void *i)
+ { return (sym_next(i)); }
+
+static PyObject *keydatastruct_gmentrykey(PyObject *me, void *e)
+ { key_struct *ks = e; return (TEXT_FROMSTR(SYM_NAME(ks))); }
+
+static PyObject *keydatastruct_gmentryvalue(PyObject *me, void *e)
{
- Py_DECREF(SUBKEYITER_KDOBJ(me));
- FREEOBJ(me);
+ key_struct *ks = e;
+ key_data *kd = ks->k;
+
+ key_incref(kd);
+ return (keydata_pywrap(kd));
}
-static const PyTypeObject subkeyiter_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
- "SubKeyIter", /* @tp_name@ */
- sizeof(subkeyiter_pyobj), /* @tp_basicsize@ */
- 0, /* @tp_itemsize@ */
+static key_struct *maybe_split_and_reprobe(PyObject *me, key_struct *ks)
+{
+ key_data *kd = KEYDATA_KD(me);
- subkeyiter_pydealloc, /* @tp_dealloc@ */
- 0, /* @tp_print@ */
- 0, /* @tp_getattr@ */
- 0, /* @tp_setattr@ */
- 0, /* @tp_compare@ */
- 0, /* @tp_repr@ */
- 0, /* @tp_as_number@ */
- 0, /* @tp_as_sequence@ */
- 0, /* @tp_as_mapping@ */
- 0, /* @tp_hash@ */
- 0, /* @tp_call@ */
- 0, /* @tp_str@ */
- 0, /* @tp_getattro@ */
- 0, /* @tp_setattro@ */
- 0, /* @tp_as_buffer@ */
- Py_TPFLAGS_DEFAULT | /* @tp_flags@ */
- Py_TPFLAGS_BASETYPE,
+ if (kd->ref == 1) return (ks);
+ key_split(&kd); KEYDATA_KD(me) = kd;
+ ks = sym_find(&kd->u.s, SYM_NAME(ks), SYM_LEN(ks), 0, 0); assert(ks);
+ return (ks);
+}
- /* @tp_doc@ */
- "Iterator for structured keys.",
+static int keydatastruct_gmsetentry(PyObject *me, void *e, PyObject *val)
+{
+ key_struct *ks;
+ key_data *kd;
+ int rc = -1;
- 0, /* @tp_traverse@ */
- 0, /* @tp_clear@ */
- 0, /* @tp_richcompare@ */
- 0, /* @tp_weaklistoffset@ */
- PyObject_SelfIter, /* @tp_iter@ */
- subkeyiter_pynext, /* @tp_iternext@ */
- 0, /* @tp_methods@ */
- 0, /* @tp_members@ */
- 0, /* @tp_getset@ */
- 0, /* @tp_base@ */
- 0, /* @tp_dict@ */
- 0, /* @tp_descr_get@ */
- 0, /* @tp_descr_set@ */
- 0, /* @tp_dictoffset@ */
- 0, /* @tp_init@ */
- PyType_GenericAlloc, /* @tp_alloc@ */
- abstract_pynew, /* @tp_new@ */
- 0, /* @tp_free@ */
- 0 /* @tp_is_gc@ */
+ if (!KEYDATA_PYCHECK(val)) TYERR("expected KeyData value");
+ ks = maybe_split_and_reprobe(me, e);
+ if (ks->k) key_drop(ks->k);
+ ks->k = kd = KEYDATA_KD(val); key_incref(kd);
+ rc = 0;
+end:
+ return (rc);
+}
+
+static int keydatastruct_gmdelentry(PyObject *me, void *e)
+{
+ key_struct *ks;
+
+ ks = maybe_split_and_reprobe(me, e);
+ if (ks->k) key_drop(ks->k);
+ sym_remove(&KEYDATA_KD(me)->u.s, ks);
+ return (0);
+}
+
+static const gmap_ops keydatastruct_gmops = {
+ sizeof(sym_iter),
+ keydatastruct_gmlookup,
+ keydatastruct_gmiterinit,
+ keydatastruct_gmiternext,
+ keydatastruct_gmentrykey,
+ keydatastruct_gmentryvalue,
+ keydatastruct_gmsetentry,
+ keydatastruct_gmdelentry
};
static PyObject *keydatastruct_pynew(PyTypeObject *ty,
if ((it = PyObject_GetIter(sub)) == 0)
goto end;
while ((name = PyIter_Next(it)) != 0) {
- if ((p = PyString_AsString(name)) == 0 ||
+ if ((p = TEXT_STR(name)) == 0 ||
(val = PyObject_GetItem(sub, name)) == 0)
goto end;
if (!KEYDATA_PYCHECK(val))
Py_DECREF(it); it = 0;
}
me = (keydata_pyobj *)ty->tp_alloc(ty, 0);
+ me->gmops = &keydatastruct_gmops;
me->kd = kd;
end:
if (kd && !me) key_drop(kd);
return ((PyObject *)me);
}
-static PyObject *keydatastruct_pylookup(PyObject *me, PyObject *key)
-{
- const char *tag;
- key_data *kd;
- PyObject *rc = 0;
-
- if ((tag = PyString_AsString(key)) == 0)
- goto end;
- if ((kd = key_structfind(KEYDATA_KD(me), tag)) == 0)
- MAPERR(key);
- key_incref(kd);
- rc = keydata_pywrap(kd);
-end:
- return (rc);
-}
-
-static int keydatastruct_pystore(PyObject *me,
- PyObject *key, PyObject *value)
-{
- const char *tag;
- int rc = -1;
-
- if ((tag = PyString_AsString(key)) == 0)
- goto end;
- key_split(&KEYDATA_KD(me));
- if (value) {
- if (!KEYDATA_PYCHECK(value))
- TYERR("expected KeyData value");
- key_structset(KEYDATA_KD(me), tag, KEYDATA_KD(value));
- } else {
- if (!key_structfind(KEYDATA_KD(me), tag))
- MAPERR(key);
- key_structset(KEYDATA_KD(me), tag, 0);
- }
- rc = 0;
-end:
- return (rc);
-}
+static Py_ssize_t keydatastruct_pysize(PyObject *me)
+ { return gmap_pysize_from_sym(&KEYDATA_KD(me)->u.s); }
static const PyMappingMethods keydatastruct_pymapping = {
- gmap_pysize, /* @mp_length@ */
- keydatastruct_pylookup, /* @mp_subscript@ */
- keydatastruct_pystore /* @mp_ass_subscript@ */
+ keydatastruct_pysize,
+ gmap_pylookup,
+ gmap_pystore
};
static const PyTypeObject keydatastruct_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyDataStructured", /* @tp_name@ */
sizeof(keydata_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_compare@ */
0, /* @tp_repr@ */
0, /* @tp_as_number@ */
- 0, /* @tp_as_sequence@ */
+ PYSEQUENCE(gmap), /* @tp_as_sequence@ */
PYMAPPING(keydatastruct), /* @tp_as_mapping@ */
0, /* @tp_hash@ */
0, /* @tp_call@ */
0, /* @tp_clear@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
- subkeyiter_make, /* @tp_iter@ */
+ gmap_pyiter, /* @tp_iter@ */
0, /* @tp_iternext@ */
PYMETHODS(gmap), /* @tp_methods@ */
0, /* @tp_members@ */
/*----- Key attributes ----------------------------------------------------*/
-static PyObject *keyattriter_make(PyObject *kaobj)
+static void *keyattrs_gmlookup(PyObject *me, PyObject *k, unsigned *f)
{
- PyObject *kobj = KEYATTRS_KOBJ(kaobj);
- keyattriter_pyobj *me = PyObject_NEW(keyattriter_pyobj,
- keyattriter_pytype);
- me->kobj = kobj;
- Py_INCREF(kobj);
- key_mkattriter(&me->i, KEY_K(kobj));
- return ((PyObject *)me);
-}
-
-static PyObject *keyattriter_pynext(PyObject *me)
-{
- const char *name;
-
- if (!key_nextattr(KEYATTRITER_I(me), &name, 0))
- return (0);
- return (PyString_FromString(name));
-}
+ char *name = TEXT_STR(k);
+ key_attr *a = 0;
-static void keyattriter_pydealloc(PyObject *me)
-{
- Py_DECREF(KEYATTRITER_KOBJ(me));
- FREEOBJ(me);
+ if (!name) goto end;
+ if (f && !(KEYATTRS_KF(me)->f&KF_WRITE)) KEYERR(KERR_READONLY);
+ a = sym_find(&KEYATTRS_K(me)->a, name, -1, f ? sizeof(key_attr) : 0, f);
+ if (f && !*f) a->p = 0;
+end:
+ return (a);
}
-static const PyTypeObject keyattriter_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
- "KeyAttributeIter", /* @tp_name@ */
- sizeof(keyattriter_pyobj), /* @tp_basicsize@ */
- 0, /* @tp_itemsize@ */
+static void keyattrs_gmiterinit(PyObject *me, void *i)
+ { sym_mkiter(i, &KEYATTRS_K(me)->a); }
- keyattriter_pydealloc, /* @tp_dealloc@ */
- 0, /* @tp_print@ */
- 0, /* @tp_getattr@ */
- 0, /* @tp_setattr@ */
- 0, /* @tp_compare@ */
- 0, /* @tp_repr@ */
- 0, /* @tp_as_number@ */
- 0, /* @tp_as_sequence@ */
- 0, /* @tp_as_mapping@ */
- 0, /* @tp_hash@ */
- 0, /* @tp_call@ */
- 0, /* @tp_str@ */
- 0, /* @tp_getattro@ */
- 0, /* @tp_setattro@ */
- 0, /* @tp_as_buffer@ */
- Py_TPFLAGS_DEFAULT | /* @tp_flags@ */
- Py_TPFLAGS_BASETYPE,
+static void *keyattrs_gmiternext(PyObject *me, void *i)
+ { return (sym_next(i)); }
- /* @tp_doc@ */
- "Iterator for key attributes.",
+static PyObject *keyattrs_gmentrykey(PyObject *me, void *e)
+ { return (TEXT_FROMSTR(SYM_NAME(e))); }
- 0, /* @tp_traverse@ */
- 0, /* @tp_clear@ */
- 0, /* @tp_richcompare@ */
- 0, /* @tp_weaklistoffset@ */
- PyObject_SelfIter, /* @tp_iter@ */
- keyattriter_pynext, /* @tp_iternext@ */
- 0, /* @tp_methods@ */
- 0, /* @tp_members@ */
- 0, /* @tp_getset@ */
- 0, /* @tp_base@ */
- 0, /* @tp_dict@ */
- 0, /* @tp_descr_get@ */
- 0, /* @tp_descr_set@ */
- 0, /* @tp_dictoffset@ */
- 0, /* @tp_init@ */
- PyType_GenericAlloc, /* @tp_alloc@ */
- abstract_pynew, /* @tp_new@ */
- 0, /* @tp_free@ */
- 0 /* @tp_is_gc@ */
-};
+static PyObject *keyattrs_gmentryvalue(PyObject *me, void *e)
+ { return (TEXT_FROMSTR(((key_attr *)e)->p)); }
-static PyObject *keyattrs_pylookup(PyObject *me, PyObject *key)
+static int keyattrs_gmsetentry(PyObject *me, void *e, PyObject *val)
{
- const char *attr;
- const char *value;
- PyObject *rc = 0;
+ key_attr *a = e;
+ const char *p;
+ Py_ssize_t n;
+ int rc = -1;
- if ((attr = PyString_AsString(key)) == 0)
- goto end;
- if ((value = key_getattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr)) == 0)
- MAPERR(key);
- rc = PyString_FromString(value);
+ if (!TEXT_CHECK(val)) TYERR("expected string");
+ TEXT_PTRLEN(val, p, n);
+ if (n > 255) VALERR("attribute too long");
+ if (memchr(p, 0, n)) VALERR("attribute must not contain nul");
+ if (a->p) xfree(a->p);
+ a->p = xmalloc(n + 1); memcpy(a->p, p, n + 1);
+ KEYATTRS_KF(me)->f |= KF_MODIFIED;
+ rc = 0;
end:
return (rc);
}
-static int keyattrs_pystore(PyObject *me,
- PyObject *key, PyObject *value)
+static int keyattrs_gmdelentry(PyObject *me, void *e)
{
- const char *attr;
- const char *val;
- int err;
+ key_attr *a = e;
int rc = -1;
- if ((attr = PyString_AsString(key)) == 0)
- goto end;
- if (value) {
- if ((val = PyString_AsString(value)) == 0)
- goto end;
- if ((err = key_putattr(KEYATTRS_KF(me), KEYATTRS_K(me),
- attr, val)) != 0)
- KEYERR(err);
- } else {
- if (!key_getattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr))
- MAPERR(key);
- if ((err = key_putattr(KEYATTRS_KF(me), KEYATTRS_K(me), attr, 0)) != 0)
- KEYERR(err);
- }
+ if (!(KEYATTRS_KF(me)->f&KF_WRITE)) KEYERR(KERR_READONLY);
+ if (a->p) { KEYATTRS_KF(me)->f |= KF_MODIFIED; xfree(a->p); }
+ sym_remove(&KEYATTRS_K(me)->a, a);
rc = 0;
end:
return (rc);
}
+static const gmap_ops keyattrs_gmops = {
+ sizeof(sym_iter),
+ keyattrs_gmlookup,
+ keyattrs_gmiterinit,
+ keyattrs_gmiternext,
+ keyattrs_gmentrykey,
+ keyattrs_gmentryvalue,
+ keyattrs_gmsetentry,
+ keyattrs_gmdelentry
+};
+
static PyObject *keyattrs_make(PyObject *kobj)
{
keyattrs_pyobj *me = PyObject_NEW(keyattrs_pyobj, keyattrs_pytype);
+ me->gmops = &keyattrs_gmops;
me->kobj = kobj;
Py_INCREF(kobj);
return ((PyObject *)me);
FREEOBJ(me);
}
+static Py_ssize_t keyattrs_pysize(PyObject *me)
+ { return gmap_pysize_from_sym(&KEYATTRS_K(me)->a); }
+
static const PyMappingMethods keyattrs_pymapping = {
- gmap_pysize, /* @mp_length@ */
- keyattrs_pylookup, /* @mp_subscript@ */
- keyattrs_pystore /* @mp_ass_subscript@ */
+ keyattrs_pysize,
+ gmap_pylookup,
+ gmap_pystore
};
static const PyTypeObject keyattrs_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyAttributes", /* @tp_name@ */
sizeof(keyattrs_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_clear@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
- keyattriter_make, /* @tp_iter@ */
+ gmap_pyiter, /* @tp_iter@ */
0, /* @tp_iternext@ */
PYMETHODS(gmap), /* @tp_methods@ */
0, /* @tp_members@ */
convfilter, &f) ||
(fp = PyFile_AsFile(file)) == 0 ||
(nameobj = PyFile_Name(file)) == 0 ||
- (name = PyString_AsString(nameobj)) == 0)
+ (name = TEXT_STR(nameobj)) == 0)
goto end;
if (key_extract(KEY_KF(me), KEY_K(me), fp, &f))
OSERR(name);
static PyObject *kget_file(PyObject *me, void *hunoz)
{ RETURN_OBJ(KEY_KFOBJ(me)); }
static PyObject *kget_type(PyObject *me, void *hunoz)
- { return (PyString_FromString(KEY_K(me)->type)); }
+ { return (TEXT_FROMSTR(KEY_K(me)->type)); }
static PyObject *kget_exptime(PyObject *me, void *hunoz)
{ return (getulong(KEY_K(me)->exp)); }
static PyObject *kget_deltime(PyObject *me, void *hunoz)
PyObject *rc;
key_fulltag(KEY_K(me), &d);
- rc = PyString_FromStringAndSize(d.buf, d.len);
+ rc = TEXT_FROMSTRLEN(d.buf, d.len);
dstr_destroy(&d);
return (rc);
}
static PyObject *kget_tag(PyObject *me, void *hunoz)
{
if (!KEY_K(me)->tag) RETURN_NONE;
- return (PyString_FromString(KEY_K(me)->tag));
+ return (TEXT_FROMSTR(KEY_K(me)->tag));
}
static int kset_tag(PyObject *me, PyObject *x, void *hunoz)
{
char *tag;
if (!x || x == Py_None) tag = 0;
- else if ((tag = PyString_AsString(x)) == 0) goto end;
+ else if ((tag = TEXT_STR(x)) == 0) goto end;
if ((err = key_settag(KEY_KF(me), KEY_K(me), tag)) != 0) KEYERR(err);
return (0);
end:
static PyObject *kget_comment(PyObject *me, void *hunoz)
{
if (!KEY_K(me)->c) RETURN_NONE;
- return (PyString_FromString(KEY_K(me)->c));
+ return (TEXT_FROMSTR(KEY_K(me)->c));
}
static int kset_comment(PyObject *me, PyObject *x, void *hunoz)
{
char *c;
if (!x || x == Py_None) c = 0;
- else if ((c = PyString_AsString(x)) == 0) goto end;
+ else if ((c = TEXT_STR(x)) == 0) goto end;
if ((err = key_setcomment(KEY_KF(me), KEY_K(me), c)) != 0) KEYERR(err);
return (0);
end:
};
static const PyTypeObject key_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Key", /* @tp_name@ */
sizeof(key_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0 /* @tp_is_gc@ */
};
-/*----- Key iteration -----------------------------------------------------*/
-
-static PyObject *keyiter_new(PyObject *kfobj)
-{
- keyiter_pyobj *me = PyObject_NEW(keyiter_pyobj, keyiter_pytype);
- key_mkiter(&me->i, KEYFILE_KF(kfobj));
- me->kfobj = kfobj;
- Py_INCREF(kfobj);
- return ((PyObject *)me);
-}
+/*----- Key files ---------------------------------------------------------*/
-static PyObject *keyiter_pynext(PyObject *me)
+static key *bytag(PyObject *me, PyObject *tagobj)
{
- key *k;
+ uint32 id;
+ char *tag;
+ key *k = 0;
- if ((k = key_next(KEYITER_I(me))) == 0)
- return (0);
- return (getulong(k->id));
+ if (convu32(tagobj, &id))
+ k = key_byid(KEYFILE_KF(me), id);
+ else {
+ PyErr_Clear();
+ if ((tag = TEXT_STR(tagobj)) == 0)
+ goto end;
+ k = key_bytag(KEYFILE_KF(me), tag);
+ }
+end:
+ return (k);
}
-static void keyiter_pydealloc(PyObject *me)
-{
- Py_DECREF(KEYITER_KFOBJ(me));
- FREEOBJ(me);
-}
+static void *keyfile_gmlookup(PyObject *me, PyObject *k, unsigned *f)
+ { key *kk = bytag(me, k); if (f) *f = !!kk; return (kk); }
-static const PyTypeObject keyiter_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
- "KeyFileIter", /* @tp_name@ */
- sizeof(keyiter_pyobj), /* @tp_basicsize@ */
- 0, /* @tp_itemsize@ */
+static void keyfile_gmiterinit(PyObject *me, void *i)
+ { key_mkiter(i, KEYFILE_KF(me)); }
- keyiter_pydealloc, /* @tp_dealloc@ */
- 0, /* @tp_print@ */
- 0, /* @tp_getattr@ */
- 0, /* @tp_setattr@ */
- 0, /* @tp_compare@ */
- 0, /* @tp_repr@ */
- 0, /* @tp_as_number@ */
- 0, /* @tp_as_sequence@ */
- 0, /* @tp_as_mapping@ */
- 0, /* @tp_hash@ */
- 0, /* @tp_call@ */
- 0, /* @tp_str@ */
- 0, /* @tp_getattro@ */
- 0, /* @tp_setattro@ */
- 0, /* @tp_as_buffer@ */
- Py_TPFLAGS_DEFAULT | /* @tp_flags@ */
- Py_TPFLAGS_BASETYPE,
+static void *keyfile_gmiternext(PyObject *me, void *i)
+ { return (key_next(i)); }
- /* @tp_doc@ */
- "Keyring iterator.",
+static PyObject *keyfile_gmentrykey(PyObject *me, void *e)
+ { key *k = e; return (getulong(k->id)); }
- 0, /* @tp_traverse@ */
- 0, /* @tp_clear@ */
- 0, /* @tp_richcompare@ */
- 0, /* @tp_weaklistoffset@ */
- PyObject_SelfIter, /* @tp_iter@ */
- keyiter_pynext, /* @tp_iternext@ */
- 0, /* @tp_methods@ */
- 0, /* @tp_members@ */
- 0, /* @tp_getset@ */
- 0, /* @tp_base@ */
- 0, /* @tp_dict@ */
- 0, /* @tp_descr_get@ */
- 0, /* @tp_descr_set@ */
- 0, /* @tp_dictoffset@ */
- 0, /* @tp_init@ */
- PyType_GenericAlloc, /* @tp_alloc@ */
- abstract_pynew, /* @tp_new@ */
- 0, /* @tp_free@ */
- 0 /* @tp_is_gc@ */
-};
+static PyObject *keyfile_gmentryvalue(PyObject *me, void *e)
+ { return (key_pywrap(me, e)); }
-/*----- Key files ---------------------------------------------------------*/
+static const gmap_ops keyfile_gmops = {
+ sizeof(key_iter),
+ keyfile_gmlookup,
+ keyfile_gmiterinit,
+ keyfile_gmiternext,
+ keyfile_gmentrykey,
+ keyfile_gmentryvalue,
+ 0,
+ 0
+};
struct reportinfo {
PyObject *func;
TYERR("reporter function not callable");
if ((rc = (keyfile_pyobj *)ty->tp_alloc(ty, 0)) == 0)
goto end;
+ rc->gmops = &keyfile_gmops;
if (key_open(&rc->kf, file, how, pythonreporter, &ri))
OSERR(file);
if (ri.stop) {
if ((fp = PyFile_AsFile(x)) == 0)
goto end;
x = PyFile_Name(x);
- if ((name = PyString_AsString(x)) == 0)
+ if ((name = TEXT_STR(x)) == 0)
goto end;
rc = key_merge(KEYFILE_KF(me), name, fp, pythonreporter, &ri);
if (ri.stop)
return (rc);
}
-static PyObject *bytag(PyObject *me, PyObject *tagobj)
-{
- uint32 id;
- char *tag;
- key *k;
- PyObject *rc = 0;
-
- if (convu32(tagobj, &id))
- k = key_byid(KEYFILE_KF(me), id);
- else {
- PyErr_Clear();
- if ((tag = PyString_AsString(tagobj)) == 0)
- goto end;
- k = key_bytag(KEYFILE_KF(me), tag);
- }
- if (!k) RETURN_NONE;
- rc = key_pywrap(me, k);
-end:
- return (rc);
-}
-
static PyObject *kfmeth_bytag(PyObject *me, PyObject *arg)
{
PyObject *tagobj;
+ key *k;
if (!PyArg_ParseTuple(arg, "O:bytag", &tagobj)) return (0);
- return (bytag(me, tagobj));
-}
-
-static PyObject *keyfile_pylookup(PyObject *me, PyObject *key)
-{
- PyObject *rc = bytag(me, key);
- if (!rc) goto end;
- if (rc == Py_None) {
- Py_DECREF(rc);
- rc = 0;
- MAPERR(key);
- }
-end:
- return (rc);
+ if ((k = bytag(me, tagobj)) == 0) RETURN_NONE;
+ else return (key_pywrap(me, k));
}
static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw)
}
static PyObject *kfget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString(KEYFILE_KF(me)->name)); }
+ { return (TEXT_FROMSTR(KEYFILE_KF(me)->name)); }
static PyObject *kfget_modifiedp(PyObject *me, void *hunoz)
{ return (getbool(KEYFILE_KF(me)->f & KF_MODIFIED)); }
static PyObject *kfget_writep(PyObject *me, void *hunoz)
static const PyMappingMethods keyfile_pymapping = {
gmap_pysize,
- keyfile_pylookup,
+ gmap_pylookup,
0
};
static const PyTypeObject keyfile_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeyFile", /* @tp_name@ */
sizeof(keyfile_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_clear@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
- keyiter_new, /* @tp_iter@ */
+ gmap_pyiter, /* @tp_iter@ */
0, /* @tp_iternext@ */
PYMETHODS(keyfile), /* @tp_methods@ */
0, /* @tp_members@ */
{
INITTYPE(keyfile, root);
INITTYPE(key, root);
- INITTYPE(keyiter, root);
INITTYPE(keydata, root);
INITTYPE(keydatabin, keydata);
INITTYPE(keydataenc, keydata);
INITTYPE(keydatamp, keydata);
INITTYPE(keydataec, keydata);
INITTYPE(keydatastruct, keydata);
- INITTYPE(subkeyiter, root);
INITTYPE(keyattrs, root);
- INITTYPE(keyattriter, root);
}
void key_pyinsert(PyObject *mod)
INSEXC("KeyFileIOError", keyioexc, PyExc_OSError, 0);
INSEXC("KeyFileBroken", keyfilebrokenexc, keyioexc, 0);
INSERT("KeyFile", keyfile_pytype);
- INSERT("KeyFileIter", keyiter_pytype);
INSERT("Key", key_pytype);
INSERT("KeyAttributes", keyattrs_pytype);
- INSERT("KeyAttributeIter", keyattriter_pytype);
INSERT("KeyData", keydata_pytype);
INSERT("KeyDataBinary", keydatabin_pytype);
INSERT("KeyDataEncrypted", keydataenc_pytype);
INSERT("KeyDataECPt", keydataec_pytype);
INSERT("KeyDataString", keydatastr_pytype);
INSERT("KeyDataStructured", keydatastruct_pytype);
- INSERT("SubKeyIter", subkeyiter_pytype);
setconstants(mod, consts);
}