--- deliantra/server/include/dynbuf.h	2007/04/23 18:09:57	1.4
+++ deliantra/server/include/dynbuf.h	2007/05/28 21:15:56	1.11
@@ -1,9 +1,34 @@
+/*
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 
+ * 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 2 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 Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * 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
@@ -18,18 +43,19 @@
   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 ();
 
@@ -38,35 +64,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)
@@ -90,6 +127,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 ();
@@ -103,9 +141,6 @@
 
   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);
 
@@ -113,3 +148,4 @@
 };
 
 #endif
+