X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/0463996f64aa7cde2c3d033f81d43963f54c2bba..d96c882ed6f1852a266fd1a2b61bbc906cc805bb:/buffer.c

diff --git a/buffer.c b/buffer.c
index ee0dd40..43ed43d 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1,13 +1,11 @@
 /* -*-c-*-
  *
- * $Id$
- *
  * Reading and writing buffers of stuff
  *
  * (c) 2005 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +13,12 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * Catacomb/Python is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with Catacomb/Python; if not, write to the Free Software Foundation,
  * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
@@ -48,18 +46,18 @@ static PyTypeObject *rbuf_pytype, *wbuf_pytype;
 
 static PyObject *buferr;
 
-#define BUFERR() do { PyErr_SetNone(buferr); goto end; } while (0)
+#define BUFERR(str) do { PyErr_SetString(buferr, str); goto end; } while (0)
 
 /*----- Read buffers ------------------------------------------------------*/
 
 static PyObject *rbuf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   char *p, *q;
-  int n;
+  Py_ssize_t n;
   buf_pyobj *me = 0;
-  static char *kwlist[] = { "data", 0 };
+  static const char *const kwlist[] = { "data", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &p, &n))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &p, &n))
     goto end;
   q = xmalloc(n);
   memcpy(q, p, n);
@@ -79,18 +77,18 @@ static void buf_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static int rbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
   { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
 
-static int rbuf_pyreadbuf(PyObject *me, int seg, void **q)
-  { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BSZ(BUF_B(me))); }
+static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
+  { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
 
 static PyObject *rbmeth_skip(PyObject *me, PyObject *arg)
 {
   size_t n;
 
   if (!PyArg_ParseTuple(arg, "O&:skip", convszt, &n)) goto end;
-  if (!buf_get(BUF_B(me), n)) BUFERR();
+  if (!buf_get(BUF_B(me), n)) BUFERR("buffer exhausted");
   RETURN_ME;
 end:
   return (0);
@@ -102,7 +100,7 @@ static PyObject *rbmeth_get(PyObject *me, PyObject *arg)
   size_t n;
 
   if (!PyArg_ParseTuple(arg, "O&:get", convszt, &n)) goto end;
-  if ((p = buf_get(BUF_B(me), n)) == 0) BUFERR();
+  if ((p = buf_get(BUF_B(me), n)) == 0) BUFERR("buffer exhausted");
   return (bytestring_pywrap(p, n));
 end:
   return (0);
@@ -113,8 +111,9 @@ end:
   {									\
     uint##n x;								\
     if (!PyArg_ParseTuple(arg, ":getu" #w)) goto end;			\
-    if (buf_getu##w(BUF_B(me), &x)) BUFERR();				\
-    return (getu32(x));							\
+    if (buf_getu##w(BUF_B(me), &x)) BUFERR("buffer exhausted");		\
+    if (MASK##W <= ULONG_MAX) return (getulong(x));			\
+    else { kludge64 y; ASSIGN64(y, x); return (getk64(y)); }		\
   end:									\
     return (0);								\
   }
@@ -126,7 +125,8 @@ DOUINTCONV(RBMETH_GETU_)
     size_t sz;								\
     char *q;								\
     if (!PyArg_ParseTuple(arg, ":getblk" #w)) goto end;			\
-    if ((q = buf_getmem##w(BUF_B(me), &sz)) == 0) BUFERR();		\
+    if ((q = buf_getmem##w(BUF_B(me), &sz)) == 0)			\
+      BUFERR("buffer exhausted");					\
     return (bytestring_pywrap(q, sz));					\
   end:									\
     return (0);								\
@@ -139,7 +139,7 @@ BUF_DOSUFFIXES(RBMETH_GETBLK_)
     buf_pyobj *b;							\
     buf bb;								\
     if (!PyArg_ParseTuple(arg, ":getbuf" #w)) goto end;			\
-    if (buf_getbuf##w(BUF_B(me), &bb)) BUFERR();			\
+    if (buf_getbuf##w(BUF_B(me), &bb)) BUFERR("buffer exhausted");	\
     b = PyObject_NEW(buf_pyobj, rbuf_pytype);				\
     b->b = bb;								\
     b->sub = me;							\
@@ -154,7 +154,7 @@ static PyObject *rbmeth_getmp(PyObject *me, PyObject *arg)
 {
   mp *x;
   if (!PyArg_ParseTuple(arg, ":getmp")) goto end;
-  if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR();
+  if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
   return (mp_pywrap(x));
 end:
   return (0);
@@ -164,7 +164,7 @@ static PyObject *rbmeth_getgf(PyObject *me, PyObject *arg)
 {
   mp *x;
   if (!PyArg_ParseTuple(arg, ":getgf")) goto end;
-  if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR();
+  if ((x = buf_getmp(BUF_B(me))) == 0) BUFERR("buffer exhausted");
   return (gf_pywrap(x));
 end:
   return (0);
@@ -173,27 +173,27 @@ end:
 static PyObject *rbmeth_getecpt(PyObject *me, PyObject *arg, PyObject *kw)
 {
   PyObject *cobj = Py_None;
-  static char *kwlist[] = { "curve", 0 };
+  static const char *const kwlist[] = { "curve", 0 };
   ec pt = EC_INIT;
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:getecpt", kwlist, &cobj))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:getecpt", KWLIST, &cobj))
     goto end;
   if (cobj == Py_None) cobj = (PyObject *)ecpt_pytype;
   if (!PyType_Check(cobj) ||
       !PyType_IsSubtype((PyTypeObject *)cobj, ecpt_pytype))
     TYERR("expected elliptic curve type");
-  if (buf_getec(BUF_B(me), &pt)) BUFERR();
+  if (buf_getec(BUF_B(me), &pt)) BUFERR("buffer exhausted");
   return (ecpt_pywrapout(cobj, &pt));
 end:
   return (0);
 }
-    
+
 static PyObject *rbmeth_getecptraw(PyObject *me, PyObject *arg)
 {
   PyTypeObject *cobj = ecpt_pytype;
   ec pt = EC_INIT;
   if (!PyArg_ParseTuple(arg, "O!:getecptraw", eccurve_pytype, &cobj))
     goto end;
-  if (ec_getraw(ECCURVE_C(cobj), BUF_B(me), &pt)) BUFERR();
+  if (ec_getraw(ECCURVE_C(cobj), BUF_B(me), &pt)) BUFERR("buffer exhausted");
   return (ecpt_pywrapout(cobj, &pt));
 end:
   return (0);
@@ -205,7 +205,7 @@ static PyObject *rbmeth_getge(PyObject *me, PyObject *arg)
   ge *x = 0;
   if (!PyArg_ParseTuple(arg, "O!:getge", group_pytype, &gobj)) goto end;
   x = G_CREATE(GROUP_G(gobj));
-  if (G_FROMBUF(GROUP_G(gobj), BUF_B(me), x)) BUFERR();
+  if (G_FROMBUF(GROUP_G(gobj), BUF_B(me), x)) BUFERR("buffer exhausted");
   return (ge_pywrap(gobj, x));
 end:
   if (x) G_DESTROY(GROUP_G(gobj), x);
@@ -218,7 +218,7 @@ static PyObject *rbmeth_getgeraw(PyObject *me, PyObject *arg)
   ge *x = 0;
   if (!PyArg_ParseTuple(arg, "O!:getgeraw", group_pytype, &gobj)) goto end;
   x = G_CREATE(GROUP_G(gobj));
-  if (G_FROMRAW(GROUP_G(gobj), BUF_B(me), x)) BUFERR();
+  if (G_FROMRAW(GROUP_G(gobj), BUF_B(me), x)) BUFERR("buffer exhausted");
   return (ge_pywrap(gobj, x));
 end:
   if (x) G_DESTROY(GROUP_G(gobj), x);
@@ -236,6 +236,7 @@ static PyObject *rbget_offset(PyObject *me, void *hunoz)
 static int rbset_offset(PyObject *me, PyObject *x, void *hunoz)
 {
   size_t n;
+  if (!x) NIERR("__del__");
   if (!convszt(x, &n)) goto end;
   if (n > BSZ(BUF_B(me))) VALERR("out of range");
   BCUR(BUF_B(me)) = BBASE(BUF_B(me)) + n;
@@ -246,33 +247,33 @@ end:
 
 static PyGetSetDef rbuf_pygetset[] = {
 #define GETSETNAME(op, name) rb##op##_##name
-  GET	(size,			"RBUF.size -> SIZE")
-  GET	(left,			"RBUF.left -> REMAINDER")
-  GET	(endp,			"RBUF.endp -> BOOL")
-  GETSET(offset,		"RBUF.offset -> OFFSET")
+  GET	(size,		"RBUF.size -> SIZE")
+  GET	(left,		"RBUF.left -> REMAINDER")
+  GET	(endp,		"RBUF.endp -> BOOL")
+  GETSET(offset,	"RBUF.offset -> OFFSET")
 #undef GETSETNAME
   { 0 }
 };
 
 static PyMethodDef rbuf_pymethods[] = {
 #define METHNAME(func) rbmeth_##func
-  METH	(skip,			"RBUF.skip(N)")
-  METH	(get,			"RBUF.get(N) -> BYTES")
+  METH	(skip,		"RBUF.skip(N)")
+  METH	(get,		"RBUF.get(N) -> BYTES")
 #define RBMETH_DECL_GETU_(n, W, w)					\
-    METH(getu##w, "RBUF.getu" #w "() -> INT")
+    METH(getu##w,	"RBUF.getu" #w "() -> INT")
   DOUINTCONV(RBMETH_DECL_GETU_)
 #define RBMETH_DECL_GETBLK_(n, W, w)					\
-    METH(getblk##w, "RBUF.getblk" #w "() -> INT")
+    METH(getblk##w,	"RBUF.getblk" #w "() -> BYTES")
   BUF_DOSUFFIXES(RBMETH_DECL_GETBLK_)
 #define RBMETH_DECL_GETBUF_(n, W, w)					\
-    METH(getbuf##w, "RBUF.getbuf" #w "() -> INT")
+    METH(getbuf##w,	"RBUF.getbuf" #w "() -> RBUF'")
   BUF_DOSUFFIXES(RBMETH_DECL_GETBUF_)
-  METH	(getmp,			"RBUF.getmp() -> X")
-  METH	(getgf,			"RBUF.getgf() -> X")
-  KWMETH(getecpt,		"RBUF.getecpt(curve = None) -> P")
-  METH	(getecptraw,		"RBUF.getecptraw(CURVE) -> P")
-  METH	(getge,			"RBUF.getge(GROUP) -> X")
-  METH	(getgeraw,		"RBUF.getgeraw(GROUP) -> X")
+  METH	(getmp,		"RBUF.getmp() -> X")
+  METH	(getgf,		"RBUF.getgf() -> X")
+  KWMETH(getecpt,	"RBUF.getecpt([curve = None]) -> P")
+  METH	(getecptraw,	"RBUF.getecptraw(CURVE) -> P")
+  METH	(getge,		"RBUF.getge(GROUP) -> X")
+  METH	(getgeraw,	"RBUF.getgeraw(GROUP) -> X")
 #undef METHNAME
   { 0 }
 };
@@ -286,7 +287,7 @@ static PyBufferProcs rbuf_pybuffer = {
 
 static PyTypeObject rbuf_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.ReadBuffer",		/* @tp_name@ */
+  "ReadBuffer",				/* @tp_name@ */
   sizeof(buf_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -309,14 +310,14 @@ static PyTypeObject rbuf_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "A read buffer.",
+  "ReadBuffer(STR): a read buffer.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
   0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
-  0,					/* @tp_iternexr@ */
+  0,					/* @tp_iternext@ */
   rbuf_pymethods,			/* @tp_methods@ */
   0,					/* @tp_members@ */
   rbuf_pygetset,			/* @tp_getset@ */
@@ -341,7 +342,7 @@ static void ensure(PyObject *me, size_t n)
   if (BLEFT(b) < n) {
     size_t nn = BSZ(b);
     octet *p;
-    size_t want = BLEFT(b) + n;
+    size_t want = BLEN(b) + n;
     while (nn < want) nn <<= 1;
     p = xrealloc(BBASE(b), nn, BSZ(b));
     BCUR(b) = p + BLEN(b);
@@ -355,9 +356,9 @@ static PyObject *wbuf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   char *p;
   size_t n = 64;
   buf_pyobj *me = 0;
-  static char *kwlist[] = { "size", 0 };
+  static const char *const kwlist[] = { "size", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new", KWLIST,
 				   convszt, &n))
     goto end;
   me = (buf_pyobj *)ty->tp_alloc(ty, 0);
@@ -368,10 +369,10 @@ end:
   return ((PyObject *)me);
 }
 
-static int wbuf_pysegcount(PyObject *me, int *nn)
+static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
   { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
 
-static int wbuf_pyreadbuf(PyObject *me, int seg, void **q)
+static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
   { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
 
 static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)
@@ -388,10 +389,10 @@ static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)
 static PyObject *wbmeth_put(PyObject *me, PyObject *arg)
 {
   void *p;
-  int n;
+  Py_ssize_t n;
   if (!PyArg_ParseTuple(arg, "s#:put", &p, &n)) return (0);
   ensure(me, n);
-  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(m)));
+  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(me)));
   RETURN_ME;
 }
 
@@ -406,16 +407,20 @@ static PyObject *wbmeth_put(PyObject *me, PyObject *arg)
   }
 DOUINTCONV(WBMETH_PUTU_)
 
+#define MASKz 0
 #define SZ_z 1
 #define WBMETH_PUTBLK_(n, W, w)						\
   static PyObject *wbmeth_putblk##w(PyObject *me, PyObject *arg)	\
   {									\
     char *p;								\
-    int sz;								\
-    if (!PyArg_ParseTuple(arg, "s#:putblk" #w, &p, &sz)) return (0);	\
+    Py_ssize_t sz;							\
+    if (!PyArg_ParseTuple(arg, "s#:putblk" #w, &p, &sz)) goto end;	\
+    if (MASK##W && sz > MASK##W) VALERR("too large");			\
     ensure(me, sz + SZ_##n);						\
     buf_putmem##w(BUF_B(me), p, sz); assert(BOK(BUF_B(me)));		\
     RETURN_ME;								\
+  end:									\
+    return (0);								\
   }
 BUF_DOSUFFIXES(WBMETH_PUTBLK_)
 
@@ -442,8 +447,7 @@ static PyObject *wbmeth_putecpt(PyObject *me, PyObject *arg)
 {
   ec pt = EC_INIT;
   if (!PyArg_ParseTuple(arg, "O&:putecpt", convecpt, &pt)) return (0);
-  if (EC_ATINF(&pt)) ensure(me, 2);
-  else ensure(me, 4 + mp_octets(pt.x) + mp_octets(pt.y));
+  ensure(me, EC_ATINF(&pt) ? 2 : 6 + mp_octets(pt.x) + mp_octets(pt.y));
   buf_putec(BUF_B(me), &pt); assert(BOK(BUF_B(me)));
   EC_DESTROY(&pt);
   RETURN_ME;
@@ -483,29 +487,33 @@ static PyObject *wbmeth_putgeraw(PyObject *me, PyObject *arg)
 static PyObject *wbget_size(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(BLEN(BUF_B(me)))); }
 
+static PyObject *wbget_contents(PyObject *me, void *hunoz)
+  { return (bytestring_pywrap(BBASE(BUF_B(me)), BLEN(BUF_B(me)))); }
+
 static PyGetSetDef wbuf_pygetset[] = {
 #define GETSETNAME(op, name) wb##op##_##name
-  GET	(size,			"WBUF.size -> SIZE")
+  GET	(size,		"WBUF.size -> SIZE")
+  GET	(contents,	"WBUF.contents -> STR")
 #undef GETSETNAME
   { 0 }
 };
 
 static PyMethodDef wbuf_pymethods[] = {
 #define METHNAME(func) wbmeth_##func
-  METH	(zero,			"WBUF.skip(N)")
-  METH	(put,			"WBUF.put(BYTES)")
+  METH	(zero,		"WBUF.zero(N)")
+  METH	(put,		"WBUF.put(BYTES)")
 #define WBMETH_DECL_PUTU_(n, W, w)					\
-    METH(putu##w, "WBUF.putu" #w "(INT)")
+    METH(putu##w,	"WBUF.putu" #w "(INT)")
   DOUINTCONV(WBMETH_DECL_PUTU_)
 #define WBMETH_DECL_PUTBLK_(n, W, w)					\
-    METH(putblk##w, "WBUF.putblk" #w "(BYTES)")
+    METH(putblk##w,	"WBUF.putblk" #w "(BYTES)")
   BUF_DOSUFFIXES(WBMETH_DECL_PUTBLK_)
-  METH	(putmp,			"WBUF.putmp(X)")
-  METH	(putgf,			"WBUF.putgf(X)")
-  KWMETH(putecpt,		"WBUF.putecpt(P)")
-  METH	(putecptraw,		"WBUF.putecptraw(P)")
-  METH	(putge,			"WBUF.putge(X)")
-  METH	(putgeraw,		"WBUF.putgeraw(X)")
+  METH	(putmp,		"WBUF.putmp(X)")
+  METH	(putgf,		"WBUF.putgf(X)")
+  METH	(putecpt,	"WBUF.putecpt(P)")
+  METH	(putecptraw,	"WBUF.putecptraw(P)")
+  METH	(putge,		"WBUF.putge(X)")
+  METH	(putgeraw,	"WBUF.putgeraw(X)")
 #undef METHNAME
   { 0 }
 };
@@ -519,7 +527,7 @@ static PyBufferProcs wbuf_pybuffer = {
 
 static PyTypeObject wbuf_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.WriteBuffer",		/* @tp_name@ */
+  "WriteBuffer",			/* @tp_name@ */
   sizeof(buf_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -542,14 +550,14 @@ static PyTypeObject wbuf_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-  "A write buffer.",
+  "WriteBuffer([size = ?]): a write buffer.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
   0,					/* @tp_richcompare@ */
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
-  0,					/* @tp_iternexr@ */
+  0,					/* @tp_iternext@ */
   wbuf_pymethods,			/* @tp_methods@ */
   0,					/* @tp_members@ */
   wbuf_pygetset,			/* @tp_getset@ */