--- deliantra/server/include/dynbuf.h	2007/04/23 18:21:54	1.5
+++ deliantra/server/include/dynbuf.h	2007/05/26 15:44:03	1.8
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <cassert>
 
+#include "util.h"
 #include "shstr.h"
 
 // this is a "buffer" that can grow fast
@@ -23,14 +24,14 @@
     char data[0];
   };
 
-  char *ptr;
-  int room;
+  char *ptr, *end;
   int ext;
   int _size;
 
   chunk *first, *last;
 
   void _reserve (int size);
+  void _clear ();
   void clear ();
   void finish ();
 
@@ -39,14 +40,17 @@
   dynbuf (int initial = 4096, int extend = 16384);
   ~dynbuf ();
 
-  int size () { return _size + (ptr - last->data); }
+  int  size  () const { return _size + (ptr - last->data); }
+  bool empty () const { return !size (); }
 
   void linearise (void *data);
-  char *linearise ();
+  char *linearise (); // does not 0-terminate(!)
+
+  int room () const { return end - ptr; }
 
   char *force (int size)
   {
-    if (room < size)
+    if (expect_false (ptr + size >= end))
       _reserve (size);
 
     return ptr;
@@ -55,14 +59,11 @@
   char *alloc (int size)
   {
     char *res = force (size);
-
-    room -= size;
-    ptr += size;
-
+    ptr  += size;
     return res;
   }
 
-  void fadd (char c) { --room; *ptr++ = c; }
+  void fadd (char c) { *ptr++ = c; }
   void fadd (unsigned char c) { fadd (char (c)); }
 
   void add (const void *p, int len)
@@ -91,6 +92,7 @@
   dynbuf &operator << (char c) { add (c); return *this; }
   dynbuf &operator << (unsigned char c) { return *this << char (c); }
   dynbuf &operator << (const char *s) { add (s); return *this; }
+  dynbuf &operator << (const shstr &s) { add (s); return *this; }
   dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
 
   operator std::string ();
@@ -114,3 +116,4 @@
 };
 
 #endif
+