--- deliantra/server/include/dynbuf.h	2007/05/03 09:26:45	1.7
+++ deliantra/server/include/dynbuf.h	2008/08/30 05:19:03	1.18
@@ -1,9 +1,33 @@
+/*
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ * 
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ * 
+ * Deliantra 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 <support@deliantra.net>
+ */
+
 #ifndef DYNBUF_H__
 #define DYNBUF_H__
 
 #include <cstring>
 #include <cassert>
 
+#include "util.h"
 #include "shstr.h"
 
 // this is a "buffer" that can grow fast
@@ -24,50 +48,80 @@
   };
 
   char *ptr, *end;
-  int ext;
   int _size;
 
+  int extend;
   chunk *first, *last;
 
-  void _reserve (int size);
-  void _clear ();
-  void clear ();
-  void finish ();
+  void reserve (int size);
+  void init (int initial);  // allocate sinitial chunk
+  void free (chunk *&chain); // free chain of chunks
+  char *_linearise ();
+  void finalise ();
 
 public:
   
-  dynbuf (int initial = 4096, int extend = 16384);
-  ~dynbuf ();
+  // initial - the size of the initial chunk to be allocated
+  // extend  - first incremental step when buffer size exceeded
+  dynbuf (int initial = 4096, int extend = 16384)
+  : extend (extend)
+  {
+    init (initial);
+  }
+
+  ~dynbuf ()
+  {
+    free (first);
+  }
+
+  // resets the dynbuf, but does not free the first chunk
+  // which is either of size "initial" or the size of the last
+  // linearise
+  void clear ();
 
   int  size  () const { return _size + (ptr - last->data); }
   bool empty () const { return !size (); }
 
   void linearise (void *data);
-  char *linearise (); // does not 0-terminate(!)
+  char *linearise () // does not 0-terminate(!)
+  { 
+    return first->next ? _linearise () : first->data;
+  }
 
   int room () const { return end - ptr; }
 
   char *force (int size)
   {
-    if (ptr + size >= end)
-      _reserve (size);
+    if (expect_false (ptr + size >= end))
+      reserve (size);
 
     return ptr;
   }
 
-  char *alloc (int size)
+  char *falloc (int size)
   {
-    char *res = force (size);
-    ptr  += size;
+    char *res = ptr;
+    ptr += size;
     return res;
   }
 
+  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)
@@ -104,14 +158,31 @@
   { }
 
   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);
 
+  //TODO: should optimise the case printf "(name %+d)" as it comes up extremely often
+
+  //using dynbuf::operator <<; // doesn't work, sometiems C++ just suxx
+  // instead we use an ugly template function
+  template<typename T>
+  dynbuf_text &operator << (T c) { *(dynbuf *)this << c; return *this; }
+
+  dynbuf_text &operator << (sint16 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (uint16 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (sint32 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (sint64 i) { add (sint64 (i)); return *this; }
+  dynbuf_text &operator << (uint32 i) { add (sint64 (i)); return *this; }
+  dynbuf_text &operator << (uint64 i) { add (sint64 (i)); return *this; }
+
   void printf (const char *format, ...);
+  void vprintf (const char *format, va_list ap);
+
+  void add_abilities (const char *name, uint32 abilities);
+  void add_paths     (const char *name, uint32 paths);
+
+  // returns the string, linearised and with trailing \0
+  operator const char * ();
 };
 
 #endif