--- deliantra/server/include/dynbuf.h	2006/09/19 22:05:55	1.3
+++ deliantra/server/include/dynbuf.h	2007/07/01 05:00:18	1.12
@@ -1,32 +1,60 @@
+/*
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * 
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ */
+
 #ifndef DYNBUF_H__
 #define DYNBUF_H__
 
 #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 ();
 
@@ -35,35 +63,46 @@
   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;
   }
 
-  char *alloc (int size)
+  char *falloc (int size)
   {
-    char *res = force (size);
-
-    room -= size;
+    char *res = ptr;
     ptr += size;
-
     return res;
   }
 
-  void fadd (char c) { --room; *ptr++ = c; }
+  char *alloc (int size)
+  {
+    force (size);
+    return falloc (size);
+  }
+
+  void fadd (char c) { *ptr++ = c; }
   void fadd (unsigned char c) { fadd (char (c)); }
+  void fadd (const void *p, int len)
+  {
+    memcpy (falloc (len), p, len);
+  }
 
   void add (const void *p, int len)
   {
-    memcpy (alloc (len), p, len);
+    force (len);
+    fadd (p, len);
   }
 
   void add (char c)
@@ -76,11 +115,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);
@@ -88,6 +126,25 @@
   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;
+
+  void add (sint32 i);
+  void add (sint64 i);
+
+  void printf (const char *format, ...);
 };
 
 #endif
+