Fix a large number of bugs.

[mLib] / pkbuf.c

diff --git a/pkbuf.c b/pkbuf.c
index 73e2ca520783e6b2818d6b6a547ad85d5c69148a..629f53140ace1cf59ee3d95f36c3df24965e2c1d 100644 (file)
--- a/pkbuf.c
+++ b/pkbuf.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: pkbuf.c,v 1.1 2000/06/17 10:39:19 mdw Exp $
+ * $Id: pkbuf.c,v 1.4 2001/02/03 16:23:33 mdw Exp $
  *
  * Simple packet buffering
  *
@@ -30,6 +30,16 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: pkbuf.c,v $
+ * Revision 1.4  2001/02/03 16:23:33  mdw
+ * Bug fix: handle a disable during a close-induced flush without dumping
+ * core.
+ *
+ * Revision 1.3  2000/07/16 18:55:45  mdw
+ * Remove some stray debugging code.
+ *
+ * Revision 1.2  2000/07/16 12:29:16  mdw
+ * Change to arena `realloc' interface, to fix a design bug.
+ *
  * Revision 1.1  2000/06/17 10:39:19  mdw
  * Experimental new support for packet buffering.
  *
@@ -75,6 +85,11 @@ void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
   size_t l;
   size_t keep;
 
+  if (pk->f & PKBUF_CLOSE) {
+    pk->func(0, 0, pk, 0, pk->p);
+    return;
+  }
+
   /* --- Initialize variables as necessary --- */
 
   if (!p) {
@@ -126,10 +141,10 @@ void pkbuf_flush(pkbuf *pk, octet *p, size_t len)
 void pkbuf_close(pkbuf *pk)
 {
   if (pk->buf) {
-    fprintf(stderr, "*** destroying buffer, closing down\n");
     x_free(pk->a, pk->buf);
     pk->buf = 0;
   }
+  pk->f |= PKBUF_CLOSE;
   if (pk->f & PKBUF_ENABLE)
     pk->func(0, 0, pk, 0, pk->p);
 }
@@ -206,7 +221,7 @@ void pkbuf_want(pkbuf *pk, size_t want)
     do pk->sz <<= 1; while (want < pk->sz);
     if (pk->buf) {
       if (pk->len)
-       pk->buf = x_realloc(pk->a, pk->buf, pk->sz);
+       pk->buf = x_realloc(pk->a, pk->buf, pk->sz, pk->len);
       else {
        x_free(pk->a, pk->buf);
        pk->buf = 0;