--- deliantra/server/socket/item.C	2008/12/28 06:59:27	1.76
+++ deliantra/server/socket/item.C	2009/10/12 14:00:59	1.79
@@ -5,18 +5,19 @@
  * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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/>.
+ * You should have received a copy of the Affero GNU General Public License
+ * and 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>
  */
@@ -420,26 +421,20 @@
     {
       int len;
       const char *item_p;
-      char item_n[MAX_BUF];
+      char item_n[127 * 2];
 
       if (!op->custom_name)
         {
-          strncpy (item_n, query_base_name (op, 0), 127);
-          item_n[127] = 0;
-          len = strlen (item_n);
+          len = assign (item_n, query_base_name (op, 0), 127);
           item_p = query_base_name (op, 1);
         }
       else
         {
-          strncpy (item_n, op->custom_name, 127);
-          item_n[127] = 0;
-          len = strlen (item_n);
-          item_p = op->custom_name;
+          len = assign (item_n, &op->custom_name, 127);
+          item_p = &op->custom_name;
         }
 
-      strncpy (item_n + len + 1, item_p, 127);
-      item_n[254] = 0;
-      len += strlen (item_n + 1 + len) + 1;
+      len += assign (item_n + len, item_p, 127);
 
       sl << data8 (item_n, len);
     }
@@ -680,7 +675,7 @@
 static void
 look_at (player *pl, int dx, int dy)
 {
-  dynbuf_text buf;
+  dynbuf_text &buf = msg_dynbuf; buf.clear ();
   object *ob = pl->ob;
 
   if (!pl->observe->map)