@@@ fltfmt wip

[mLib] / struct / buf.c

diff --git a/struct/buf.c b/struct/buf.c
index bd16ec71473787df0afd393d908ade00a3c00576..67cc30e93977e0ad2d1548cfc9227fbf304699e2 100644 (file)
--- a/struct/buf.c
+++ b/struct/buf.c
@@ -27,17 +27,17 @@
 
 /*----- Header files ------------------------------------------------------*/
 
 
 /*----- Header files ------------------------------------------------------*/
 

-#include <assert.h>

 #include <string.h>
 
 #include "buf.h"
 #include <string.h>
 
 #include "buf.h"

+#include "growbuf.h"

 #include "macros.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @buf_init@ --- *
  *
 #include "macros.h"
 
 /*----- Main code ---------------------------------------------------------*/
 
 /* --- @buf_init@ --- *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @void *p@ = pointer to a buffer
  *             @size_t sz@ = size of the buffer
  *
  *             @void *p@ = pointer to a buffer
  *             @size_t sz@ = size of the buffer
  *


@@ -53,20 +53,55 @@ void buf_init(buf *b, void *p, size_t sz)
   b->f = 0;
 }
 
   b->f = 0;
 }
 

-/* --- @buf_break@ --- *
+/* --- @dbuf_create@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @dbuf *db@ = pointer to a dynamic buffer block
+ *
+ * Returns:    ---
+ *
+ * Use:                Initializes a dynamic buffer.  The buffer is initially empty,
+ *             and ready for writing.
+ */
+
+void dbuf_create(dbuf *db) { DBCREATE(db); }
+
+/* --- @dbuf_reset@ --- *
+ *
+ * Arguments:  @dbuf *db@ = pointer to a buffer block
+ *
+ * Returns:    ---
+ *
+ * Use:                Resets a buffer so that it can be written again.
+ */
+
+void dbuf_reset(dbuf *db) { DBRESET(db); }
+
+/* --- @dbuf_destroy@ --- *
+ *
+ * Arguments:  @dbuf *db@ = pointer to a buffer block
+ *
+ * Returns:    ---
+ *
+ * Use:                Release all of the resources held by a dynamic buffer.
+ */
+
+void dbuf_destroy(dbuf *db) { DBDESTROY(db); }
+
+/* --- @{,d}buf_break@ --- *
+ *
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *
  * Returns:    Some negative value.
  *
  * Use:                Marks a buffer as broken.
  */
 
  *
  * Returns:    Some negative value.
  *
  * Use:                Marks a buffer as broken.
  */
 

-int buf_break(buf *b) { b->f |= BF_BROKEN; return (-1); }
+int buf_break(buf *b) { BBREAK(b); return (-1); }
+int (dbuf_break)(dbuf *db) { DBBREAK(db); return (-1); }

 
 

-/* --- @buf_flip@ --- *
+/* --- @{,d}buf_flip@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *
  * Returns:    ---
  *
  *
  * Returns:    ---
  *


@@ -74,15 +109,12 @@ int buf_break(buf *b) { b->f |= BF_BROKEN; return (-1); }
  *             you can now read from the bit you've written.
  */
 
  *             you can now read from the bit you've written.
  */
 

-void buf_flip(buf *b)
-{
-  b->limit = b->p;
-  b->p = b->base;
-}
+void buf_flip(buf *b) { BFLIP(b); }
+void (dbuf_flip)(dbuf *db) { DBFLIP(db); }

 
 

-/* --- @buf_ensure@ --- *
+/* --- @{,d}buf_ensure@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @size_t sz@ = size of data wanted
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @size_t sz@ = size of data wanted
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -91,10 +123,41 @@ void buf_flip(buf *b)
  */
 
 int buf_ensure(buf *b, size_t sz) { return (BENSURE(b, sz)); }
  */
 
 int buf_ensure(buf *b, size_t sz) { return (BENSURE(b, sz)); }

+int (dbuf_ensure)(dbuf *db, size_t sz) { return (dbuf_ensure(db, sz)); }

 
 

-/* --- @buf_get@ --- *
+/* --- @{,d}buf_tryextend@ --- *
+ *
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block
+ *             @size_t sz@ = size of data wanted
+ *
+ * Returns:    Zero if it worked, nonzero if the buffer won't grow.

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Use:                Extend the buffer so that at least @sz@ bytes are available.
+ *             This only works if the buffer is allocated.
+ */
+
+int buf_tryextend(buf *b, size_t sz)
+{
+  dbuf *db;
+  size_t want, len;
+
+  if (sz <= BLEFT(b)) return (0);
+  if (~b->f&(BF_ALLOC | BF_WRITE)) { b->f |= BF_BROKEN; return (-1); }
+
+  db = (dbuf *)b; len = DBLEN(db); want = sz + len;
+  if (db->sz < want) {
+    GROWBUF_EXTEND(size_t, db->a, db->_b.base, db->sz, want, 64, 1);
+    db->_b.p = db->_b.base + len;
+  }
+  db->_b.limit = db->_b.base + db->sz;
+  return (0);
+}
+int (dbuf_tryextend)(dbuf *db, size_t sz)
+  { return (dbuf_tryextend(db, sz)); }
+
+/* --- @{,d}buf_get@ --- *
+ *
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @size_t sz@ = size of the buffer
  *
  * Returns:    Pointer to the place in the buffer.
  *             @size_t sz@ = size of the buffer
  *
  * Returns:    Pointer to the place in the buffer.


@@ -112,10 +175,12 @@ void *buf_get(buf *b, size_t sz)
   BSTEP(b, sz);
   return (p);
 }
   BSTEP(b, sz);
   return (p);
 }

+void *(dbuf_get)(dbuf *db, size_t sz)
+  { return (dbuf_get(db, sz)); }

 
 

-/* --- @buf_put@ --- *
+/* --- @{,d}buf_put@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @const void *p@ = pointer to a buffer
  *             @size_t sz@ = size of the buffer
  *
  *             @const void *p@ = pointer to a buffer
  *             @size_t sz@ = size of the buffer
  *


@@ -132,10 +197,12 @@ int buf_put(buf *b, const void *p, size_t sz)
   BSTEP(b, sz);
   return (0);
 }
   BSTEP(b, sz);
   return (0);
 }

+int (dbuf_put)(dbuf *db, const void *p, size_t sz)
+  { return (dbuf_put(db, p, sz)); }

 
 

-/* --- @buf_getbyte@ --- *
+/* --- @{,d}buf_getbyte@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *
  * Returns:    A byte, or less than zero if there wasn't a byte there.
  *
  *
  * Returns:    A byte, or less than zero if there wasn't a byte there.
  *


@@ -148,10 +215,12 @@ int buf_getbyte(buf *b)
     return (-1);
   return (*b->p++);
 }
     return (-1);
   return (*b->p++);
 }

+int (dbuf_getbyte)(dbuf *db)
+  { return (dbuf_getbyte(db)); }

 
 

-/* --- @buf_putbyte@ --- *
+/* --- @{,d}buf_putbyte@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @int ch@ = byte to write
  *
  * Returns:    Zero if OK, nonzero if there wasn't enough space.
  *             @int ch@ = byte to write
  *
  * Returns:    Zero if OK, nonzero if there wasn't enough space.


@@ -166,10 +235,12 @@ int buf_putbyte(buf *b, int ch)
   *b->p++ = ch;
   return (0);
 }
   *b->p++ = ch;
   return (0);
 }

+int (dbuf_putbyte)(dbuf *db, int ch)
+  { return (dbuf_putbyte(db, ch)); }

 
 

-/* --- @buf_getu{8,{16,24,32,64}{,l,b}}@ --- *
+/* --- @{,d}buf_getu{8,{16,24,32,64}{,l,b}}@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @uintSZ *w@ = where to put the word
  *
  * Returns:    Zero if OK, or nonzero if there wasn't a word there.
  *             @uintSZ *w@ = where to put the word
  *
  * Returns:    Zero if OK, or nonzero if there wasn't a word there.


@@ -184,12 +255,46 @@ int buf_putbyte(buf *b, int ch)
     *ww = LOAD##W(b->p);                                               \
     BSTEP(b, SZ_##W);                                                  \
     return (0);                                                                \
     *ww = LOAD##W(b->p);                                               \
     BSTEP(b, SZ_##W);                                                  \
     return (0);                                                                \

-  }
+  }                                                                    \
+  int (dbuf_getu##w)(dbuf *db, uint##n *ww)                            \
+    { return (dbuf_getu##w(db, ww)); }

 DOUINTCONV(BUF_GETU_)
 
 DOUINTCONV(BUF_GETU_)
 

-/* --- @buf_putu{8,{16,24,32,64}{,l,b}}@ --- *
+/* --- @{,d}buf_getk64{,l,b}@ --- *
+ *
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block
+ *             @kludge64 *w@ = where to put the word
+ *
+ * Returns:    Zero if OK, or nonzero if there wasn't a word there.
+ *
+ * Use:                Gets a word of appropriate size and order from a buffer.
+ */
+
+int buf_getk64(buf *b, kludge64 *w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  LOAD64_(*w, b->p); BSTEP(b, 8); return (0);
+}
+
+int buf_getk64l(buf *b, kludge64 *w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  LOAD64_L_(*w, b->p); BSTEP(b, 8); return (0);
+}
+
+int buf_getk64b(buf *b, kludge64 *w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  LOAD64_B_(*w, b->p); BSTEP(b, 8); return (0);
+}
+
+int (dbuf_getk64)(dbuf *db, kludge64 *w) { return (dbuf_getk64(db, w)); }
+int (dbuf_getk64l)(dbuf *db, kludge64 *w) { return (dbuf_getk64l(db, w)); }
+int (dbuf_getk64b)(dbuf *db, kludge64 *w) { return (dbuf_getk64b(db, w)); }
+
+/* --- @{,d}buf_putu{8,{16,24,32,64}{,l,b}}@ --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @uintSZ w@ = word to write
  *
  * Returns:    Zero if OK, or nonzero if there wasn't enough space
  *             @uintSZ w@ = word to write
  *
  * Returns:    Zero if OK, or nonzero if there wasn't enough space


@@ -204,12 +309,46 @@ DOUINTCONV(BUF_GETU_)
     STORE##W(b->p, ww);                                                        \
     BSTEP(b, SZ_##W);                                                  \
     return (0);                                                                \
     STORE##W(b->p, ww);                                                        \
     BSTEP(b, SZ_##W);                                                  \
     return (0);                                                                \

-  }
+  }                                                                    \
+  int (dbuf_putu##w)(dbuf *db, uint##n ww)                             \
+    { return (dbuf_putu##w(db, ww)); }

 DOUINTCONV(BUF_PUTU_)
 
 DOUINTCONV(BUF_PUTU_)
 

+/* --- @{,d}buf_putk64{,l,b}@ --- *
+ *
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block
+ *             @kludge64 w@ = word to write
+ *
+ * Returns:    Zero if OK, or nonzero if there wasn't enough space
+ *
+ * Use:                Gets a word of appropriate size and order from a buffer.
+ */
+
+int buf_putk64(buf *b, kludge64 w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  STORE64_(b->p, w); BSTEP(b, 8); return (0);
+}
+
+int buf_putk64l(buf *b, kludge64 w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  STORE64_L_(b->p, w); BSTEP(b, 8); return (0);
+}
+
+int buf_putk64b(buf *b, kludge64 w)
+{
+  if (BENSURE(b, 8)) return (-1);
+  STORE64_B_(b->p, w); BSTEP(b, 8); return (0);
+}
+
+int (dbuf_putk64)(dbuf *db, kludge64 w) { return (dbuf_putk64(db, w)); }
+int (dbuf_putk64l)(dbuf *db, kludge64 w) { return (dbuf_putk64l(db, w)); }
+int (dbuf_putk64b)(dbuf *db, kludge64 w) { return (dbuf_putk64b(db, w)); }
+

 /* --- @findz@ --- *
  *
 /* --- @findz@ --- *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @size_t *nn@ = where to put the length
  *
  * Returns:    Zero if OK, nonzero if there wasn't a null byte to be found.
  *             @size_t *nn@ = where to put the length
  *
  * Returns:    Zero if OK, nonzero if there wasn't a null byte to be found.


@@ -222,17 +361,14 @@ static int findz(buf *b, size_t *nn)
 {
   octet *p;
 
 {
   octet *p;
 

-  if ((p = memchr(BCUR(b), 0, BLEFT(b))) == 0) {
-    buf_break(b);
-    return (-1);
-  }
+  if ((p = memchr(BCUR(b), 0, BLEFT(b))) == 0) { BBREAK(b); return (-1); }

   *nn = p - BCUR(b) + 1;
   return (0);
 }
 
   *nn = p - BCUR(b) + 1;
   return (0);
 }
 

-/* --- @buf_getmem{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_getmem{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @size_t *nn@ = where to put the length
  *
  * Returns:    Pointer to the buffer data, or null.
  *             @size_t *nn@ = where to put the length
  *
  * Returns:    Pointer to the buffer data, or null.


@@ -250,7 +386,9 @@ static int findz(buf *b, size_t *nn)
     if (BENSURE(b, sz)) return (0);                                    \
     *nn = sz;                                                          \
     return (buf_get(b, sz));                                           \
     if (BENSURE(b, sz)) return (0);                                    \
     *nn = sz;                                                          \
     return (buf_get(b, sz));                                           \

-  }
+  }                                                                    \
+  void *(dbuf_getmem##w)(dbuf *db, size_t *nn)                         \
+    { return (dbuf_getmem##w(db, nn)); }

 DOUINTCONV(BUF_GETMEM_)
 
 void *buf_getmemz(buf *b, size_t *nn)
 DOUINTCONV(BUF_GETMEM_)
 
 void *buf_getmemz(buf *b, size_t *nn)


@@ -258,10 +396,57 @@ void *buf_getmemz(buf *b, size_t *nn)
   if (findz(b, nn)) return (0);
   return (buf_get(b, *nn));
 }
   if (findz(b, nn)) return (0);
   return (buf_get(b, *nn));
 }

+void *(dbuf_getmemz)(dbuf *db, size_t *nn)
+  { return (dbuf_getmemz(db, nn)); }
+
+#ifndef HAVE_UINT64
+
+static void *getmem_k64(buf *b, size_t *nn_out, kludge64 k)
+{
+  kludge64 szmax;
+  size_t n;
+
+  ASSIGN64(szmax, (size_t)-1);
+  if (CMP64(k, >, szmax)) { BBREAK(b); return (-1); }
+  n = GET64(size_t, k); *nn_out = n; return (buf_get(b, n));
+}
+
+void *buf_getmem64(buf *b, size_t *nn)
+{
+  kludge64 k;
+
+  if (buf_getk64(b, &k)) return (-1);
+  return (getmem_k64(b, nn, k));
+}
+
+void *buf_getmem64l(buf *b, size_t *nn)
+{
+  kludge64 k;

 
 

-/* --- @buf_putmem{8,{16,24,32,64}{,l,b},z} --- *
+  if (buf_getk64l(b, &k)) return (-1);
+  return (getmem_k64(b, nn, k));
+}
+
+void *buf_getmem64b(buf *b, size_t *nn)
+{
+  kludge64 k;
+
+  if (buf_getk64b(b, &k)) return (-1);
+  return (getmem_k64(b, nn, k));
+}
+
+void *(dbuf_getmem64)(dbuf *db, size_t *nn)
+  { return (dbuf_getmem64(db, nn)); }
+void *(dbuf_getmem64l)(dbuf *db, size_t *nn)
+  { return (dbuf_getmem64l(db, nn)); }
+void *(dbuf_getmem64b)(dbuf *db, size_t *nn)
+  { return (dbuf_getmem64b(db, nn)); }
+
+#endif
+
+/* --- @{,d}buf_putmem{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @const void *p@ = pointer to data to write
  *             @size_t n@ = length to write
  *
  *             @const void *p@ = pointer to data to write
  *             @size_t n@ = length to write
  *


@@ -277,28 +462,67 @@ void *buf_getmemz(buf *b, size_t *nn)
   {                                                                    \
     MUFFLE_WARNINGS_STMT                                               \
       (CLANG_WARNING("-Wtautological-constant-out-of-range-compare"),  \
   {                                                                    \
     MUFFLE_WARNINGS_STMT                                               \
       (CLANG_WARNING("-Wtautological-constant-out-of-range-compare"),  \

-       { assert(sz <= MASK##W); });                                    \
+       { if (sz > MASK##W) { BBREAK(b); return (-1); } });             \

     if (buf_putu##w(b, sz) || buf_put(b, p, sz))                       \
       return (-1);                                                     \
     return (0);                                                                \
     if (buf_putu##w(b, sz) || buf_put(b, p, sz))                       \
       return (-1);                                                     \
     return (0);                                                                \

-  }
+  }                                                                    \
+  int (dbuf_putmem##w)(dbuf *db, const void *p, size_t sz)             \
+    { return (dbuf_putmem##w(db, p, sz)); }

 DOUINTCONV(BUF_PUTMEM_)
 
 DOUINTCONV(BUF_PUTMEM_)
 

+#ifndef HAVE_UINT64
+
+void *buf_putmem64(buf *b, const void *p, size_t n)
+{
+  kludge64 k;
+
+  ASSIGN64(k, n); if (buf_putk64(b, k) || buf_put(b, p, n)) return (-1);
+  return (0);
+}
+
+void *buf_putmem64l(buf *b, const void *p, size_t n)
+{
+  kludge64 k;
+
+  ASSIGN64(k, n); if (buf_putk64l(b, k) || buf_put(b, p, n)) return (-1);
+  return (0);
+}
+
+void *buf_putmem64b(buf *b, const void *p, size_t n)
+{
+  kludge64 k;
+
+  ASSIGN64(k, n); if (buf_putk64b(b, k) || buf_put(b, p, n)) return (-1);
+  return (0);
+}
+
+int (dbuf_putmem64)(dbuf *db, const void *p, size_t n)
+  { return (dbuf_putmem64(db, p, n)); }
+int (dbuf_putmem64l)(dbuf *db, const void *p, size_t n)
+  { return (dbuf_putmem64l(db, p, n)); }
+int (dbuf_putmem64b)(dbuf *db, const void *p, size_t n)
+  { return (dbuf_putmem64b(db, p, n)); }
+
+#endif
+

 int buf_putmemz(buf *b, const void *p, size_t n)
 {
   octet *q;
 
 int buf_putmemz(buf *b, const void *p, size_t n)
 {
   octet *q;
 

-  assert(!memchr(p, 0, n));
+  if (memchr(p, 0, n)) { BBREAK(b); return (-1); }

   if ((q = buf_get(b, n + 1)) == 0)
     return (-1);
   memcpy(q, p, n);
   q[n] = 0;
   return (0);
 }
   if ((q = buf_get(b, n + 1)) == 0)
     return (-1);
   memcpy(q, p, n);
   q[n] = 0;
   return (0);
 }

+int (dbuf_putmemz)(dbuf *db, const void *p, size_t n)
+  { return (dbuf_putmemz(db, p, n)); }

 
 

-/* --- @buf_getbuf{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_getbuf{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @buf *bb@ = where to put the result
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @buf *bb@ = where to put the result
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -317,12 +541,14 @@ int buf_putmemz(buf *b, const void *p, size_t n)
       return (-1);                                                     \
     buf_init(bb, p, sz);                                               \
     return (0);                                                                \
       return (-1);                                                     \
     buf_init(bb, p, sz);                                               \
     return (0);                                                                \

-  }
+  }                                                                    \
+  int (dbuf_getbuf##w)(dbuf *db, buf *bb)                              \
+    { return (dbuf_getbuf##w(db, bb)); }

 BUF_DOSUFFIXES(BUF_GETBUF_)
 
 BUF_DOSUFFIXES(BUF_GETBUF_)
 

-/* --- @buf_putbuf{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_putbuf{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @buf *bb@ = buffer to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @buf *bb@ = buffer to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -332,12 +558,14 @@ BUF_DOSUFFIXES(BUF_GETBUF_)
 
 #define BUF_PUTBUF_(n, W, w)                                           \
   int buf_putbuf##w(buf *b, buf *bb)                                   \
 
 #define BUF_PUTBUF_(n, W, w)                                           \
   int buf_putbuf##w(buf *b, buf *bb)                                   \

-    { return (buf_putmem##w(b, BBASE(bb), BLEN(bb))); }
+    { return (buf_putmem##w(b, BBASE(bb), BLEN(bb))); }                        \
+  int (dbuf_putbuf##w)(dbuf *db, buf *bb)                              \
+    { return (dbuf_putbuf##w(db, bb)); }

 BUF_DOSUFFIXES(BUF_PUTBUF_)
 
 BUF_DOSUFFIXES(BUF_PUTBUF_)
 

-/* --- @buf_putstr{8,{16,24,32,64}{,l,b},z} --- *
+/* --- @{,d}buf_putstr{8,{16,24,32,64}{,l,b},z} --- *

  *
  *

- * Arguments:  @buf *b@ = pointer to a buffer block
+ * Arguments:  @buf *b@ or @dbuf *db@ = pointer to a buffer block

  *             @const char *p@ = string to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.
  *             @const char *p@ = string to write
  *
  * Returns:    Zero if it worked, nonzero if there wasn't enough space.


@@ -347,7 +575,9 @@ BUF_DOSUFFIXES(BUF_PUTBUF_)
 
 #define BUF_PUTSTR_(n, W, w)                                           \
   int buf_putstr##w(buf *b, const char *p)                             \
 
 #define BUF_PUTSTR_(n, W, w)                                           \
   int buf_putstr##w(buf *b, const char *p)                             \

-    { return (buf_putmem##w(b, p, strlen(p))); }
+    { return (buf_putmem##w(b, p, strlen(p))); }                       \
+  int (dbuf_putstr##w)(dbuf *db, const char *p)                                \
+    { return (dbuf_putstr##w(db, p)); }

 BUF_DOSUFFIXES(BUF_PUTSTR_)
 
 /*----- That's all, folks -------------------------------------------------*/
 BUF_DOSUFFIXES(BUF_PUTSTR_)
 
 /*----- That's all, folks -------------------------------------------------*/