--- deliantra/server/include/dynbuf.h	2006/08/31 17:54:14	1.1
+++ deliantra/server/include/dynbuf.h	2007/05/27 23:22:29	1.9
@@ -4,45 +4,53 @@
 #include <cstring>
 #include <cassert>
 
+#include "util.h"
+#include "shstr.h"
+
 // this is a "buffer" that can grow fast
 // and is still somewhat space-efficient.
 // unlike obstacks or other data structures,
 // it never moves data around. basically,
 // this is a fast strstream without the overhead.
 
-class dynbuf
+struct dynbuf
 {
+protected:
   struct chunk
   {
     chunk *next;
+    int alloc;
     int size;
     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 ();
 
 public:
   
-  dynbuf (int initial = 128, int extend = 128);
+  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;
@@ -51,15 +59,12 @@
   char *alloc (int size)
   {
     char *res = force (size);
-
-    room -= size;
     ptr += size;
-
     return res;
   }
 
-  void fadd (char c) { --room; *ptr++ = c; }
-  void fadd (unsigned char c) { fadd (char (c));; }
+  void fadd (char c) { *ptr++ = c; }
+  void fadd (unsigned char c) { fadd (char (c)); }
 
   void add (const void *p, int len)
   {
@@ -68,11 +73,7 @@
 
   void add (char c)
   {
-    if (room < 1)
-      _reserve (1);
-
-    room--;
-    *ptr++ = c;
+    alloc (1)[0] = c;
   }
 
   void add (const char *s)
@@ -80,11 +81,10 @@
      add (s, strlen (s));
   }
 
-  static const int max_sint32_size = 11;
-  static const int max_sint64_size = 20;
-
-  void add (sint32 i);
-  void add (sint64 i);
+  void add (const shstr &s)
+  {
+    add (s.s, s.length ());
+  }
 
   //TODO
   //void add_destructive (dynbuf &buf);
@@ -92,6 +92,28 @@
   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 ();
+};
+
+struct dynbuf_text : dynbuf
+{
+  dynbuf_text (int initial = 4096, int extend = 16384)
+  : dynbuf (initial, extend)
+  { }
+
+  using dynbuf::add;
+
+  static const int max_sint32_size = 11;
+  static const int max_sint64_size = 20;
+
+  void add (sint32 i);
+  void add (sint64 i);
+
+  void printf (const char *format, ...);
 };
 
 #endif
+