Index: ChangeLog
===================================================================
RCS file: /home/circledb/.cvs/circle/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.211
diff -u -p -r1.203 -r1.211
--- ChangeLog	2002/01/16 00:19:45	1.203
+++ ChangeLog	2002/04/16 02:23:37	1.211
@@ -3805,3 +3805,211 @@ change.
 -- gg - shop.c: destroy_shops(): Make usable without shutdown.
 
 -- gg - Released patchlevel 20.
+
+******** Patchlevel 21 ***************************************************
+
+1/6/2002
+
+-- gg - Makefile.lcc, structs.h: bpl20 -> bpl21
+	README.CYGWIN: Reword to avoid changes every patchlevel.
+
+-- gg - db.c: Remove write-only variable 'top_of_p_file'.
+		From Juliano Ravasi Ferraz <jferraz@linkway.com.br>.
+
+-- gg - licheck: Last-minute file rename broke printing license.
+
+1/27/2002
+
+-- gg - act.other.c, act.wizard.c, ban.c, class.c, comm.c, db.c, fight.c,
+		house.c, interpreter.c, limits.c, modify.c, objsave.c,
+		spells.c, utils.c, utils.h: Variable argument mudlog().
+
+-- gg - comm.c, comm.h, handler.c, interpreter.c, modify.c: Replace
+		SEND_TO_Q with varargs write_to_output().
+
+-- gg - utils.c: strlcpy(): New.
+		sprintbit(), sprinttype(): 'length' parameter.
+
+-- gg - castle.c: tim(), tom(), dickndavid(): Use 'argument', not 'arg'.
+
+-- gg - utils.c, utils.h, configure.in: Add proper autoconf support for
+		strdup and strlcpy.
+
+-- gg - sysdep.h, utils.c, utils.h: Do autoconf checks for str(n)casecmp
+		and str(n)icmp.
+
+-- gg - s/str_dup/strdup/ -- it's now an autoconf check.
+
+-- gg - Variable argument send_to_char().
+	comm.c: Remove sanity_check().
+
+1/31/2002
+
+-- gg - sysdep.h, conf.h.in: Added autoconf check for mcheck.h.
+
+-- gg - structs.h: Remove unused 'last_direction' from mob_special_data.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - structs.h: Make mob_special_data.attack_type a byte.
+	act.wizard.c: Cast attack_type to integer for array access.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - act.movement.c act.wizard.c comm.c handler.c magic.c,
+		spec_procs.c spells.c utils.c: Remove redundant prototypes.
+
+-- gg - class.c, fight.c, objsave.c, shop.c: Added some casts for
+		C++ warnings, some of which I think I removed recently..
+
+-- gg - act.movement.c: do_doorcmd(): Since LOCK_DOOR is no longer
+		a toggle and does what it says, lockpicking needed a
+		new TOGGLE_LOCK macro to work properly. (Unless you
+		always wanted to pick the lock locked, that is.)
+
+-- gg - structs.h: 'struct index_data' needs to use the *_vnum types.
+		From: Anton Graham <bladehawke@amaesing.com>
+
+-- gg - spec_procs.c: SPECIAL(dump): Use SCMD_DROP for do_drop() call.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - interpreter.c: find_name() and get_ptable_by_name() did the
+		same thing.  Delete find_name() as it doesn't relate
+		to other functions as much.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+	db.c: get_{ptable,id}_by_name(): Don't use one_argument since
+			names don't have whitespace anyway.
+
+-- gg - db.h: Remove 'arg', 'buf', 'buf1', and 'buf2' global buffers.
+
+-- gg - fight.c: death_cry(), damage();
+	spells.c: spell_locate_object():
+		->in_room to IN_ROOM()
+
+-- gg - act.wizard.c: do_restore(): Allow people to restore themselves.
+		That's what I get for changing my mind at the last minute
+		for '>=' instead of '>'.
+
+-- gg - perl -i -pe 's/([^_])number\(/$1rand_number\(/g;' *.[ch]
+		Renamed number() to rand_number() to avoid shadowing variables
+		and also avoid a BSD function reportedly with that name.
+
+-- gg - Fixed -Wshadow warnings, most having to do with 'index'.
+
+2/15/2002
+
+-- gg - act.movement.c: Removed unused DOOR_LOCK macro.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - interpreter.c: special(): Delayed extraction can result in dead
+		mobiles during special procedure check so avoid anyone
+		to be removed.
+		From: Welcor <welcor@DUNE.NET>
+	fight.c: perform_violence(): Likewise.
+
+2/20/2002
+
+-- gg - comm.c: vwrite_to_output(): Fix sign/unsign warning.
+		write_to_descriptor(): Not worth using varargs here.
+	comm.h: Update write_to_descriptor() prototype.
+
+3/3/2002
+
+-- gg - act.item.c: give_find_vict(): Use skip_spaces().
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - fight.c: make_corpse(): Fix odd test.  "A || (!A && B)"
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - act.item.c: do_put(): Remove extra-dimensional bags.
+		From: Juliano Ravasi Ferraz <jferraz@linkway.com.br>
+
+-- gg - utils.h: Fixed unused OBJAFF_FLAGGED.
+		From: "Kras Kresh" <kras_kresh@hotmail.com>
+
+-- gg - shop.c: Give discounts (or price-inflation) based on charisma.
+
+-- gg - act.wizard.c: do_advance(): Run autowiz when demoting gods.
+	class.c: do_start(): Reset max hit/mana/move but don't reset playtime.
+	db.c: init_char(): Use macros for more structure accesses.  Don't set
+		hit/mana/move for characters here, but do set them for the
+		first character (implementor). Also comment the height/weight
+		values better.
+	limits.c: check_autowiz(): Rename to run_autowiz() and change to run
+		instead of test.
+        gain_exp(), gain_exp_regardless(): check_autowiz -> run_autowiz.
+
+3/20/2002
+
+-- gg - cnf/aclocal.m4: Use 'official' method of a 3rd argument to AC_DEFINE()
+		to generate autoheader hints instead of a local hack to
+		autoheader itself.
+	cnf/configure.in: Add checks for more functions, more prototypes, and
+		mcheck.h.
+
+-- gg - conf.h.in: Regenerated due to AC_CHECK_PROTO changes.
+
+-- gg - act.wizard.c: do_stat_character(): Adjusted formatting of output.
+
+-- gg - alias.c: write_aliases(), write_aliases(); objsave.c: Add buffer
+		length argument	to get_filename().
+	read_aliases(): Error-check fscanf() results. Avoids infinite loop
+		while sucking down memory.
+	utils.c: get_filename(): Need a buffer length argument to write
+		proper amount.
+	utils.h: get_filename() prototype adjustment.
+
+-- gg - structs.h: title_type is no longer used.
+
+4/9/2002
+
+-- gg - castle.c: king_welmar(), castle_twin_proc();
+	comm.c: process_output();
+	db.c: parse_room(), char_to_store(), fread_string(), file_to_string();
+	handler.c: create_money();
+	shop.c: shopping_buy();
+	spec_procs.c: mayor(), puff();
+	utils.c: mudlog():
+		String buffer size assumption comments.
+
+-- gg - configure: Regenerated from configure.in
+
+-- gg - act.informative.c: show_obj_to_char(): Might as well use snprintf().
+	db.c: global: Remove unused spell_info[] extern;
+		load_help(): Avoid help entry overflows.
+	shop.c: evaluate_expression(): Increase 'name' buffer size.
+	act.item.c: name_from_drinkcon();
+	act.wizard.c: perform_set();
+	ban.c: load_banned(), do_ban();
+	comm.c: make_prompt(), new_descriptor(), perform_subst();
+	db.c: save_char();
+	interpreter.c: nanny();
+	mail.c: store_mail();
+	mobact.c: aggressive_mob_on_a_leash();
+	modify.c: show_string();
+	shop.c: evaluate_expression(), shopping_list();
+	spec_procs.c: cityguard();
+	spell_parser.c: say_spell(), find_skill_num();
+	spells.h: struct spell_info_type;
+	utils.c: strlcpy():
+		String buffer size comments.
+
+-- gg - class.c; spec_procs.c: guild_guard(); structs.h: Fix use of integers
+		for room virtual numbers in guild_info[] array.
+		From: Edward J Glamkowski <eglamkowski@ANGELFIRE.COM>
+	class.c: find_class_bitvector();
+	act.informative.c: do_who(), do_users():
+		Make find_class_bitvector() use parse_class() and loop itself.
+		Partially from: Edward J Glamkowski <eglamkowski@ANGELFIRE.COM>
+
+-- gg - comm.c: make_prompt(): People with 'disp none' need prompt[]
+		cleared first.
+
+-- gg - utils.c: mudlog(): Fixed parenthesis lost in reformatting.
+		From: kras_kresh@hotmail.com
+
+4/15/2002
+
+-- gg - Makefile.in, conf.h.in, sysdep.h: Check for snprintf().
+	bsd-snprintf.c, bsd-snprintf.h: BSD-licensed replacements for
+		snprintf() and vsnprintf() for platforms lacking them.
+	cnf/configure.in: HAVE_(V)SNPRINTF checks.
+	configure: Regenerated.
Index: autorun
===================================================================
RCS file: /home/circledb/.cvs/circle/autorun,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- autorun	2001/06/26 11:28:42	1.5
+++ autorun	2002/01/31 18:05:29	1.6
@@ -138,6 +138,8 @@ while ( : ) do
   echo "autorun starting game $DATE" > syslog
   echo "running bin/circle $FLAGS $PORT" >> syslog
 
+  # On Cygwin, you may need to precede this next line with './' for
+  # './bin/circle' as the command.
   bin/circle $FLAGS $PORT >> syslog 2>&1
 
   if [ -r .killscript ]; then
Index: configure
===================================================================
RCS file: /home/circledb/.cvs/circle/configure,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- configure	1999/08/02 00:33:11	1.14
+++ configure	2002/04/16 02:23:38	1.16
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
+# Generated automatically using autoconf version 2.14.1 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -333,7 +333,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
+    echo "configure generated by autoconf version 2.14.1"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -493,7 +493,7 @@ done
 
 if test -r "$cache_file"; then
   echo "loading cache $cache_file"
-  . $cache_file
+      test -f "$cache_file" && . $cache_file
 else
   echo "creating cache $cache_file"
   > $cache_file
@@ -537,7 +537,7 @@ do
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:540: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_MORE'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_MORE+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$MORE"; then
@@ -570,7 +570,7 @@ done
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:573: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -600,7 +600,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:603: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -646,12 +646,12 @@ fi
 
   if test -z "$CC"; then
     case "`uname -s`" in
-    *win32* | *WIN32*)
+    *win32* | *WIN32* | *CYGWIN*)
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:654: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_CC+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test -n "$CC"; then
@@ -681,8 +681,8 @@ fi
   test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:686: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:686: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -723,14 +723,14 @@ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
 if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:728: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:728: checking whether the C compiler ($CC $CFLAGS $CPPFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 echo "configure:733: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_gcc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.c <<EOF
@@ -758,7 +758,7 @@ ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 echo "configure:761: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_cc_g+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo 'void f(){}' > conftest.c
@@ -793,7 +793,7 @@ if test $ac_cv_prog_gcc = yes; then
 
     echo $ac_n "checking whether ${CC-cc} -Wall also needs -Wno-char-subscripts""... $ac_c" 1>&6
 echo "configure:796: checking whether ${CC-cc} -Wall also needs -Wno-char-subscripts" >&5
-if eval "test \"`echo '$''{'ac_cv_char_warn'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_char_warn+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -829,7 +829,7 @@ echo "$ac_t""$ac_cv_char_warn" 1>&6
 
     echo $ac_n "checking whether ${CC-cc} accepts -Wno-char-subscripts""... $ac_c" 1>&6
 echo "configure:832: checking whether ${CC-cc} accepts -Wno-char-subscripts" >&5
-if eval "test \"`echo '$''{'ac_cv_gcc_ncs'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_gcc_ncs+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -877,7 +877,7 @@ fi
 
 echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
 echo "configure:880: checking for gethostbyaddr" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_func_gethostbyaddr+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
@@ -890,6 +890,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char gethostbyaddr();
+char (*f)();
 
 int main() {
 
@@ -899,12 +900,12 @@ int main() {
 #if defined (__stub_gethostbyaddr) || defined (__stub___gethostbyaddr)
 choke me
 #else
-gethostbyaddr();
+f = gethostbyaddr;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyaddr=yes"
 else
@@ -922,15 +923,15 @@ if eval "test \"`echo '$ac_cv_func_'geth
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
-echo "configure:926: checking for gethostbyaddr in -lnsl" >&5
+echo "configure:927: checking for gethostbyaddr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 934 "configure"
+#line 935 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -941,7 +942,7 @@ int main() {
 gethostbyaddr()
 ; return 0; }
 EOF
-if { (eval echo configure:945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -965,12 +966,12 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:969: checking for socket" >&5
-if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+echo "configure:970: checking for socket" >&5
+if eval "test \"\${ac_cv_func_socket+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 974 "configure"
+#line 975 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -979,6 +980,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char socket();
+char (*f)();
 
 int main() {
 
@@ -988,12 +990,12 @@ int main() {
 #if defined (__stub_socket) || defined (__stub___socket)
 choke me
 #else
-socket();
+f = socket;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -1011,15 +1013,15 @@ if eval "test \"`echo '$ac_cv_func_'sock
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:1015: checking for socket in -lsocket" >&5
+echo "configure:1017: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1023 "configure"
+#line 1025 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1030,7 +1032,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1054,12 +1056,12 @@ fi
 
 
 echo $ac_n "checking for malloc""... $ac_c" 1>&6
-echo "configure:1058: checking for malloc" >&5
-if eval "test \"`echo '$''{'ac_cv_func_malloc'+set}'`\" = set"; then
+echo "configure:1060: checking for malloc" >&5
+if eval "test \"\${ac_cv_func_malloc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1063 "configure"
+#line 1065 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc(); below.  */
@@ -1068,6 +1070,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char malloc();
+char (*f)();
 
 int main() {
 
@@ -1077,12 +1080,12 @@ int main() {
 #if defined (__stub_malloc) || defined (__stub___malloc)
 choke me
 #else
-malloc();
+f = malloc;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc=yes"
 else
@@ -1100,15 +1103,15 @@ if eval "test \"`echo '$ac_cv_func_'mall
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for malloc in -lmalloc""... $ac_c" 1>&6
-echo "configure:1104: checking for malloc in -lmalloc" >&5
+echo "configure:1107: checking for malloc in -lmalloc" >&5
 ac_lib_var=`echo malloc'_'malloc | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lmalloc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1112 "configure"
+#line 1115 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1119,7 +1122,7 @@ int main() {
 malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:1123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1150,12 +1153,12 @@ fi
 
 
 echo $ac_n "checking for crypt""... $ac_c" 1>&6
-echo "configure:1154: checking for crypt" >&5
-if eval "test \"`echo '$''{'ac_cv_func_crypt'+set}'`\" = set"; then
+echo "configure:1157: checking for crypt" >&5
+if eval "test \"\${ac_cv_func_crypt+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1159 "configure"
+#line 1162 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char crypt(); below.  */
@@ -1164,6 +1167,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char crypt();
+char (*f)();
 
 int main() {
 
@@ -1173,12 +1177,12 @@ int main() {
 #if defined (__stub_crypt) || defined (__stub___crypt)
 choke me
 #else
-crypt();
+f = crypt;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:1182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_crypt=yes"
 else
@@ -1199,15 +1203,15 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:1203: checking for crypt in -lcrypt" >&5
+echo "configure:1207: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1211 "configure"
+#line 1215 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1218,7 +1222,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:1222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1246,13 +1250,13 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:1250: checking how to run the C preprocessor" >&5
+echo "configure:1254: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+if eval "test \"\${ac_cv_prog_CPP+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     # This must be in double quotes, not single quotes, because CPP may get
@@ -1261,13 +1265,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 1265 "configure"
+#line 1269 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1275: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1278,13 +1282,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 1282 "configure"
+#line 1286 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1295,13 +1299,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 1299 "configure"
+#line 1303 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1326,12 +1330,12 @@ fi
 echo "$ac_t""$CPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1330: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+echo "configure:1334: checking for ANSI C header files" >&5
+if eval "test \"\${ac_cv_header_stdc+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1335 "configure"
+#line 1339 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1339,7 +1343,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1356,7 +1360,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1360 "configure"
+#line 1364 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1374,7 +1378,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1378 "configure"
+#line 1382 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1395,7 +1399,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1403 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1406,7 +1410,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
 exit (0); }
 
 EOF
-if { (eval echo configure:1410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1430,12 +1434,12 @@ EOF
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:1434: checking for sys/wait.h that is POSIX.1 compatible" >&5
-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+echo "configure:1438: checking for sys/wait.h that is POSIX.1 compatible" >&5
+if eval "test \"\${ac_cv_header_sys_wait_h+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1439 "configure"
+#line 1443 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -1451,7 +1455,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:1455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -1475,17 +1479,21 @@ for ac_hdr in fcntl.h sys/fcntl.h errno.
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1479: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:1483: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
+#line 1488 "configure"
 #include "confdefs.h"
+
+#ifdef HAVE_STANDARDS_H
+# include <standards.h>
+#endif
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1515,17 +1523,21 @@ for ac_hdr in limits.h sys/time.h sys/se
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1519: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:1527: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1524 "configure"
+#line 1532 "configure"
 #include "confdefs.h"
+
+#ifdef HAVE_STANDARDS_H
+# include <standards.h>
+#endif
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1555,17 +1567,21 @@ for ac_hdr in memory.h crypt.h assert.h 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1559: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:1571: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1564 "configure"
+#line 1576 "configure"
 #include "confdefs.h"
+
+#ifdef HAVE_STANDARDS_H
+# include <standards.h>
+#endif
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1595,17 +1611,21 @@ for ac_hdr in sys/stat.h sys/socket.h sy
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1599: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:1615: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1604 "configure"
+#line 1620 "configure"
 #include "confdefs.h"
+
+#ifdef HAVE_STANDARDS_H
+# include <standards.h>
+#endif
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1631,21 +1651,25 @@ else
 fi
 done
 
-for ac_hdr in signal.h sys/uio.h
+for ac_hdr in signal.h sys/uio.h mcheck.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1639: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo "configure:1659: checking for $ac_hdr" >&5
+if eval "test \"\${ac_cv_header_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1644 "configure"
+#line 1664 "configure"
 #include "confdefs.h"
+
+#ifdef HAVE_STANDARDS_H
+# include <standards.h>
+#endif
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1674,8 +1698,8 @@ done
 
 
   echo $ac_n "checking whether crypt needs over 10 characters""... $ac_c" 1>&6
-echo "configure:1678: checking whether crypt needs over 10 characters" >&5
-if eval "test \"`echo '$''{'ac_cv_unsafe_crypt'+set}'`\" = set"; then
+echo "configure:1702: checking whether crypt needs over 10 characters" >&5
+if eval "test \"\${ac_cv_unsafe_crypt+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
@@ -1690,7 +1714,7 @@ else
   ac_cv_unsafe_crypt=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1694 "configure"
+#line 1718 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE
@@ -1713,7 +1737,7 @@ int main(void)
 
 
 EOF
-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_unsafe_crypt=yes
 else
@@ -1740,12 +1764,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1744: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+echo "configure:1768: checking for working const" >&5
+if eval "test \"\${ac_cv_c_const+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1749 "configure"
+#line 1773 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1794,7 +1818,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:1798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1815,111 +1839,129 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:1819: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+echo "configure:1843: checking for pid_t" >&5
+if eval "test \"\${ac_cv_type_pid_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1824 "configure"
+#line 1848 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
+#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #endif
+#if HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  ac_cv_type_pid_t=yes
+  eval "ac_cv_type_pid_t=yes"
 else
   rm -rf conftest*
-  ac_cv_type_pid_t=no
+  eval "ac_cv_type_pid_t=no"
 fi
 rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
+if eval "test \"`echo '$ac_cv_type_'pid_t`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<EOF
 #define pid_t int
 EOF
 
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1852: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+echo "configure:1882: checking for size_t" >&5
+if eval "test \"\${ac_cv_type_size_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1857 "configure"
+#line 1887 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
+#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #endif
+#if HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  ac_cv_type_size_t=yes
+  eval "ac_cv_type_size_t=yes"
 else
   rm -rf conftest*
-  ac_cv_type_size_t=no
+  eval "ac_cv_type_size_t=no"
 fi
 rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
+if eval "test \"`echo '$ac_cv_type_'size_t`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<EOF
 #define size_t unsigned
 EOF
 
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:1885: checking for ssize_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+echo "configure:1921: checking for ssize_t" >&5
+if eval "test \"\${ac_cv_type_ssize_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1890 "configure"
+#line 1926 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
+#include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #endif
+#if HAVE_SYS_BITYPES_H
+#include <sys/bitypes.h>
+#endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  ac_cv_type_ssize_t=yes
+  eval "ac_cv_type_ssize_t=yes"
 else
   rm -rf conftest*
-  ac_cv_type_ssize_t=no
+  eval "ac_cv_type_ssize_t=no"
 fi
 rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_ssize_t" 1>&6
-if test $ac_cv_type_ssize_t = no; then
-  cat >> confdefs.h <<\EOF
+if eval "test \"`echo '$ac_cv_type_'ssize_t`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+  cat >> confdefs.h <<EOF
 #define ssize_t int
 EOF
 
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:1918: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+echo "configure:1960: checking whether time.h and sys/time.h may both be included" >&5
+if eval "test \"\${ac_cv_header_time+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1923 "configure"
+#line 1965 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -1928,7 +1970,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -1949,7 +1991,6 @@ EOF
 fi
 
 
-
 if test $ac_cv_header_netinet_in_h = no; then
   ac_cv_struct_in_addr = no
 else
@@ -1964,19 +2005,19 @@ EOF
   fi
 
   echo $ac_n "checking for struct in_addr""... $ac_c" 1>&6
-echo "configure:1968: checking for struct in_addr" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_in_addr'+set}'`\" = set"; then
+echo "configure:2009: checking for struct in_addr" >&5
+if eval "test \"\${ac_cv_struct_in_addr+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
    cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 2014 "configure"
 #include "confdefs.h"
 $headers
 int main() {
 struct in_addr tp; tp.s_addr;
 ; return 0; }
 EOF
-if { (eval echo configure:1980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_in_addr=yes
 else
@@ -2003,19 +2044,19 @@ if test $ac_cv_header_sys_socket_h = no;
   ac_cv_socklen_t = no;
 else
   echo $ac_n "checking for typedef socklen_t""... $ac_c" 1>&6
-echo "configure:2007: checking for typedef socklen_t" >&5
-if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
+echo "configure:2048: checking for typedef socklen_t" >&5
+if eval "test \"\${ac_cv_socklen_t+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
    cat > conftest.$ac_ext <<EOF
-#line 2012 "configure"
+#line 2053 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t sl; sl=0;
 ; return 0; }
 EOF
-if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_socklen_t=yes
 else
@@ -2039,12 +2080,12 @@ fi
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:2043: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+echo "configure:2084: checking return type of signal handlers" >&5
+if eval "test \"\${ac_cv_type_signal+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2048 "configure"
+#line 2089 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -2061,7 +2102,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:2065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -2079,18 +2120,181 @@ cat >> confdefs.h <<EOF
 EOF
 
 
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:2125: checking for vprintf" >&5
+if eval "test \"\${ac_cv_func_vprintf+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2130 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vprintf(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char vprintf();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
+choke me
+#else
+f = vprintf;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:2178: checking for _doprnt" >&5
+if eval "test \"\${ac_cv_func__doprnt+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2183 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char _doprnt();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
+choke me
+#else
+f = _doprnt;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+for ac_func in gettimeofday select snprintf strcasecmp strdup strerror stricmp strlcpy strncasecmp strnicmp strstr vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:2234: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2239 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
 
 ORIGLIBS=$LIBS
 LIBS="$LIBS $NETLIB"
 for ac_func in inet_addr inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2089: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo "configure:2293: checking for $ac_func" >&5
+if eval "test \"\${ac_cv_func_$ac_func+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2094 "configure"
+#line 2298 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2099,6 +2303,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -2108,12 +2313,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2140,18 +2345,16 @@ done
 LIBS=$ORIGLIBS
 
 
-ac_safe=`echo "accept" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo accept | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=accept;
 
-
 echo $ac_n "checking if accept is prototyped""... $ac_c" 1>&6
-echo "configure:2149: checking if accept is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2352: checking if accept is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2155 "configure"
+#line 2358 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2167,7 +2370,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2184,26 +2387,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_ACCEPT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "atoi" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo atoi | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=atoi;
 
 echo $ac_n "checking if atoi is prototyped""... $ac_c" 1>&6
-echo "configure:2201: checking if atoi is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2402: checking if atoi is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2207 "configure"
+#line 2408 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2219,7 +2420,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2236,26 +2437,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_ATOI_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "atol" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo atol | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=atol;
 
-
 echo $ac_n "checking if atol is prototyped""... $ac_c" 1>&6
-echo "configure:2253: checking if atol is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2452: checking if atol is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2259 "configure"
+#line 2458 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2271,7 +2470,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2288,26 +2487,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_ATOL_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "bind" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo bind | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=bind;
 
 echo $ac_n "checking if bind is prototyped""... $ac_c" 1>&6
-echo "configure:2305: checking if bind is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2502: checking if bind is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2311 "configure"
+#line 2508 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2323,7 +2520,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2340,26 +2537,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_BIND_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "bzero" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo bzero | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=bzero;
 
-
 echo $ac_n "checking if bzero is prototyped""... $ac_c" 1>&6
-echo "configure:2357: checking if bzero is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2552: checking if bzero is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2363 "configure"
+#line 2558 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2375,7 +2570,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2392,26 +2587,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_BZERO_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "chdir" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo chdir | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=chdir;
 
 echo $ac_n "checking if chdir is prototyped""... $ac_c" 1>&6
-echo "configure:2409: checking if chdir is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2602: checking if chdir is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2415 "configure"
+#line 2608 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2427,7 +2620,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2444,26 +2637,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_CHDIR_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "close" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo close | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=close;
 
-
 echo $ac_n "checking if close is prototyped""... $ac_c" 1>&6
-echo "configure:2461: checking if close is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2652: checking if close is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2467 "configure"
+#line 2658 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2479,7 +2670,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2496,26 +2687,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_CLOSE_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "crypt" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo crypt | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=crypt;
 
 echo $ac_n "checking if crypt is prototyped""... $ac_c" 1>&6
-echo "configure:2513: checking if crypt is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2702: checking if crypt is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2519 "configure"
+#line 2708 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2531,7 +2720,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2548,26 +2737,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_CRYPT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "fclose" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fclose | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=fclose;
 
-
 echo $ac_n "checking if fclose is prototyped""... $ac_c" 1>&6
-echo "configure:2565: checking if fclose is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2752: checking if fclose is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2571 "configure"
+#line 2758 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2583,7 +2770,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2600,26 +2787,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FCLOSE_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "fcntl" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fcntl | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=fcntl;
 
 echo $ac_n "checking if fcntl is prototyped""... $ac_c" 1>&6
-echo "configure:2617: checking if fcntl is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2802: checking if fcntl is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2623 "configure"
+#line 2808 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2635,7 +2820,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2652,26 +2837,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FCNTL_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "fflush" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fflush | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=fflush;
 
-
 echo $ac_n "checking if fflush is prototyped""... $ac_c" 1>&6
-echo "configure:2669: checking if fflush is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2852: checking if fflush is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
+#line 2858 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2687,7 +2870,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2704,26 +2887,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FFLUSH_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "fprintf" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fprintf | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=fprintf;
 
 echo $ac_n "checking if fprintf is prototyped""... $ac_c" 1>&6
-echo "configure:2721: checking if fprintf is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2902: checking if fprintf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2727 "configure"
+#line 2908 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2739,7 +2920,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2756,26 +2937,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FPRINTF_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "fputc" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fputc | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=fputc;
 
-
 echo $ac_n "checking if fputc is prototyped""... $ac_c" 1>&6
-echo "configure:2773: checking if fputc is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:2952: checking if fputc is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2779 "configure"
+#line 2958 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2791,7 +2970,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2808,26 +2987,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FPUTC_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "fputs" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fputs | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=fputs;
 
 echo $ac_n "checking if fputs is prototyped""... $ac_c" 1>&6
-echo "configure:2825: checking if fputs is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3002: checking if fputs is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2831 "configure"
+#line 3008 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2843,7 +3020,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2860,26 +3037,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FPUTS_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "fread" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fread | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=fread;
 
-
 echo $ac_n "checking if fread is prototyped""... $ac_c" 1>&6
-echo "configure:2877: checking if fread is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3052: checking if fread is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2883 "configure"
+#line 3058 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2895,7 +3070,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2912,26 +3087,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FREAD_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "fscanf" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fscanf | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=fscanf;
 
 echo $ac_n "checking if fscanf is prototyped""... $ac_c" 1>&6
-echo "configure:2929: checking if fscanf is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3102: checking if fscanf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2935 "configure"
+#line 3108 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2947,7 +3120,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -2964,26 +3137,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FSCANF_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "fseek" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fseek | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=fseek;
 
-
 echo $ac_n "checking if fseek is prototyped""... $ac_c" 1>&6
-echo "configure:2981: checking if fseek is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3152: checking if fseek is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 2987 "configure"
+#line 3158 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -2999,7 +3170,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3016,26 +3187,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FSEEK_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "fwrite" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo fwrite | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=fwrite;
 
 echo $ac_n "checking if fwrite is prototyped""... $ac_c" 1>&6
-echo "configure:3033: checking if fwrite is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3202: checking if fwrite is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3039 "configure"
+#line 3208 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3051,7 +3220,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3068,26 +3237,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_FWRITE_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "getpeername" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo getpeername | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=getpeername;
 
-
 echo $ac_n "checking if getpeername is prototyped""... $ac_c" 1>&6
-echo "configure:3085: checking if getpeername is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3252: checking if getpeername is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3091 "configure"
+#line 3258 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3103,7 +3270,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3120,26 +3287,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_GETPEERNAME_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "getpid" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo getpid | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=getpid;
 
 echo $ac_n "checking if getpid is prototyped""... $ac_c" 1>&6
-echo "configure:3137: checking if getpid is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3302: checking if getpid is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3143 "configure"
+#line 3308 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3155,7 +3320,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3172,26 +3337,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_GETPID_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "getrlimit" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo getrlimit | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=getrlimit;
 
-
 echo $ac_n "checking if getrlimit is prototyped""... $ac_c" 1>&6
-echo "configure:3189: checking if getrlimit is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3352: checking if getrlimit is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3195 "configure"
+#line 3358 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3207,7 +3370,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3224,26 +3387,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_GETRLIMIT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "getsockname" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo getsockname | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=getsockname;
 
 echo $ac_n "checking if getsockname is prototyped""... $ac_c" 1>&6
-echo "configure:3241: checking if getsockname is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3402: checking if getsockname is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3247 "configure"
+#line 3408 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3259,7 +3420,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3276,26 +3437,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_GETSOCKNAME_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "gettimeofday" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo gettimeofday | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=gettimeofday;
 
-
 echo $ac_n "checking if gettimeofday is prototyped""... $ac_c" 1>&6
-echo "configure:3293: checking if gettimeofday is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3452: checking if gettimeofday is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3299 "configure"
+#line 3458 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3311,7 +3470,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3328,26 +3487,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_GETTIMEOFDAY_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "htonl" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo htonl | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=htonl;
 
 echo $ac_n "checking if htonl is prototyped""... $ac_c" 1>&6
-echo "configure:3345: checking if htonl is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3502: checking if htonl is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3351 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3363,7 +3520,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3380,26 +3537,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_HTONL_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "htons" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo htons | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=htons;
 
-
 echo $ac_n "checking if htons is prototyped""... $ac_c" 1>&6
-echo "configure:3397: checking if htons is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3552: checking if htons is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3403 "configure"
+#line 3558 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3415,7 +3570,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3432,26 +3587,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_HTONS_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "inet_addr" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo inet_addr | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=inet_addr;
 
 echo $ac_n "checking if inet_addr is prototyped""... $ac_c" 1>&6
-echo "configure:3449: checking if inet_addr is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3602: checking if inet_addr is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3455 "configure"
+#line 3608 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3467,7 +3620,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3484,26 +3637,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_INET_ADDR_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "inet_aton" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo inet_aton | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=inet_aton;
 
-
 echo $ac_n "checking if inet_aton is prototyped""... $ac_c" 1>&6
-echo "configure:3501: checking if inet_aton is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3652: checking if inet_aton is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3507 "configure"
+#line 3658 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3519,7 +3670,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3536,26 +3687,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_INET_ATON_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "inet_ntoa" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo inet_ntoa | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=inet_ntoa;
 
 echo $ac_n "checking if inet_ntoa is prototyped""... $ac_c" 1>&6
-echo "configure:3553: checking if inet_ntoa is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3702: checking if inet_ntoa is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3559 "configure"
+#line 3708 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3571,7 +3720,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3588,26 +3737,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_INET_NTOA_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "listen" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo listen | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=listen;
 
-
 echo $ac_n "checking if listen is prototyped""... $ac_c" 1>&6
-echo "configure:3605: checking if listen is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3752: checking if listen is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3611 "configure"
+#line 3758 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3623,7 +3770,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3627: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3640,26 +3787,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_LISTEN_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "ntohl" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo ntohl | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=ntohl;
 
 echo $ac_n "checking if ntohl is prototyped""... $ac_c" 1>&6
-echo "configure:3657: checking if ntohl is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3802: checking if ntohl is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3663 "configure"
+#line 3808 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3675,7 +3820,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3692,26 +3837,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_NTOHL_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "perror" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo perror | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=perror;
 
-
 echo $ac_n "checking if perror is prototyped""... $ac_c" 1>&6
-echo "configure:3709: checking if perror is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3852: checking if perror is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3715 "configure"
+#line 3858 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3727,7 +3870,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3744,26 +3887,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_PERROR_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "printf" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo printf | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=printf;
 
 echo $ac_n "checking if printf is prototyped""... $ac_c" 1>&6
-echo "configure:3761: checking if printf is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3902: checking if printf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3767 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3779,7 +3920,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3796,26 +3937,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_PRINTF_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "qsort" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo qsort | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=qsort;
 
-
 echo $ac_n "checking if qsort is prototyped""... $ac_c" 1>&6
-echo "configure:3813: checking if qsort is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:3952: checking if qsort is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3819 "configure"
+#line 3958 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3831,7 +3970,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3848,26 +3987,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_QSORT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "read" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo read | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=read;
 
 echo $ac_n "checking if read is prototyped""... $ac_c" 1>&6
-echo "configure:3865: checking if read is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4002: checking if read is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3871 "configure"
+#line 4008 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3883,7 +4020,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3900,26 +4037,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_READ_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "remove" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo remove | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=remove;
 
 echo $ac_n "checking if remove is prototyped""... $ac_c" 1>&6
-echo "configure:3917: checking if remove is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4052: checking if remove is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3923 "configure"
+#line 4058 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3935,7 +4070,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -3952,26 +4087,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_REMOVE_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "rewind" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo rewind | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=rewind;
 
 echo $ac_n "checking if rewind is prototyped""... $ac_c" 1>&6
-echo "configure:3969: checking if rewind is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4102: checking if rewind is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 3975 "configure"
+#line 4108 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -3987,7 +4120,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4004,26 +4137,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_REWIND_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "select" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo select | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=select;
 
 echo $ac_n "checking if select is prototyped""... $ac_c" 1>&6
-echo "configure:4021: checking if select is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4152: checking if select is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4027 "configure"
+#line 4158 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4039,7 +4170,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4056,26 +4187,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SELECT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "setitimer" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo setitimer | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=setitimer;
 
 echo $ac_n "checking if setitimer is prototyped""... $ac_c" 1>&6
-echo "configure:4073: checking if setitimer is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4202: checking if setitimer is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4079 "configure"
+#line 4208 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4091,7 +4220,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4108,26 +4237,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SETITIMER_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "setrlimit" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo setrlimit | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=setrlimit;
 
 echo $ac_n "checking if setrlimit is prototyped""... $ac_c" 1>&6
-echo "configure:4125: checking if setrlimit is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4252: checking if setrlimit is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4131 "configure"
+#line 4258 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4143,7 +4270,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4160,26 +4287,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SETRLIMIT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "setsockopt" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo setsockopt | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=setsockopt;
 
 echo $ac_n "checking if setsockopt is prototyped""... $ac_c" 1>&6
-echo "configure:4177: checking if setsockopt is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4302: checking if setsockopt is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4183 "configure"
+#line 4308 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4195,7 +4320,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4212,26 +4337,74 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SETSOCKOPT_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
+
+ac_safe=snprintf;
+
+echo $ac_n "checking if snprintf is prototyped""... $ac_c" 1>&6
+echo "configure:4352: checking if snprintf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4358 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef snprintf
+  error - already defined!
+#endif
+void snprintf(int a, char b, int c, char d, int e, char f, int g, char h);
 
-ac_safe=`echo "socket" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo socket | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+int main() {
 
+; return 0; }
+EOF
+if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
 
+fi
+
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_SNPRINTF_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=socket;
+
 echo $ac_n "checking if socket is prototyped""... $ac_c" 1>&6
-echo "configure:4229: checking if socket is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4402: checking if socket is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4235 "configure"
+#line 4408 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4247,7 +4420,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4264,26 +4437,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SOCKET_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "sprintf" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo sprintf | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=sprintf;
 
 echo $ac_n "checking if sprintf is prototyped""... $ac_c" 1>&6
-echo "configure:4281: checking if sprintf is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4452: checking if sprintf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4287 "configure"
+#line 4458 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4299,7 +4470,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4316,26 +4487,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SPRINTF_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "sscanf" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo sscanf | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=sscanf;
 
 echo $ac_n "checking if sscanf is prototyped""... $ac_c" 1>&6
-echo "configure:4333: checking if sscanf is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4502: checking if sscanf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4339 "configure"
+#line 4508 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4351,7 +4520,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4368,26 +4537,124 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SSCANF_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=strcasecmp;
+
+echo $ac_n "checking if strcasecmp is prototyped""... $ac_c" 1>&6
+echo "configure:4552: checking if strcasecmp is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4558 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef strcasecmp
+  error - already defined!
+#endif
+void strcasecmp(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
 EOF
+if { (eval echo configure:4574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
+
 
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRCASECMP_PROTO 
+EOF
+
   echo "$ac_t""no" 1>&6
 fi
 
+
+ac_safe=strdup;
+
+echo $ac_n "checking if strdup is prototyped""... $ac_c" 1>&6
+echo "configure:4602: checking if strdup is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4608 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef strdup
+  error - already defined!
+#endif
+void strdup(int a, char b, int c, char d, int e, char f, int g, char h);
 
-ac_safe=`echo "strerror" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo strerror | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+int main() {
 
+; return 0; }
+EOF
+if { (eval echo configure:4624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
 
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRDUP_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=strerror;
+
 echo $ac_n "checking if strerror is prototyped""... $ac_c" 1>&6
-echo "configure:4385: checking if strerror is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4652: checking if strerror is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4391 "configure"
+#line 4658 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4403,7 +4670,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4407: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4420,26 +4687,224 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_STRERROR_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=stricmp;
+
+echo $ac_n "checking if stricmp is prototyped""... $ac_c" 1>&6
+echo "configure:4702: checking if stricmp is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4708 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef stricmp
+  error - already defined!
+#endif
+void stricmp(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
+
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRICMP_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=strlcpy;
+
+echo $ac_n "checking if strlcpy is prototyped""... $ac_c" 1>&6
+echo "configure:4752: checking if strlcpy is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4758 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef strlcpy
+  error - already defined!
+#endif
+void strlcpy(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
+
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRLCPY_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=strncasecmp;
+
+echo $ac_n "checking if strncasecmp is prototyped""... $ac_c" 1>&6
+echo "configure:4802: checking if strncasecmp is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4808 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef strncasecmp
+  error - already defined!
+#endif
+void strncasecmp(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
+
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRNCASECMP_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
+
+ac_safe=strnicmp;
+
+echo $ac_n "checking if strnicmp is prototyped""... $ac_c" 1>&6
+echo "configure:4852: checking if strnicmp is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 4858 "configure"
+#include "confdefs.h"
+
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef strnicmp
+  error - already defined!
+#endif
+void strnicmp(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
 
-ac_safe=`echo "system" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo system | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_STRNICMP_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=system;
 
 echo $ac_n "checking if system is prototyped""... $ac_c" 1>&6
-echo "configure:4437: checking if system is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4902: checking if system is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4443 "configure"
+#line 4908 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4455,7 +4920,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4472,26 +4937,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_SYSTEM_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
-
-ac_safe=`echo "time" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo time | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
 
+ac_safe=time;
 
 echo $ac_n "checking if time is prototyped""... $ac_c" 1>&6
-echo "configure:4489: checking if time is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:4952: checking if time is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4495 "configure"
+#line 4958 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4507,7 +4970,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4524,26 +4987,24 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_TIME_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "unlink" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo unlink | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=unlink;
 
-
 echo $ac_n "checking if unlink is prototyped""... $ac_c" 1>&6
-echo "configure:4541: checking if unlink is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:5002: checking if unlink is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4547 "configure"
+#line 5008 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4559,7 +5020,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4576,26 +5037,74 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_UNLINK_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
 fi
 
 
-ac_safe=`echo "write" | sed 'y%./+-%__p_%'`
-ac_proto=NEED_`echo write | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO
+ac_safe=vsnprintf;
 
+echo $ac_n "checking if vsnprintf is prototyped""... $ac_c" 1>&6
+echo "configure:5052: checking if vsnprintf is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  #
+cat > conftest.$ac_ext <<EOF
+#line 5058 "configure"
+#include "confdefs.h"
 
+#define NO_LIBRARY_PROTOTYPES
+#define __COMM_C__
+#define __ACT_OTHER_C__
+#include "src/sysdep.h"
+#ifdef vsnprintf
+  error - already defined!
+#endif
+void vsnprintf(int a, char b, int c, char d, int e, char f, int g, char h);
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:5074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=no"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_prototype_$ac_safe=yes"
+fi
+rm -f conftest*
+
+fi
+
+
+if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+else
+  cat >> confdefs.h <<\EOF
+#define NEED_VSNPRINTF_PROTO 
+EOF
+
+  echo "$ac_t""no" 1>&6
+fi
+
+
+ac_safe=write;
+
 echo $ac_n "checking if write is prototyped""... $ac_c" 1>&6
-echo "configure:4593: checking if write is prototyped" >&5
-if eval "test \"`echo '$''{'ac_cv_prototype_$ac_safe'+set}'`\" = set"; then
+echo "configure:5102: checking if write is prototyped" >&5
+if eval "test \"\${ac_cv_prototype_$ac_safe+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   #
 cat > conftest.$ac_ext <<EOF
-#line 4599 "configure"
+#line 5108 "configure"
 #include "confdefs.h"
 
 #define NO_LIBRARY_PROTOTYPES
@@ -4611,7 +5120,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4615: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:5124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_prototype_$ac_safe=no"
 else
@@ -4628,8 +5137,8 @@ fi
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 else
-  cat >> confdefs.h <<EOF
-#define $ac_proto 1
+  cat >> confdefs.h <<\EOF
+#define NEED_WRITE_PROTO 
 EOF
 
   echo "$ac_t""no" 1>&6
@@ -4726,7 +5235,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14.1"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -4986,7 +5495,7 @@ exit 0
 EOF
 chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+test "$no_create" = yes || $SHELL $CONFIG_STATUS || exit 1
 
 #
 echo "Configuration completed.  To compile, type:  cd src; make"
Index: cnf/aclocal.m4
===================================================================
RCS file: /home/circledb/.cvs/circle/cnf/aclocal.m4,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- cnf/aclocal.m4	1998/10/24 03:30:54	1.5
+++ cnf/aclocal.m4	2002/03/20 22:23:11	1.6
@@ -1,20 +1,6 @@
-define(MAKE_PROTO_SAFE, `echo "$1" | sed 'y%./+-%__p_%'`)
-define(MAKE_PROTO_NAME, [dnl
-changequote({, })dnl
-{NEED_`echo $1 | sed 's/[^a-zA-Z0-9_]/_/g' | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`_PROTO}
-changequote([, ])dnl
-])
-
-ifdef([AC_AUTOHEADER],
-[
-  define(AC_CHECK_PROTO, [@@@protos="$protos $1"@@@])
-],
-[
 AC_DEFUN(AC_CHECK_PROTO,
 [
-dnl Do the transliteration at runtime so arg 1 can be a shell variable.
-ac_safe=MAKE_PROTO_SAFE($1)
-ac_proto=MAKE_PROTO_NAME($1)
+ac_safe=translit($1, './+-', '__p_');
 
 AC_MSG_CHECKING([if $1 is prototyped])
 AC_CACHE_VAL(ac_cv_prototype_$ac_safe, [#
@@ -35,14 +21,14 @@ eval "ac_cv_prototype_$ac_safe=no",eval 
 if eval "test \"`echo '$ac_cv_prototype_'$ac_safe`\" = yes"; then
   AC_MSG_RESULT(yes)
 else
-  AC_DEFINE_UNQUOTED($ac_proto)
+  AC_DEFINE(builtin(format, NEED_%s_PROTO, translit($1, 'a-z', 'A-Z')), , Check for a prototype to $1.)
   AC_MSG_RESULT(no)
 fi
 ])
-])
 
 dnl @@@t1="MAKE_PROTO_SAFE($1)"; t2="MAKE_PROTO_NAME($t1)"; literals="$literals $t2"@@@])
 
+
 AC_DEFUN(AC_UNSAFE_CRYPT, [
   AC_CACHE_CHECK([whether crypt needs over 10 characters], ac_cv_unsafe_crypt, [
     if test ${ac_cv_header_crypt_h-no} = yes; then
@@ -82,4 +68,3 @@ if test ${ac_cv_lib_crypt_crypt-no} = ye
   LIBS=$ORIGLIBS
 fi
 ])
-
Index: cnf/configure.in
===================================================================
RCS file: /home/circledb/.cvs/circle/cnf/configure.in,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- cnf/configure.in	1999/08/02 00:24:06	1.14
+++ cnf/configure.in	2002/04/16 02:23:06	1.16
@@ -85,7 +85,7 @@ AC_CHECK_HEADERS(fcntl.h sys/fcntl.h err
 AC_CHECK_HEADERS(limits.h sys/time.h sys/select.h sys/types.h unistd.h)
 AC_CHECK_HEADERS(memory.h crypt.h assert.h arpa/telnet.h arpa/inet.h)
 AC_CHECK_HEADERS(sys/stat.h sys/socket.h sys/resource.h netinet/in.h netdb.h)
-AC_CHECK_HEADERS(signal.h sys/uio.h)
+AC_CHECK_HEADERS(signal.h sys/uio.h mcheck.h)
 
 AC_UNSAFE_CRYPT
 
@@ -96,8 +96,6 @@ AC_TYPE_SIZE_T
 AC_CHECK_TYPE(ssize_t, int)
 AC_HEADER_TIME
 
-dnl Check for the 'typedef socklen_t' definition. Even uglier, yes.
-
 dnl Check for the 'struct in_addr' definition. Ugly, yes.
 if test $ac_cv_header_netinet_in_h = no; then
   ac_cv_struct_in_addr = no
@@ -136,6 +134,8 @@ fi
 
 dnl Checks for library functions.
 AC_TYPE_SIGNAL
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS(gettimeofday select snprintf strcasecmp strdup strerror stricmp strlcpy strncasecmp strnicmp strstr vsnprintf)
 
 dnl Check for functions that parse IP addresses
 ORIGLIBS=$LIBS
@@ -184,13 +184,21 @@ AC_CHECK_PROTO(select)
 AC_CHECK_PROTO(setitimer)
 AC_CHECK_PROTO(setrlimit)
 AC_CHECK_PROTO(setsockopt)
+AC_CHECK_PROTO(snprintf)
 AC_CHECK_PROTO(socket)
 AC_CHECK_PROTO(sprintf)
 AC_CHECK_PROTO(sscanf)
+AC_CHECK_PROTO(strcasecmp)
+AC_CHECK_PROTO(strdup)
 AC_CHECK_PROTO(strerror)
+AC_CHECK_PROTO(stricmp)
+AC_CHECK_PROTO(strlcpy)
+AC_CHECK_PROTO(strncasecmp)
+AC_CHECK_PROTO(strnicmp)
 AC_CHECK_PROTO(system)
 AC_CHECK_PROTO(time)
 AC_CHECK_PROTO(unlink)
+AC_CHECK_PROTO(vsnprintf)
 AC_CHECK_PROTO(write)
 
 AC_OUTPUT(src/Makefile src/util/Makefile)
Index: doc/README.CYGWIN
===================================================================
RCS file: /home/circledb/.cvs/circle/doc/README.CYGWIN,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- doc/README.CYGWIN	2001/08/29 15:39:56	1.6
+++ doc/README.CYGWIN	2002/01/16 03:11:09	1.7
@@ -39,8 +39,9 @@ another form of Unix:
    gunzip which come with the full Cygwin package.
 
 4) Start the "bash" shell and go to the directory where you have extracted
-   CircleMUD (we will assume "C:\circle30bpl20", or "/circle30bpl20" from
-   within bash).  DO NOT go into the "src" directory yet.
+   CircleMUD (we will assume "C:\circle30bplXX", or "/circle30bplXX" from
+   within bash, where 'XX' is the current patchlevel).  DO NOT go into the
+   "src" directory yet.
 
 5) Run the shell script "./configure".  This will automatically detect
    whether or not certain programs and library functions are available, and
@@ -51,9 +52,10 @@ another form of Unix:
    an executable, you can also try "sh configure", "sh ./configure",
    "bash configure" and "bash ./configure" until one of them works.
 
-6) NOW change to the /circle30bpl20/src directory, and type "make", and watch
+6) NOW change to the /circle30bplXX/src directory, and type "make", and watch
    CircleMUD and the additional utilies included in the Circle distribution
-   automatically being compiled and placed in /circle30bpl20/bin.
+   automatically being compiled and placed in /circle30bplXX/bin. (Remember,
+   'XX' is the current patchlevel number, e.g., 'circle30bpl20'.)
 
 7) Make sure your TCP/IP stack is installed, correctly configured, and running.
    If you are already using TCP/IP applications from your Windows machine such
@@ -68,7 +70,7 @@ another form of Unix:
    YOU MUST INSTALL AND CONFIGURE YOUR TCP/IP STACK, EVEN IF YOU ARE NOT 
    CONNECTED TO THE INTERNET.
 
-8) Go back to /circle30bpl20, and run the MUD either directly by typing
+8) Go back to /circle30bplXX, and run the MUD either directly by typing
    "bin/circle", or by using the "./autorun" script.
 
 9) Start a telnet program (SEE NOTE BELOW).  Open a connection to your
Index: doc/sources/FAQ.tex
===================================================================
RCS file: FAQ.tex
diff -N FAQ.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsvUh7cy	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,618 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+\usepackage{times}
+\usepackage{varioref}
+% Document typeset from the original document that was typeset by Alex Fletcher.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{0pt}
+
+\title{Frequently Asked Questions (FAQ) for CircleMUD with Answers}
+\author{Alex Fletcher\\
+\texttt{furry@circlemud.org}}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This file is intended to cover common questions related to the CircleMUD distribution source by
+Jeremy Elson \url{<http://www.circlemud.org/~jelson/>} and not general DikuMud questions.  Any contributions and corrections are more than welcome.  It is currently maintained by Alex Fletcher (aka Furry) \url{<furry@circlemud.org>} Please direct corrections to this address.  The original author was Ryan Watkins (aka VampLestat).\par
+More information about CircleMUD, including up-to-date versions of this documentation in ASCII and Postscript, can be found at the CircleMUD Home Page \url{<http://www.circlemud.org/>} or the FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}.
+\end{abstract}
+
+\tableofcontents
+
+\section{Introduction}
+\subsection{I've never played a MUD before.  What should I do?}
+Do not try to use your own copy of CircleMUD! There are two levels of MUD users: players and administrators.  Administrators do what you're trying to do now -- get a copy of a MUD's source code, compile it, and run it. Players use MUDs that are being administered by someone else.  If you try to actually run a MUD before you've ever played one, you'll get very confused indeed! Your best bet for now is to play someone else's MUD first.  There are a large number of excellent MUDs out there already, some of which are based on CircleMUD code.  A good place to start looking is the Mud Connector \url{<http://www.mudconnect.com/>}. The CircleMUD web server also has a smaller CircleMUD Site List \url{<http://www.circlemud.org/sites.shtml>}.
+
+\subsection{I'm new to C and/or coding. What do I do?}
+First, a Mud is not a learning project. It has thousands of lines to it many of which are obscure and unclear to even moderately skilled programmers. Those little, ``Hello, world,'' programs are for learning, maybe little math tests, etc. A Mud is a pretty ambitious project to start with. That is like trying to run before you can walk, and while there's more difficult things than a mud to start with, there's a ton of easier things you should start with.
+\par
+Second, if you are persistent, get a good C reference book and read the code, try to comprehend what everything is doing (to some small extent). You should probably avoid \texttt{comm.c} as it is home to the socket functions which general C books don't cover and are usually explained in other books on network programming.
+For some good resources to learn C, see Question 18.9 in the C FAQ \url{<http://www.eskimo.com/~scs/C-faq/top.html>}.
+\par
+Third, try small projects, something similar to what already exists. This way, you can get away with a cut-and-paste job and changing some of the code. Adding a simple version of races is not all that difficult, just examine the class code in \texttt{class.c} and the \texttt{CON\_QCLASS} block in \texttt{interpreter.c}, cut, paste, and modify. Also look at \texttt{structs.h}, for \texttt{\#define CLASS\_} You'll begin understanding more and more of the code as you copy and change it, eventually you'll be able to write a whole function by yourself. Spend time learning, going with haste will hurt you more than it will help you.
+\par
+Remember that if you attempt to run a mud without knowing how to program in C, you will fail.  Your mud will remain a stock mud, your friends will not play, and you will annoy off anyone you ask for help when you repeatedly show no drive to learn how to do it yourself.
+
+\subsection{I want to build my own mud.  Where do I start?}
+Many common questions arise from new mud admins.  It is a good idea to pay attention to them and take their answers to heart.  These include things like the following:
+\par
+{\em I don't have any coding experience with MUDs, but do have a lot of ideas for my own.  I have played many MUDs for a LONG time, though.}
+\par
+Read the FAQ.  Mud Experience doesn't help a huge amount.  Code experience does.
+\par
+{\em I am interested in having a level system of 1-50 mortal and 51-60 imms.  I am also interested in adding races and classes. How can I accomplish these things?}
+\par
+By checking the FTP Site under the contrib tree \url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/>}.  Learn a lot from there.  Especially the \texttt{code/} subdirectory.  Above all, {\em know} the FAQ.
+\par
+{\em Also, is there anything that I should know about CircleMUD being a ``newbie'' to it?}
+\par
+See the above comment.
+
+\subsection{What is CircleMUD?}
+CircleMUD is a DikuMud derivative, developed by Jeremy Elson \url{<jelson@circlemud.org>}
+and is from the Gamma v0.0 of DikuMud created by Hans Henrik Staerfeldt, Katja Nyboe, Tom
+Madsen, Michael Seifert and Sebastian Hammer at DIKU (Computer Science Instutute at Copenhagen University).  Note that CircleMUD is a Diku derivative, so its users must follow the DIKU license agreement -- most notably that it cannot be used to make money in {\em ANY} way, the original developers' names must be in the login screen that the \texttt{credits} command always presents the same information, etc.\newline
+Quoting from CircleMUD's \texttt{release.doc}:
+\begin{quote}
+``CircleMUD is highly developed from the programming side, but highly UNdeveloped on the game-playing side.  So, if you're looking for a huge MUD with billions of spells, skills, classes, races, and areas, Circle will probably disappoint you severely.  Circle still has only the 4 original Diku classes, the original spells, the original skills, and about a couple dozen areas. On the other hand, if you're looking for a highly stable, well-developed, well-organized ``blank slate'' MUD on which you can put your OWN ideas for spells, skills, classes, and areas, then Circle might be just what you're looking for.''
+\end{quote}
+The latest full production release of Circle is 2.20, released on November 17, 1993.  
+Currently 3.0 is in beta, at patch level 20, released on January 15, 2002.
+
+\subsection{What is the history of CircleMUD?}
+\begin{itemize}
+\item Version 2.00: July 16, 1993
+\item Version 2.01: July 20, 1993
+\item Version 2.02: Early August
+\item Version 2.10: September 1, 1993
+\item Version 2.11: September 19, 1993
+\item Version 2.20: November 17, 1993
+\end{itemize}
+Version 3.00 is currently in beta right now and is up to patchlevel 19. The final release is due out Real Soon Now(tm).  Don't bother posting requests for it.  It will be out when the CircleMUD group gets it done, and it will be announced on the mailing list and the newsgroup \texttt{rec.games.mud.diku}.
+
+\subsection{Where is the original CircleMUD so I can check it out?}
+CircleMUD is a public code base, freely distributable, but the authors of Circle do not actually run one personally.  There used to be CircleMUD, and while the CircleMUD group continues to develop it, there is no original CircleMUD any more.  To see other MUDs that are using the CircleMUD code base, check out the CircleMUD Site List \url{<http://www.circlemud.org/sites.shtml>}.
+
+\subsection{What is UNIX?}
+UNIX is not an operating system of itself, it's a type (flavour, if you will) of operating systems. Many different kinds of UNIXes exist. Some of them are free, some of them are not. How to tell if you have a UNIX operating system? Well, UNIXes have the `ps' command, tend to have a `\%' or `\#' prompt, give you a home directory, `who' will show who else is on the system, etc. Many UNIX systems (such as Linux) strive to be POSIX compatible, so you'll probably see POSIX mentioned, too. POSIX is, roughly, the standards which UNIX operating systems go by. It says what makes an operating system part of the UNIX family and so forth. Some UNIX operating systems are not 100\% POSIX compatible, actually, most aren't. The following are types of UNIX (but not all the existing flavours): Linux, FreeBSD, BSD, BSDi, Solaris. There are others. UNIX operating systems are command-based and Microsoft does not make a variant.
+
+\section{Resources}
+\subsection{Where do I find the source code for CircleMUD?}
+Circle's complete source code and areas are available for anonymous FTP at the CircleMUD FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}.  There is also a CircleMUD homepage \url{<http://www.circlemud.org/>} for more CircleMUD information.  The Ceramic Mouse \url{<http://developer.circlemud.org/>} presents an alternate interface to the FTP site.
+\par
+If you cannot use FTP or interact with the FTP server using Ceramic Mouse, you can contact one of the site maintainers \url{<circleftp@circlemud.org>} and request a file.
+
+\subsection{Where do I find areas, etc. for CircleMUD?}
+A number of CircleMUD based Implementors have submitted areas to the public and they are
+archived at the same site as the CircleMUD source \url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/areas/>}.   There used to be a separate Code Snippet site, but that has since be rolled into the main FTP server to present everything in one central location.
+
+\subsection{I have questions about CircleMUD.  Where should I go?}
+If you have general questions about the MUD such as how to get it running, how to add new spells, how to add new skills, etc., the first place you should look is the documentation. `coding.doc' will have information about how to add new spells, skills, commands, etc.  `building.doc' has
+information about how to create new worlds, how to read the database files, etc. There are many other documents in the doc directory with useful information. 
+\par
+There is also a new project, started in June of 1996, called the CircleMUD Documentation Project \url{<http://www.circlemud.org/cdp/>} which will eventually be a repository for all Circle-related information.  It is still being built as of this writing, but hopefully will become a valuable resource as more documentation is added.
+\par
+If you still have questions {\em after} reading the documentation, you can try asking on the CircleMUD mailing list (see next section).
+\par
+If you have a question you think is too ``newbie'' for the mailing list, try the help database \url{<http://bugs.circlemud.org/>}.  You can ask questions by sending mail to the help administrators \url{<help@circlemud.org>}.  The webpage database is also, incidentally, where you should go to report bugs (also done by sending mail \url{<bugs@circlemud.org>}).
+
+\subsection{So, what's this about a mailing list?}\label{mailinglist}
+There is a CircleMUD mailing list for coders, builders, and administrators.  This list is for the discussion of CircleMUD, and not a place to learn C.
+\par
+To subscribe, send a message to the list server \url{<listserv@post.queensu.ca>} with a message body of \texttt{subscribe circle $<$first name$>$ $<$last name$>$}.
+\par
+To unsubscribe from the list send a message to the same address with the words \texttt{unsubscribe circle} as the message body. {\em DO NOT} send unsubscription requests to the list in general.  There are hundreds of people on the list, and it will only irritate a ton of people who have no power to remove you from the list.  Read the Mailing List FAQ \url{<http://qsilver.queensu.ca/~fletchra/Circle/list-faq.html>} for more information.
+
+\subsection{To what platforms has CircleMUD been ported?}
+Version 3.0, although still officially in beta-testing, is very portable because it uses the GNU autoconf system, meaning you only need to type ``configure'' to have it automatically determine various features of your system and configure the code accordingly. 3.0 compiles without changes under most BSD and SVR4 systems, including SunOS, Solaris, Ultrix, IRIX, AIX, Linux, BSD/OS, HP/UX, Mac OS X, and others.
+\par
+Version 3.0 is also being ported to various non-UNIX platforms.  As of patchlevel 14, you can compile Circle under OS/2 2.x and 3.x with the OS/2 port of gcc, Windows 95/NT using Microsoft Visual C++ versions 4.0 through 6.0, Borland (now Inprise) C++ 4.5, Watcom v.11, Cygnus GNU-WIN32, LCC, Macintosh OS 9 (and earlier) with CodeWarrior, Amiga, and Acorn RiscOS.
+\par
+The older version of the code, Version 2.20, compiles mainly on BSD UNIX systems but has some trouble under SVR4-based systems such as Solaris.  The authors have personally compiled and tested v2.20 under Ultrix 4.0, IRIX 4.0.1, 4.0.4 and 4.0.5, SunOS 4.1.1 and 4.1.3, AIX 3.2, Linux 0.99.x and 1.0.x, and ConvexOS V10.2.  Users have reported that v2.20 compiles with relatively minor changes under NeXTStep 2.1 and 3.0, and HP/UX 9.0.
+\par
+Jean-Jack Riethoven \url{<J.J.M.Riethoven@ab.agro.nl>} ported CircleMUD version 2.20 to the Amiga and has contributed his code for version 3.0 of CircleMUD.  Questions about the Amiga source should be directed to Jean-Jack Riethoven, not the CircleMUD group.
+
+\subsection{How can I submit code or areas for use with CircleMUD?}
+There is a special uploads area \url{<ftp://upload.circlemud.org/pub/CircleMUD/incoming>}
+on the CircleMUD ftp server for submissions of code, areas, utilities, scripts, and anything else that might be of use to CircleMUD users.  When uploading anything, you should be certain to send a piece of email to the site maintainers \url{<circleftp@circlemud.org>} indicating what you uploaded, what it is, and where it should be placed. These portions of code or areas will probably not be added to the full release of CircleMUD unless you make specific arrangements with the CircleMUD group.
+
+\subsection{How do I use a patch file and how can I make one?}\label{patchfile}
+Patch files are created and used using the ``diff'' and ``patch'' utilities, respectively.  They can both be downloaded from the GNU FTP site \url{<ftp://ftp.gnu.org/pub/gnu/>} under the name ``diffutils-xxx.tar.gz''. There is also a port of these utilities for Microsoft Windows now available from the
+Cygnus GNU Win32 Project \url{http://sourceware.cygnus.com/cygwin/}.
+\par
+These are the various parameters to use with \texttt{diff} (all work in general on unix based systems, but check out the help entries to be certain.
+\begin{verbatim}
+  diff -wuprN [original_src_directory] [altered_src_directory] > Patch
+\end{verbatim}
+\texttt{-w} tells the output to ignore differences in spacing on the same line.\newline
+\texttt{-u} is the unified output. ie. it tells diff to output the text what is called ``patch'' style.  On some systems, you will have to use \texttt{-c} but it generates much larger and harder to follow patches.\newline
+\texttt{-p} tells diff to indicate what function is being ``patched'' in each section. This may not be supported by all versions of ``diff.''\newline
+\texttt{-r} is recursive, add r to the uN above if you want it to recursively add in any subdirectories.  (be careful with this one)\newline
+\texttt{-N} tells diff to treat files that are in one directory and not there in the other as being empty in the one they are not there.  It allows entire files to be included into the patch.\newline
+See the manpage for \texttt{diff} for other possible options including \texttt{-x} for excluding files.
+\par
+If you download a patch file and would like to add it to your code, first make sure to read any instructions that the patch author might have written.  The command used to add the patch may vary depending on how the patch was created. This should given in the first line of the patch or in the instructions.  Normally, if using GNU patch with a unified diff, the command should be:
+\begin{verbatim}
+        patch -u < [patchfile]
+\end{verbatim}
+If the patch was created with a SYSV patcher (i.e. not a unified diff), the patch should be added with:
+\begin{verbatim}
+        patch -c < [patchfile]
+\end{verbatim}
+Of course, if the instructions state otherwise, ignore any instructions given here and follow the instructions given with the patchfile instead.\newline
+Finally, in modern patches, there are three characters of interest to note:
+\begin{itemize}
+\item ! : The line changes between new and old.
+\item + : This line is added to the old to make the new.
+\item - : This line is removed from the old to make the new.
+\item The rest of the lines are just there to give you an idea of where to change.
+\end{itemize}
+
+\section{Compiling CircleMUD}
+\subsection{Why do I get many syntax errors with Sun's/HP-UX's ``cc'' compiler?}
+Because Circle is written in ANSI C, and the standard C compilers distributed by Sun and HP are not capable of compiling ANSI C code.  You can try the ANSI C compilers, but both cost extra money so your sysadmin may not have installed it.  Most don't.  The best solution is to get the GCC compiler from the GNU FTP site \url{<ftp://ftp.gnu.org/pub/gnu/>} and install it, if you have enough time and space.
+
+\subsection{Why do I get all sorts of errors with ``crypt'' functions and header files?}
+{\em (This information applies ONLY to Version 3.0 of the code.)} CircleMUD normally uses the UNIX \texttt{crypt()} function to encrypt players' passwords.  Because of export restrictions imposed by the U.S., some systems do not have the \texttt{crypt()} function. ``configure'' will usually be able to figure out whether or not your system has \texttt{crypt()}, but if it guesses incorrectly and you see problems with the \texttt{crypt()} function or headers, you can manually disable password encryption by going into the \texttt{sysdep.h} source
+file and uncommenting the line that reads:
+\begin{verbatim}
+        #define NOCRYPT
+\end{verbatim}
+Be warned, however, that doing this causes the MUD to store players' passwords in plain text rather than as encrypted strings.  Also, if you move from a system which has crypt to one that doesn't, players won't be able to log in with their old passwords! 
+
+\subsection{When I try to compile, why do I get a lot of undefined symbols referenced in comm.o for functions like socket, accept, and bind?}
+SVR4 systems require the socket and nsl libraries for network programs.  You shouldn't see this error any more with version 3.0 because ``configure'' should automatically use those libraries for you; however, if you still have problems, try adding ``-lsocket -lnsl'' to the line in the \texttt{Makefile} that links all the object files together into the `circle' binary. 
+\par
+If you're using V2.20 and you have this error, the best thing to do is simply to use V3.0 instead.  If you insist on using 2.20, go into the \texttt{Makefile} and search for the comment next to ``SVR4''.
+
+\subsection{Every time I try to compile Circle (or any other piece of software) under Linux, it gives me errors and says it cannot find include header files in the \texttt{linux/} and \texttt{asm/} directories.  What can I do?}
+Under Linux, you cannot compile any program unless you install the kernel source code because the kernel source includes the ANSI C header files.  You need the files in \texttt{/usr/include/linux/}, which are distributed separately from the rest of \texttt{/usr/include/}. 
+\par
+If your system does not have them already, you will have to set up your include files manually. The easiest way to get these is to download kernel source from one of the kernel.org mirrors
+\url{<http://www.kernel.org/mirrors/>}. Get the kernel source that matches the kernel you're running (type `uname -a' to find your kernel version).  Then unpack the kernel into the \texttt{/usr/src/} directory.  It is about 20 megabytes compressed, and about 60 megabytes uncompressed. 
+\par
+Read the \texttt{README} file that comes with the kernel, and make the symbolic links you need for \texttt{/usr/include/asm/} and \texttt{/usr/include/linux/}. Now compile the MUD.  This will take care of most of the errors.  You may have to do `make config' and `make dep' in \texttt{/usr/src/linux/} as well, in order to make \texttt{linux/config.h} and other files that get generated by these steps. 
+\par
+You can remove the whole kernel source tree except for \texttt{include/} at this point and get most of your space back. 
+\par
+(Thanks to Michael Chastain for providing this answer.)
+
+\subsection{I'm getting compilation errors from a header file, and I didn't even change it?}
+Okay, if you really didn't change ``structs.h'' then the error isn't in ``structs.h''.  We have seen numerous cases where this has happened, the first, is that the header file you included right before the header file messing has an error in it.  We can't really say much beyond that, but look for a missing semicolon, are any other errors you can find.
+\par
+If you include files out of order, it can mess things up.  For example, B.h has stuff in it that is defined in A.h, and if you include B.h before A.h, you can get errors, your best bet here is to mess with the order of the headers, making sure you put ``conf.h'' and ``sysdep.h'' at the top, followed by ``structs.h'', ``utils.h'', etc.  Any file specific headers should be the last one included just for coding style.
+
+\subsection{I'm trying to compile the mud on Windows '95 and am having problems, what can I do?}
+The first thing to do is to make sure you are compiling a recent version  of the source code.  Patch Level 11 and onwards all support Windows 95 winsock sockets now. Second, you should ensure that you have carefully read the \texttt{README.WIN} file for instructions on what to include.
+Next, ensure that you are using a C compiler that supports long filenames (for example, MSVC 4.0 does, MSVC 1.0 does not). If you happen to be trying to patch something into your code, you should use one of the Cygnus Tools mentioned in section~\vref{patchfile}.
+
+\subsection{How can I do a ``grep'' on Windows 95?}
+\begin{enumerate}
+\item Select ``start menu''-$>$``find''-$>$``files or folders''
+\item Enter the files/dirs to search in.
+\item Select ``Advanced''
+\item In the ``Containing Text'' input box, type in the text you want.
+\item Double click on a match to bring up the file that matched. 
+\end{enumerate}
+Even better is to use MSVC's find command (if you have it).
+
+\subsection{While compiling the mud, why do I get errors like ``foo.c:1231: Undefined symbol `\_whereamI' referenced from text segment''}
+You forgot to include a source file into the make.  Go edit your \texttt{Makefile} and make sure all the necessary *.c files are in there, in particular, whichever C file defines the function that the compiler is complaining is undefined.  If all else fails, try deleting all the *.o files and recompiling from scratch. 
+
+\subsection{What is a parse error and how do I fix it?}
+A parsing error is often a missing or extra semicolon, parenthesis, or bracket (\{). If the parse error is before a semicolon at the end of a line of code, it is something on that line. If it is at the beginning of a line within a function, it is usually a missing semicolon on the previous line. If it is at the beginning of a function, count your brackets (especially  the \{\} ones) in the previous function. I can't think of any other parse errors.  These are the ones I commonly see.  With a bit of practice, they are very easy to locate and fix.  For a more detailed explanation, check out the C Language FAQ \url{<http://www.eskimo.com/~scs/C-faq/top.html>}.
+
+\subsection{I have this piece of code that calls bcopy(), bzero(), and bcmp() and it won't compile, so what can I do?}
+All three of these functions are fairly standard on BSD systems.  However, they are not considered to be very portable, and thus should be redefined. For example, the equivalents for SYSV are: 
+\begin{verbatim}
+  #define bcopy(from,to,len)      memmove(to,from,len)
+  #define bzero(mem,len)          memset(mem,0,len)
+  #define bcmp(a,b,len)           memcmp(a,b,len)
+\end{verbatim}
+
+\subsection{My compiler doesn't have ``strdup()'', what can I do?}
+Use Circle's built-in \texttt{str\_dup()} function instead.
+
+\subsection{I am having trouble with my ``makefile'', what could be the problem?}
+If you used cut and paste to insert items into your makefile, it is likely that you accidentally put spaces at the beginning of lines where tabs are needed.  To check the tabs in your makefile, you can issue the \texttt{cat -v -t -e Makefile}, which will show all tabs as \texttt{\^I} and will show a \texttt{\$} at the end of each line to show any terminating white space. This is how the makefile must be constructed:
+\begin{verbatim}
+  foo.o: foo.c conf.h sysdep.h structs.h utils.h interpreter.h \
+    handler.h db.h
+  {TAB}$(CC) -c $(CFLAGS)
+\end{verbatim}
+To add these lines properly, you can use \texttt{gcc} to assist you with the following shell script (from Daniel Koepke):
+\begin{verbatim}
+  #!/bin/sh
+  gcc -MM $1 >> Makefile
+  echo "{TAB}\$(CC) -c \$(CFLAGS) $1" >> Makefile
+\end{verbatim}
+To use this script, replace \texttt{\{TAB\}} with a tab, and then run the script like: \texttt{add\_file foo.c}
+
+\subsection{How can I handle directories in C?}
+{\em Note that this seems only to be valid for UNIX OSes.} Handling of directories is accomplished through the \texttt{dirent.h} and \texttt{sys/types.h} files.  The function \texttt{opendir()} returns a ``DIR*'' pointer (it's like {\em but not the same as} the ``FILE *'' pointer) when you pass it the name of a directory to open or NULL if it can't open the dir.  After the directory has been opened, you can step through the files or search for particular files, etc. using \texttt{readdir()}, \texttt{seekdir()}, and \texttt{scandir()}.  When you reach the end of the directory list, you can either go back to the start with \texttt{rewinddir()} or close the directory with \texttt{closedir()}.  The following code (which has not been tested) should open a directory and go through it one by one and prints the filenames:
+\begin{verbatim}
+  struct dirent * ffile;
+  DIR * my_dir;
+
+  if (!(my_dir = opendir("foo")))
+    return;
+
+  while (1) {
+    if (!(dirent = readdir(my_dir)))
+      break;
+    printf("%s\n", dirent->d_name);
+  }
+
+  closedir(my_dir);
+\end{verbatim}
+The dirent structure contains only two useful elements, the file's name (\texttt{d\_name}) and the files length (\texttt{d\_reclen}).\newline
+Thanks to Daniel Koepke for the above.
+\par
+For Windows based machines (the Cygwin tools support the above code), the following code should be used instead:
+\begin{verbatim}
+#include <io.h>
+
+struct _finddata_t filedata;
+long fh;
+
+if( (fh = _findfirst( "*.*", &filedata )) == -1L ) {
+  printf( "No files in current directory!\n" );
+} else {
+  printf( "Listing of .c files\n\n" );
+  printf( " %-12s %.24s  %9ld\n",filedata.name, ctime( &(
+                filedata.time_write ) ), filedata.size );
+  while( _findnext( hf, &filedata ) == 0 ) {
+    printf( " %-12s %.24s  %9ld\n", filedata.name, ctime( &(
+                filedata.time_write ) ), filedata.size );
+  }
+  _findclose(hf)
+}
+
+/* note: filedata.attrib is a bitvector;
+  _A_ARCH               has the archive bit set (does nothing)
+  _A_HIDDEN             is hidden
+  _A_NORMAL             nothing to see here
+  _A_RDONLY             is read only
+  _A_SUBDIR             is a directory
+  _A_SYSTEM             is a system file (really does nothing)
+ ..
+   so if(filedata.attrib & _A_SUBDIR) {
+         print "File is a directory!\n";
+      }
+*/
+\end{verbatim}
+Please note that this is the file name without the path.  DOS oriented functions do not gracefully or consistently deal with directory options where the directory/file being accessed is not in the current working directory. You'll have to remember what it is! You can try other things .. but it {\em really} does not handle {\em relative} paths well using the \_[system function] set of functions.  The whole thing is rather ugly.
+\par
+Thanks for Patrick Dughi for the above.
+
+\section{Running CircleMUD}
+\subsection{I typed ``autorun'' but then my terminal just froze.}
+\texttt{autorun} is a script which automatically runs, logs, and reboots the game for long-term runs.  You should run autorun in the background by typing ``./autorun \&'' -- the MUD will start running in the background and you'll get the normal UNIX prompt back immediately (see section~\vref{loginprompt}). The game will then run unattended until you explicitly shut it down.
+\par
+On some systems, you may need to prepend ``nohup'' to the autorun command since some systems will kill off any processes left running when you leave the shell.
+
+\subsection{I typed ``bin/circle'' and got lots of boot messages, but then it said ``Entering game loop'' and froze.}
+It is not frozen, it is just waiting for people to connect.  You have to run the MUD in the background by typing ``bin/circle \&'' and then use telnet to connect to the game (see next section). 
+
+\subsection{Okay, I think the MUD is running but why don't I get a login prompt?}\label{loginprompt}
+In order to play the MUD, you must connect to it using the telnet command, i.e. ``telnet localhost 4000''. 
+
+\subsection{How come I get this error when running my mud: ``Error reading board: No such file or directory''}
+This is not a bad thing, all it means is that you have some boards on the mud and that it can't find the file for them.  Since it can't find the file, the mud will just create the file on the fly and use that, so the next time something is posted to the board, the files will exist. However, if you did have files for the boards and you are suddenly getting this error, it means that the board files have been deleted or something similar.
+
+\subsection{I just got this SIGPIPE, what is it and what can I do about it?}
+Often it appears that other people send your system SIGPIPEs when their connection is closed, in fact, it is not the person sending the SIGPIPE, it is your system.  The SIGPIPE is generated when your program attempts to write to descriptor which has no one listening to it.  This occurs if the character is sent a message by the mud after connecting, but before the socket is flagged with an exception or reads 0 bytes. By default, CircleMUD ignores these SIGPIPEs, with the line \texttt{my\_signal(SIGPIPE, SIG\_IGN)} in \texttt{signal\_setup()}.  Where most people see the problems with SIGPIPE is while debugging with GDB.  By default, GDB responds to a SIGPIPE by stopping the program, printing that a SIGPIPE was received, and passing it to the program.  You can change the action taken by GDB by using the `\texttt{handle}' command. To stop the program from stopping at SIGPIPE, you would give GDB the command `\texttt{handle SIGPIPE nostop}'
+
+\subsection{When I run Circle under Linux, it tells me ``gethostbyaddr: connection refused'' when the MUD boots, and then dies.  Why?}
+You need to make sure you have Networking and TCP/IP support compiled into your Linux kernel, even if you aren't actually connected to the Internet.  Generally the default install of Linux supports networking, so if you have done this, double check that the networking is installed as per your specific distribution, and otherwise seek further help from your distribution's official site.
+
+\subsection{When I run Circle under Windows, it tells me ``Winsock error \#10047'' when the MUD boots, and then dies.  Why?}
+You need to configure TCP/IP networking from the Network Control Panel, even if you are not connected to the Internet.  From the Network Control Panel, select ``Add Protocol'', and under the vendor ``Microsoft'', choose ``TCP/IP''.  It may ask you to insert your Windows CDROM in order to copy the drivers onto your hard drive.
+
+\subsection{When I run Circle under Windows, players can't rent -- their equipment is just dropped on the ground, syslogs don't work, so what is the problem?}
+The reason that objects aren't saved when your players quit is that certain unzip programs are buggy and don't completely recreate the MUD's directory structure (in particular, it doesn't create directories which have no files in them.)  This is fixed in Circle 3.0 patchlevel 12 and above.  Before patchlevel 12, you can fix it simply by manually creating the needed directories:
+\begin{verbatim}
+        cd \Circle30bpl11
+        cd lib\plrobjs
+        mkdir A-E
+        mkdir F-J
+        mkdir K-O
+        mkdir P-T
+        mkdir U-Z
+        mkdir ZZZ
+\end{verbatim}
+Object saving should then work.  It is also advised that you look at the {\bf AUTOEQ} option in \texttt{structs.h} for another possibility.
+\par
+The syslogs are a different story; no data is written to the system logs because the code currently is configured simply to write all errors to the standard error file
+descriptor (stderr), and Windows doesn't seem to let you redirect stderr to a file the same way UNIX does.  Patch level 12 and above allow you to direct logs to a specific file instead.
+
+\subsection{When someone logs on to my Windows MUD, the console screen gives: ``gethostbyaddr: No such file or directory''}
+This means the MUD can't resolve the IP address of the connecting player's source site into a hostname.  You probably don't have DNS correctly configured in the Windows Network Control Panel menu (under configuration of the TCP protocol).  Make sure you have the IP address of your ISP's DNS server listed.
+
+\subsection{My Mud crashed and my connection got closed.  What can I do?}
+Just because your connection got closed from the mud (for example, if you get too much information sent to you and the telnet session gets closed), this doesn't always mean that the game itself crashed.  Before reporting something as a crash bug, make sure that the game itself crashed, and above all, try to duplicate the circumstances before reporting it as a crash bug.  You can also try using gdb to find out why the mud is crashing if it gives you a core dump.
+
+\subsection{Ok, what's this ``gdb'' thing?}
+GDB has some online help, though it is not the best.  It does at least give a summary of commands and what they're supposed to do.  What follows is Sammy's short intro to gdb with some bug hunting notes following it:\newline
+If you've got a core file, go to your top circle directory and type:\par
+\texttt{$>$ gdb bin/circle lib/core}\newline
+If you want to hunt bugs in real time (causing bugs to find the cause as opposed to checking a core to see why the mud crashed earlier) use:\par
+\texttt{$>$ gdb bin/circle}\newline
+If you're working with a core, gdb should show you where the crash occurred.  If you get an actual line that failed, you've got it made.  If not, the included message should help.  If you're working in real time, now's the time to crash the mud so you can see what gdb catches.
+\par
+When you've got the crash info, you can type ``\texttt{where}'' to see which function called the crash function, which function called that one, and so on all the way up to ``\texttt{main()}''.\par
+I should explain about ``\texttt{context}''  You may type ``\texttt{print ch}'' which you would expect to show you the ch variable, but if you're in a function that doesn't get a ch passed to it (real\_mobile, etc), you can't see ch because it's not in that context.  To change contexts (the function
+levels you saw with where) type ``\texttt{up}'' to go up.  You start at the bottom, but once you go up, and up, and up, you can always go back ``\texttt{down}''.  You may be able to go up a couple functions to see a function with ch in it, if finding out who caused the crash is useful (it normally isn't).
+\par
+The ``\texttt{print}'' command is probably the single most useful command, and lets you print any variable, and arithmetic expressions (makes a nice calculator if you know C math).  Any of the following are valid and sometimes useful:
+\begin{verbatim}
+  print ch (fast way to see if ch is a valid pointer, 0 if it's not)
+  print *ch (prints the contents of ch, rather than the pointer address)
+  print ch->player.name (same as GET_NAME(ch))
+  print world[ch->in_room].number (vnum of the room the char is in)
+\end{verbatim}
+Note that you can't use macros (all those handy pseudo functions like \texttt{GET\_NAME} and \texttt{GET\_MAX\_HIT}), so you'll have to look up the full structure path of variables you need.
+\par
+Type ``\texttt{list}'' to see the source before and after the line you're currently looking at.  There are other list options but I'm unfamiliar with them.\newline
+(From Sammy \url{<samedi@cris.com>})\par
+For more information, you can try checking out the GDB Debugger manual \url{<http://www.circlemud.org/cdp/gdb/>}.
+
+\subsection{How can I hunt bugs more effectively?}
+There are only a couple of commands to use in gdb, though with some patience they can be very powerful.  The only commands I've ever used are:
+\begin{verbatim}
+run                     well, duh.
+print [variable]        also duh, though it does more than you might think
+list                    shows you the source code in context
+break [function]        set a breakpoint at a function
+clear [function]        remove a breakpoint
+step                    execute one line of code
+cont                    continue running after a break or ctrl-c
+\end{verbatim}
+I've run into nasty problems quite a few times.  The cause is often a memory problem, usually with pointers, pointers to nonexistent memory.  If you free a structure, or a string or something, the pointer isn't always set to NULL, so you may have code that checks for a NULL pointer that thinks the pointer is ok since it's not NULL.  You should make sure you always set pointers to NULL after freeing them.
+\par
+Ok, now for the hard part.  If you know where the problem is, you should be able to duplicate it with a specific sequence of actions.  That makes things much easier.  What you'll have to do is pick a function to ``break'' at.  The ideal place to break is immediately before the crash. For example, if the crash occurred when you tried to save a mob with medit, you might be able to ``break mobs\_to\_file''.  Try that one first.
+\par
+When you `medit save', the mud will hang.  GDB will either give you segfault info, or it will be stopped at the beginning of mobs\_to\_file.  If it segfaulted, pick an earlier function, like copy\_mobile, or even do\_medit.
+\par
+When you hit a breakpoint, print the variables that are passed to the function to make sure they look ok.  Note that printing the contents of pointers is possible with a little playing around.  For example, if you \texttt{print ch}, you get a hex number that shows you the memory location where ch is at.  It's a little helpful, but try \texttt{print *ch} and you'll notice that it prints the contents of the ch structure, which is usually more useful.  \texttt{print ch-$>$player} will give you the name of the person who entered the command you're looking at, and some other info.  If you get a \texttt{no ch in this context} it is because the ch variable wasn't passed to the function you're currently looking at.
+\par
+Ok, so now you're ready to start stepping.  When GDB hit your breakpoint, it showed you the first line of executable code in your function, which will sometimes be in your variable declarations if you initialized any variables (ex: int i = 0).  As you're stepping through lines of code, you'll see one line at a time.  Note that the line you see hasn't been run yet.  It's actually the {\bf next} line to be executed.  So if the line is \texttt{a = b + c;}, printing a will show you what a was before this line, not the sum of b and c.
+\par
+If you have an idea of where the crash is occurring, you can keep stepping till you get to that part of the code (tip: pressing return will repeat the last GDB command, so you can type step once, then keep pressing return to step quickly).  If you have no idea where the problem is, the quick and dirty way to find your crash is to keep pressing return rapidly (don't hold the return key or you'll probably miss it).  When you get the seg fault, you can't step any more, so it should be obvious when that happens.
+\par
+Now that you've found the exact line where you get the crash, you should start the mud over and step more slowly this time. What I've found that works really well to save time is to create a dummy function.  This one will work just fine:
+\begin{verbatim}
+  void dummy(void){}
+\end{verbatim}
+Put that somewhere in the file you're working on.  Then, right before the crash, put a call to dummy in the code (ex: \texttt{dummy();}).  Then set your breakpoint at dummy, and when you hit the breakpoint, step once to get back to the crashing code.
+\par
+Now you're in total control.  You should be looking at the exact line that gave you the crash last time.  Print {\bf every} variable on this line. Chances are one of them will be a pointer to an unaccessible memory location.  For example, printing \texttt{ch-$>$player.name} may give you an error.  If it does, work your way back and print \texttt{ch-$>$player} to make sure that one's valid, and if it isn't, try printing ch.
+\par
+Somewhere in there you're going to have an invalid pointer.  Once you know which one it is, it's up to you to figure out why it's invalid.  You may have to move \texttt{dummy()} up higher in the code and step slowly, checking your pointer all the way to see where it changes from valid to invalid. You may just need to NULL a free'd pointer, or you may have to add a check for a NULL pointer, or you may have screwed up a loop.  I've done all that and more.
+\par
+Well, that's it in a nutshell.  There's a lot more to GDB that I haven't even begun to learn, but if you get comfortable with print and stepping you can fix just about any bug.  I spent hours on the above procedure trying to get my ascii object and mail saving working right, but it could have taken weeks without gdb.  The only other suggestion I have is to check out the online gdb help.  It's not very helpful for learning, but you can see what commands are available and play around with them to see if you can find any new tools.
+\par
+(From Sammy \url{<samedi@cris.com>})
+
+\subsection{I just added n levels to my mud (from the stock 34).  How do I set my imp's up to level n without a pfile wipe?}
+You can write a quick and nasty function that will advance your imp (and imp only) to the max level (LVL\_IMPL).  This can be done with a quick idnum check so that only the original player (the first imp, he with id 1) can use the command to get to maximum level. 
+\begin{verbatim}
+ACMD(do_upme)
+{
+  if (GET_IDNUM(ch) != 1) {
+    send_to_char("You think IMP positions are that easy to come by? "
+                 "Go Figure...\n\r", ch);
+  } else {
+    GET_LEVEL(ch) = LVL_IMPL;
+    send_to_char("Advanced.\n\r", ch);
+  }
+}
+\end{verbatim}
+Remember that you will need to prototype it and add a call to it into the command table, but that is left as an exercise to the reader.
+
+\subsection{I decided to wipe my pfile away anyway.  What steps should I take to do this?}
+In order:
+\begin{enumerate}
+\item Shutdown the mud with ``shutdown die'' so that it won't restart.
+\item Remove the player file, \texttt{lib/etc/players}
+\item Restart the mud and login to recreate your imp character.
+\end{enumerate}
+You should probably also remove files in \texttt{plrobjs}, unless you want the recreated characters to come back with the same equipment they had when they were deleted.
+
+\subsection{I want to expand the ability to pk in my MUD, allowing ASSASSINS that'll be able to PK without getting flagged.  How can I do this?}
+The simple way to do this is to find all the ``pk\_allowed'' checks and replace them with a \texttt{can\_murder(ch, vict)} function call.  Prototype the function in \texttt{utils.h}.  Then, in \texttt{utils.c}, create a \texttt{can\_murder()} function something like this: 
+\begin{verbatim}
+int can_murder(struct char_data *ch, struct char_data *victim) {
+  if (pk_allowed == TRUE)
+    return TRUE;
+  if (IS_NPC(ch) || IS_NPC(victim))
+    return TRUE;   /* you can always kill these */
+  if (PLR_FLAGGED(ch, PLR_ASSASSIN))
+    return TRUE;   /* they can kill anyone */
+  /* Add further checks here */
+}
+\end{verbatim}
+
+\subsection{Why does it say ``Connection closed by foreign host.'' and not display the ``Byebye!'' message I'm trying to send before cutting someone off?}
+This usually happens if you are doing something like this:
+\begin{verbatim}
+  send_to_char("Bye bye.  Come back soon, ya hear?", ch);
+  close_socket(ch->desc);
+\end{verbatim}
+The \texttt{close\_socket} immediately dispatches/closes the connection, while \texttt{send\_to\_char} puts the message on the output queue to be dispatched next
+\texttt{game\_loop} cycle. Therefore, the socket is gone.  On some systems (i.e., old linux), this can even cause a infinite loop attempting to write to a closed socket. The proper way of doing this and other ``Byebye'' messages is to set the CON state of the player to CLOSE, like this:
+\begin{verbatim}
+  send_to_char("Bye bye.  Come back soon, ya hear?", ch);
+  STATE(ch->desc) = CON_CLOSED;
+\end{verbatim}
+This will then cycle to the next \texttt{game\_loop}, dispatch the output queues (therefore sending the byebye message) and then close the socket. Further note, in some bizarre cases, this only seems to send about 40 characters and no escape codes.  Sending more than 40 characters or escape codes (like the clear screen sequence) will crash the process reporting a problem similar to writing to a closed socket. 
+
+\subsection{I run my mud on a unix system and the pfile/rent file works great, but on my home system it's all screwed up.  What gives?}
+Some operating systems write binary data least-significant-digit-first, while others write it most-significant-first (big endian vs. little endian). Moving player files, rent files, mail files, and board files from one of these systems to the other will result in corrupted files.  The solutions to this problem include:
+\begin{itemize}
+\item Don't bother trying to move those files.
+\item Edit your code to always write in one format.
+\item Develop a binary to ascii conversion tool (and ascii to binary) for all binary files.
+\item Develop an ascii read/write system to allow portability.
+\end{itemize}
+Some ASCII systems for objects, boards, and player files have been designed and are available on the CircleMUD FTP server \url{<ftp://ftp.circlemud.org/>} in the contributions section.  There are also plans for future versions of CircleMUD to remove all binary based files.
+
+\subsection{How do I get the CircleMUD to autoload when the Unix server is restarted?}
+In \texttt{/etc/rc.d/rc.local} find where things like sendmail and (maybe) gpm are started.  Add something like:
+\begin{verbatim}
+        cd /home/mudlogin/circlebpl15/
+        su mudlogin -c ./autorun &
+        cd
+\end{verbatim}
+Of course, change the ``\texttt{mudlogin}'' to whatever the name of the account is that normally has control of the mud, and change the path in the first \texttt{cd} to wherever the mud is run from.\newline
+For more info: \texttt{man su}
+
+\subsection{My server shuts down my MUD every time I logoff. How do I keep the MUD running when I logoff?}
+Instead of typing ``\texttt{autorun \&}'' to start the autorun script (which starts and keeps the mud running), type ``\texttt{nohup autorun \&}''. Running the autorun via nohup will keep the script and the MUD running when you logoff of the server. For more information type ``\texttt{man nohup}'' at the prompt on your server.
+
+\section{Code Changes for CircleMUD 2.20}
+\subsection{How do I fix the bug where people can junk more coins than available?}
+Apparently in Circle 2.2, you can drop any amount of coins, and then be rewarded with more coins than you had in the first place.  Here is the fix from Jeremy Elson:\newline
+Around line 480 of \texttt{act.obj1.c}, you will find the code:
+\begin{verbatim}
+        if (!str_cmp("coins", arg) || !str_cmp("coin", arg))
+           perform_drop_gold(ch, amount, mode, RDR);
+        else {
+           /* code to drop multiple items.  anyone want to write it? -je */
+           send_to_char("Sorry, you can't do that (yet)...\n\r", ch);
+-->        return;
+        }
+        ....
+\end{verbatim}
+It should be changed to:
+\begin{verbatim}
+        if (!str_cmp("coins", arg) || !str_cmp("coin", arg))
+           perform_drop_gold(ch, amount, mode, RDR);
+        else {
+           /* code to drop multiple items.  anyone want to write it? -je */
+           send_to_char("Sorry, you can't do that (yet)...\n\r", ch);
+        }
+-->     return;
+        ....
+\end{verbatim}
+
+\subsection{How do I fix the ``vstat'' bug that crashes the MUD?}
+To the fix for the vstat bug, from Jeremy Elson:
+\par
+In the file act.wizard.c, in the function \texttt{do\_vstat}, in the mobile section of the switch (around line 1150), you'll find the code: 
+\begin{verbatim}
+        mob = read_mobile(r_num, REAL);
+        do_stat_character(ch, mob);
+        extract_char(mob);
+\end{verbatim}
+Add the line \texttt{char\_to\_room(mob, 0)} before \texttt{extract\_char()}, like this:
+\begin{verbatim}
+        mob = read_mobile(r_num, REAL);
+        do_stat_character(ch, mob);
+        char_to_room(mob, 0);
+        extract_char(mob);
+\end{verbatim}
+
+\subsection{ How do I fix the ``wizlock'' bug that lets lower immortals lock out higher immortals?}
+Simple, insert this code into `\texttt{do\_wizlock()}' in `\texttt{act.wizard.c}':
+\begin{verbatim}
+        if (value < 0 || value > LEVEL_IMPL) {
+           send_to_char("Invalid wizlock value.\n\r", ch);
+           return;
+        }
+
++       /*   Do not allow people to wizlock above their level.
++        *   This bug came with Circle 2.20 source -- VampLestat
++        */
++       if (value > GET_LEVEL(ch)) {
++          send_to_char("You may only wizlock below your level.\n\r", ch);
++          return;
++       }
+        restrict = value;
+\end{verbatim}
+
+\subsection{ How do I fix the ``mudlog'' bug that lets people see me log in, even if I'm wizinvis?}
+For all the mudlog calls for entering the game, quitting, and so forth, you must change
+\begin{verbatim}
+        mudlog(MAX(LEVEL_IMMORT, ...
+\end{verbatim}
+to
+\begin{verbatim}
+        mudlog(MAX(GET_LEVEL(i), ...
+\end{verbatim}
+where ``i'' is either ``ch'' or ``d-$>$character'' depending on the call.
+
+\section{CircleMUD 3.0 Questions}
+\subsection{Are there any bugs in the current release?}
+There are no bugs.  Only features.  Seriously though, if perchance you find a bug, please mail it (along with a possible fix) to \url{<bugs@circlemud.org>} the bugs database \url{<bugs@circlemud.org>} and the CircleMUD list.  Once in the bug database, it will be routed to the correct person.  Note that no confirmation is sent back automatically.  You can view the status of the bug at the bugs database \url{<http://bugs.circlemud.org/>}.
+ 
+\subsection{How do I access Online Creation?}
+Online Creation is not yet part of the Circle beta release. When it does become part of the release, it'll be accessed through a command called olc. Update: OLC will probably be in a future release rather than 3.0. In the mean time, check out the CircleMUD FTP server
+\url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/olc/online/>}.
+
+\subsection{How does the new bitvector system work?}
+The new bitvector system in CircleMUD 3.0 is an ascii based one. The old numeric values can still be used, but the new system should make sorting flags out substantially easier.  The system uses an ``a'' as the value for 1, ``b'' for 2, ``c'' for 4, ``d'' for 8, etc.  Once ``z'' is reached, the next letter in sequence is ``A''.  Detailed information about how to use bitvectors with CircleMUD can be found in the CircleMUD Building Manual \url{<http://www.circlemud.org/cdp/building/>}.
+
+\subsection{When will the production release of Circle 3.0 be?}
+I don't know.  Don't ask again.  Same for the next patch level.  If you must have bleeding edge stuff, check out the CVS snapshot \url{<ftp://ftp.circlemud.org/pub/CircleMUD/cvs/>} if you do not want to set up an anonymous CVS account.  Don't ask when the next CVS snapshot will be, we'll do it when we have some changes worth it.
+\par
+There is anonymous read-only access available for the CVS repository.  You can access this from your own server (assuming that you also have CVS installed on your machine.  To connect to the CircleMUD CVS repository, you need to issue the following commands at your shell prompt:
+\begin{verbatim}
+  setenv CVSROOT :pserver:cvs@cambot.circlemud.org:/home/circledb/cvs
+  cvs login
+       (password = cvs)
+  cvs checkout circle
+\end{verbatim}
+
+\subsection{If someone logs in and just sits at the password prompt, the MUD hangs (i.e., no one else can connect or do anything) until the person enters their password.}
+Your system's POSIX non-blocking I/O might be broken.  Look in the source file \texttt{sysdep.h} at the comment above the line that says ``\texttt{\#define POSIX\_NONBLOCK\_BROKEN}'' for a possible fix. Once this is done, recompile the mud and try again.  If you use the \texttt{POSIX\_NONBLOCK\_BROKEN} constant and it fixes your problem, please send mail to the bugs database \url{<bugs@circlemud.org>} and let us know exactly what kind of system you are using and what you had to do to fix it. 
+
+\subsection{Why does CircleMUD use BUF switches all through the code, what's happening here?}
+From Jeremy:
+\par
+This code is the new output buffering system that I wrote for Circle in the early (non-released) beta versions of 3.0.  The old DikuMud code for queueing output (which stayed with Circle until version 2.20) was memory- and time-inefficient in many cases (and, in my opinion, was inefficient for the normal behavior of most MUDs).
+\par
+First, I should explain what output queueing is and why it is necessary.  On each pass through the \texttt{game\_loop()}, the MUD performs a number of steps: check to see if there are any new players connecting, kick out people with bad links, read input over the network for all players, then process the input for each player that has sent a complete line over the net.  The processing step is usually where output is generated because it is where MUD commands are processed (e.g., ``kill'' might generate output of ``Kill who?'')  When output is generated, it is not immediately sent out to the player, but instead queued for output in a buffer.  After all players' commands are processed (and each command generates the appropriate output for various players), the next step of the \texttt{game\_loop()} is to send all the queued output out over the network.
+\par
+The new output system that Circle now uses allocates a small, fixed size  buffer (1024 bytes) for each descriptor in which output can be queued. When output is generated (via such functions as \texttt{send\_to\_char()}, \texttt{act()}, etc.), it is written to the fixed size buffer until the buffer fills. When the buffer fills, we switch over to a larger (12K) buffer instead. A ``buffer switch'', therefore, is when the 1024-byte fixed buffer overflows.
+\par
+When a large (12K) buffer is needed, it is taken from a pool of 12K buffers that already been created.  It is used for the duration of that pass through the \texttt{game\_loop()} and then returned to the pool immediately afterwards, when the output is sent to the descriptor.  If a large buffer
+is needed but none are in the pool, one is created (thereby increasing the size of the pool); the ``\texttt{buf\_largecount}'' variable records the current pool size. 
+\par
+If a player has {\em already} gone from their small to large buffer, and so much output is generated that it fills even the large buffer, the descriptor is changed to the overflow state, meaning that all future output for the duration of the current pass through the game loop is discarded.  This is a buffer overflow, and the only state in which output is lost.
+\par
+Now that I've described how the system works, I'll describe the rationale.  The main purpose for the two-tiered buffer system is to save memory and reduce CPU usage.  From a memory standpoint: Allocating a fixed 12K buffer for each socket is a simple scheme (and very easy to code), but on a large MUD, 100 12K buffers can add up to a lot of wasted memory.  (1.2 megs of memory used for buffering on a 100-player MUD may not seem like very much, but keep in mind that one of Circle's big selling points several years ago, when memory was expensive, was that it had a very small memory footprint (3 or 4 megs total!)  And from a CPU standpoint: the original DikuMud used a dynamically allocated buffer scheme to queue output, which unfortunately meant that for {\em each} player, on {\em each} pass through the game loop, dozens of tiny buffers (often one for every line of output, depending on the code to execute the command) were allocated with \texttt{malloc()}, {\em individually} written to the system using individual calls to \texttt{write()}, and then \texttt{free()}'d.  My system saves hundreds or thousands of calls per second to \texttt{malloc()} and \texttt{free()}, and reduces the number of system calls {\bf drastically} (to at most one per player per pass through the game loop).
+\par
+The trick is to choose the size of the small and large buffers correctly in order to find the optimal behavior.  I consider ``optimal'' to mean that 90\% of the time, most players stay within the limits of their small buffer (for example, when wandering through town or mindlessly killing some monster while watching damage messages go by).  Hopefully, a large buffer switch is only necessary when a player executes a special command that generates an unusually large amount of output, such as ``who'', ``read board'', or ``where sword''.  This critically depends on the fact that not everyone will be executing such a special large-output command at the same instant.
+\par
+For example, imagine you have 10 players on your MUD.  They are all wandering around town, and every once in a while one of them types ``who'', or reads the board, meaning that they are seeing more than 1024 bytes of output at a time.  On such a MUD, I would hope that there would only be a {\em single} 12K buffer allocated which gets passed around among all the 10 players as needed.  Now, all players think they can queue up to 12K of output per command without getting truncated even though only one 12K buffer actually exists -- they are all sharing it.
+\par
+But - there's a problem with this.  There are certain cases when {\em many} players have to see a lot of output at the same instant (i.e. on the {\em same} pass through the \texttt{game\_loop()}), all of them will need a large buffer at the same time and the pool will get very big.  For example, if
+an evil god types ``force all who''; or if the MUD lags for several seconds, then suddenly gets unlagged causing many commands to be processed at the same moment; or if 20 people are all trying to kill the same MOB and are all seeing 20 damage messages (more than 1024 bytes) on the same pass through the \texttt{game\_loop()}.
+\par
+Unfortunately, the current patchlevel of Circle has no way to destroy large buffers so such cases are pathological and cause wasted memory.  Unfortunately since I don't run a MUD I can't actually tell how often this happens on a real MUD.  (If there are any IMPs out there who run large MUDs (say, $>$= 30-50 players on regularly), and you've read this far, please send me the output of ``show stats'' after your MUD has been played for at least several hours.) 
+\par
+Hopefully this clears up the way buffers work.
+
+\subsection{How do I add a new class?  How do I add more levels?}
+Adding a new class is fairly easy in 3.0, in fact, someone has taken the time to put together a fairly complete document on adding a class, in this case a Knight class. The \texttt{class.txt} is available on the FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/docs/3.x/class.txt>}.
+\par
+The same applies for levels, in the file \texttt{levels.bpl14.txt} \url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/docs/3.x/levels.bpl14.txt>} which can be found in the same place.
+
+\subsection{Is there a complete ``coding.doc''?}
+No.  Look at the \texttt{README.NOW} in the docs directory.  It isn't complete, nor does anyone have the entire thing.  It is being worked upon.
+\par
+{\em RTFM}
+\par
+Further information on CircleMUD can be found in other documents in the docs directory, on the CircleMUD webpages \url{<http://www.circlemud.org/>}, on the FTP server \url{<ftp://ftp.circlemud.org/>}, and on the CircleMUD Mailing List (see section~\vref{mailinglist}).
+\end{document}
+\end
Index: doc/sources/README
===================================================================
RCS file: README
diff -N README
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvs6w82iD	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,14 @@
+These files are the LaTeX source files for the CircleMUD Documentation
+Project.
+
+Use them as you will, but if you find any errors, typos, or have suggestions
+for improvement, please submit them to the CircleMUD Development Team at
+either:
+   bugs@circlemud.org
+or
+   furry@circlemud.org
+
+Please note that these are the first drafts, and changes will be forthcoming
+with future Patch Levels.
+
+-Ae.
Index: doc/sources/act.tex
===================================================================
RCS file: act.tex
diff -N act.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsXDiN8H	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,210 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+\usepackage{times}
+\usepackage{varioref}
+\usepackage{multicol}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 4/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+\newenvironment{Ventry}[1]
+  {\begin{list}{}{\renewcommand{\makelabel}[1]{\textsf{##1:}\hfil}
+    \settowidth{\labelwidth}{\textsf{#1:}}
+    \setlength{\leftmargin}{\labelwidth}
+    \addtolength{\leftmargin}{\labelsep}
+  }
+  }
+  {\end{list}}
+
+\title{The \texttt{act()} Function}
+\author{Alex Fletcher\\
+{\it Based on text from the DikuMud authors}}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document is intended to give an overview of the \texttt{act()} function and give a summary of the various flags and the associated descriptive control characters.  The \texttt{act()} function is one of the primary functions for sending a message from the game to a character or number of characters in a room.
+\end{abstract}
+
+\tableofcontents
+
+\section{The \texttt{act()} Function}
+\subsection{Overview}\label{overview}
+The \texttt{act()} function is used to process and send strings of text to characters in a room.  It can be used to send the same basic string to a number of characters filling in certain segments -- designated by control characters -- in different ways, dependant on what each character can see and who each character is.  Once the text string passed to the function has been parsed, it is capitalized and a newline is added to its tail.
+
+\subsection{The Function}\label{function}
+The \texttt{act()} function is found in the \texttt{comm.c} source file and is described as:
+\begin{verbatim}
+  void act(const char *str, int hide_invisible, struct char_data *ch,
+           struct obj_data *obj, const void *vict_obj, int type)
+\end{verbatim}
+These pieces are used as follows:
+\begin{Ventry}{hide\_invisible}
+\item[str] This is the basic string, a null terminated character array, including control characters (see section~\vref{controlcharacters}~`Control Characters'), to be sent to characters designated by the targets.
+\item[hide\_invisible] A \texttt{TRUE} or \texttt{FALSE} value indicating whether or not to hide the entire output from any characters that cannot see the ``performing character''.
+\item[ch] The ``performing character''.  This is the character that the output string is associated with.  The character is used to determine the room for the output of the action in question.
+\item[obj] An object (an actual item -- \texttt{obj\_data}) used in the course of the action.
+\item[vict\_obj] This can be either a character involved in the action, another object, or even a predefined string of text.
+\item[type] One of \texttt{TO\_VICT}, \texttt{TO\_CHAR}, \texttt{TO\_NOTVICT}, or \texttt{TO\_ROOM}. This indicates who it is to be targeted at.
+\end{Ventry}
+
+\subsection{The Parameters}\label{parameters}
+Of the various parameters passed to the \texttt{act()} function, the \texttt{str} is the most important, as it is the basis for the actual final output.  If this parameter is a null-pointer or points to a null-character, then the function returns immediately. The next important parameter is the \texttt{ch} parameter.  This, as mentioned, points to the central character associated with the output string and action.
+\par
+\texttt{obj} is an object of type \texttt{struct obj\_data~*} that is passed to the function.  If there is no object to pass to the function, then a \texttt{NULL} or \texttt{0} should be passed in this location.
+\par
+The next parameter \texttt{vict\_obj} can be a number of things ranging from a game object (\texttt{strcut obj\_data~*}), through to a character (\texttt{struct char\_data~*}), and even a null terminated character array (\texttt{char~*}).
+\par
+Do note, however, that \texttt{obj} and \texttt{vict\_obj} are both ignored if there is no control character reference (see section~\vref{controlcharacters}~`Control Characters') to them and the \texttt{type} is set to \texttt{TO\_ROOM} or \texttt{TO\_CHAR}.  In these cases, \texttt{NULL} should be supplied as the input to the function.
+\par
+The \texttt{hide\_invisible} flag dictates whether or not the action output should be hidden from characters that cannot see \texttt{ch}.  If the flag is set to \texttt{TRUE} (non-zero), then this is the case.
+\par
+The \texttt{type} determines who the output is to be sent to.  There are four options for this (all defined in \texttt{comm.h}) described below:
+\begin{Ventry}{TO\_NOTVICT}
+\item[TO\_ROOM] This sends the output to everybody in the room, except \texttt{ch}.
+\item[TO\_VICT] This option sends the output to the character pointed to by \texttt{vict\_obj}. Obviously, in this case, \texttt{vict\_obj} must point at a character rather than an object.
+\item[TO\_NOTVICT] In another case where \texttt{vict\_obj} must point to a character.  This sends the output to everybody in the room except \texttt{ch} and \texttt{vict\_obj}.
+\item[TO\_CHAR] Finally, this option sends the output to the \texttt{ch}.
+\item[TO\_SLEEP] This is a special option that must be combined with one of the above options.  It tells \texttt{act()} that the output is to be sent even to characters that are sleeping.  It is combined with a bitwise `or'.  For example, \texttt{TO\_VICT $|$ TO\_SLEEP}.
+\end{Ventry}
+When the string has been parsed, it is capitalized and a newline is added.
+
+\subsection{Control Characters}\label{controlcharacters}
+In a manner similar to the \texttt{printf()} family of functions, \texttt{act()} uses control characters.  However, instead of using the {\bf \%} symbol, \texttt{act()} uses the {\bf \$} character to indicate control characters.
+\begin{description}
+\item[\$n] Write name, short description, or ``{\it someone}'', for \texttt{ch}, depending on whether \texttt{ch} is a PC, a NPC, or an invisible PC/NPC.
+\item[\$N] Like {\bf \$n}, except insert the text for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must point to an object of type \texttt{struct char\_data~*}.
+\item[\$m] ``{\it him},'' ``{\it her},'' or ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$M]  Like {\bf \$m}, for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct char\_data~*}.
+\item[\$s] ``{\it his},'' ``{\it her},'' or ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$S] Like {\bf \$s}, for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct char\_data~*}.
+\item[\$e] ``{\it he},'' ``{\it she},'' ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$E] Like {\bf \$e}, for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct char\_data~*}.
+\item[\$o] Name or ``{\it something}'' for \texttt{obj}, depending on visibility.
+\item[\$O] Like {\bf \$o}, for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct obj\_data~*}.
+\item[\$p] Short description or ``{\it something}'' for \texttt{obj}.
+\item[\$P] Like {\bf \$p} for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct obj\_data~*}.
+\item[\$a] ``{\it an}'' or ``{\it a}'', depending on the first character of \texttt{obj}'s name.
+\item[\$A] Like {\bf \$a}, for \texttt{vict\_obj}. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{struct obj\_data~*}.
+\item[\$T] Prints the string pointed to by \texttt{vict\_obj}.  NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{char~*}.
+\item[\$F] Processes the string pointed to by \texttt{vict\_obj} with the \texttt{fname()} function prior to printing. NOTE: \texttt{vict\_obj} must be a pointer of type \texttt{char~*}.
+\item[\$u] Processes the buffer and uppercases the first letter of the previous word (the word immediately prior to the control code).  If there is no previous word, no action is taken.
+ \item[\$U] Processes the buffer and uppercases the first letter of the following word (the word immediately after to the control code).  If there is no following word, no action is taken.
+\item[\$\$] Print the character `\$'.
+\end{description}
+
+\subsection{Examples}\label{examples}
+In all of the following examples, \texttt{ch} points to male character {\bf Ras}, \texttt{vict} always points to the female character {\bf Anna}.  \texttt{obj1} is {\it a small sword}, and \texttt{obj2} is {\it a small sack}.
+
+\begin{verbatim}
+  act("$n smiles happily.", TRUE, ch, NULL, NULL, TO_ROOM);
+\end{verbatim}
+This is sent to the room that {\bf Ras} is currently in, and the string that they see if they can see him is:
+\begin{quote}
+{\em Ras smiles happily.}
+\end{quote}
+If a character cannot see Ras, then they will not see the action at all.
+
+\begin{verbatim}
+  act("You kiss $M.", FALSE, ch, NULL, vict, TO_CHAR);
+\end{verbatim}
+In this action, {\bf Ras} is kissing {\bf Anna}, and Ras will see:
+\begin{quote}
+{\em You kiss her.}
+\end{quote}
+
+\begin{verbatim}
+  act("$n gives $p to $N.", TRUE, ch, obj1, vict, TO_NOTVICT);
+\end{verbatim}
+The output from this string is sent to everyone in the room except for {\bf Ras} and {\bf Anna}.  Of course, if they cannot see Ras, then they will not see any output at all.  The string that each character in the room will see is:
+\begin{quote}
+{\em Ras gives a small sword to Anna.}
+\end{quote}
+If a character cannot see Anna, then {\it someone} will be used in place of her name, and if they cannot see the small sword, then {\it something} will be used in its place.
+
+\begin{verbatim}
+  act("$n gives you $p.", FALSE, ch, obj1, vict, TO_VICT);
+\end{verbatim}
+Similar to the prior example, this is the output for {\bf Anna}.  She will see this even if she cannot see {\bf Ras}, and the output that she will get is:
+\begin{quote}
+{\em Ras gives you a small sword.}
+\end{quote}
+Just as per the last example, if she cannot see Ras, {\it someone} will be used in place of his name, and if she cannot see the sword, then {\it something} will be used in its place.
+
+\begin{verbatim}
+  act("$n puts $p in $s $O.", TRUE, ch, obj1, obj2, TO_ROOM);
+\end{verbatim}
+This action uses two objects rather than two characters, and is displayed to the entire room (with the exception of {\bf Ras} of course).  If the character can see Ras, they will see:
+\begin{quote}
+{\em Ras puts a small sword in his small sack.}
+\end{quote}
+Otherwise, they will see nothing.  Again, as per the prior two examples, {\it something} will be used in place of any objects that the viewing character cannot see.
+
+\begin{verbatim}
+  act("The $F opens quietly.", FALSE, ch, NULL, EXIT(ch, door)->keyword, TO_ROOM);
+\end{verbatim}
+If the keywords for the door were {\it gate wooden}, then this would send the output string of:
+\begin{quote}
+{\em The gate opens quietly.}
+\end{quote}
+to all of the characters in the room with the exception of Ras.
+\par
+In addition to these examples, a multitude of other examples can be found scattered throughout the CircleMUD source code.
+\appendix
+%
+% The following is a reiteration of some of the above sections into a one-page, two column
+% quick reference sheet.
+%
+\newpage
+\pagestyle{empty}
+\setlength{\topskip}{0cm}
+\setlength{\footskip}{0cm}
+\section{\texttt{act()} Reference Sheet}
+\begin{verbatim}
+  void act(const char *str, int hide_invisible, struct char_data *ch,
+           struct obj_data *obj, const void *vict_obj, int type)
+\end{verbatim}
+\begin{Ventry}{hide\_invisible}
+\item[str] String to be parsed.
+\item[hide\_invisible] If \texttt{TRUE}, hide from characters that cannot see the ``performer''.
+\item[ch] The ``performer''.  Also determines the room for the output.
+\item[obj] \texttt{struct obj\_data~*}
+\item[vict\_obj] Predefined string of text, or second character or object.
+\item[type] \texttt{TO\_VICT}, \texttt{TO\_CHAR}, \texttt{TO\_NOTVICT}, or \texttt{TO\_ROOM}.
+\end{Ventry}
+ \vspace*{0.5cm}
+\renewcommand{\columnseprule}{0.5pt}
+\begin{multicols}{2}
+\begin{description}
+\item[\$a] ``{\it an}'' or ``{\it a}'', depending on the first character of \texttt{obj}'s name.
+\item[\$A] Like {\bf \$a}, for \texttt{vict\_obj} which is of type \texttt{struct obj\_data~*}.
+\item[\$e] ``{\it he},'' ``{\it she},'' ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$E] Like {\bf \$e}, for \texttt{vict\_obj} which is of type \texttt{struct char\_data~*}.
+\item[\$F] Processes the string pointed to by \texttt{vict\_obj} (pointer of type \texttt{char~*}) with the \texttt{fname()} function prior to printing.
+\item[\$n] Write name, short description, or ``{\it someone}'', for \texttt{ch}, depending on whether \texttt{ch} is a PC, a NPC, or an invisible PC/NPC.
+\item[\$N] Like {\bf \$n}, except insert the text for \texttt{vict\_obj} which is of type \texttt{struct char\_data~*}.
+\item[\$m] ``{\it him},'' ``{\it her},'' or ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$M]  Like {\bf \$m}, for \texttt{vict\_obj} which is of type \texttt{struct char\_data~*}.
+\item[\$o] Name or ``{\it something}'' for \texttt{obj}, depending on visibility.
+\item[\$O] Like {\bf \$o}, for \texttt{vict\_obj} which is of type \texttt{struct obj\_data~*}.
+\item[\$p] Short description or ``{\it something}'' for \texttt{obj}.
+\item[\$P] Like {\bf \$p} for \texttt{vict\_obj} which is of type \texttt{struct obj\_data~*}.
+\item[\$s] ``{\it his},'' ``{\it her},'' or ``{\it it},'' depending on the gender of \texttt{ch}.
+\item[\$S] Like {\bf \$s}, for \texttt{vict\_obj} which is of type \texttt{struct char\_data~*}.
+\item[\$T] Prints the string pointed to by \texttt{vict\_obj} which is of type \texttt{char~*}.
+\item[\$u] Processes the buffer and uppercases the first letter of the previous word (the word immediately prior to the control code).
+ \item[\$U] Processes the buffer and uppercases the first letter of the following word (the word immediately after to the control code).
+\item[\$\$] Print the character `\$'.
+\end{description}
+
+
+\end{multicols}
+\end{document}
+\end
Index: doc/sources/admin.tex
===================================================================
RCS file: admin.tex
diff -N admin.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsIhn7QO	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,261 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 5/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{The CircleMUD Administrator's Manual}
+\author{Jeremy Elson\\
+$<$jelson@circlemud.org$>$}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document describes how to configure CircleMUD and how to compile it for the first time.  It also discusses how to run the server including documentation of command-line options, a description of system logs and how to use them, and a description of daily and long-term maintenance required by the MUD. The intended audience is implementors new to CircleMUD or MUD administration in general.
+\par
+More information about CircleMUD, including up-to-date versions of this documentation in ASCII and Postscript, can be found at the CircleMUD Home Page \url{<http://www.circlemud.org/>} or FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}.
+\end{abstract}
+
+\tableofcontents
+
+\section{Welcome to CircleMUD!}
+
+\subsection{Background and Introduction}
+CircleMUD is a derivative of DikuMud, the Multi-User Dungeon developed at DIKU, the Department of Computer Science at the University of Copenhagen.  The original CircleMUD, version 1.0, was run by Jeremy Elson at the Johns Hopkins University's Department of Computer Science with moderate popularity from January until September of 1992.  The version 1.0 code, which was never released to the public, was archived and remained inactive for several months after the death of the original CircleMUD.  In the summer of 1993, it was taken out of storage and cleaned up with the intention of making it a public code base that anyone could freely download and use to start a MUD.  Version 2.0, the first publically available version, was released in June of 1993.  Circle has been maintained as a public code base ever since then, although we do not actually run a MUD of our own. The original CircleMUD has not run since it went down in 1992, nor will it ever run again. 
+\par
+Hundreds of carefully spent hours have gone into the development of Circle, but it is not a finished product -- it is only a beginning.  It has only a small number of spells and skills, a small world with relatively few areas, and only the 4 original DikuMud classes.  From a gamer's point of view, it pales in comparison to other MUDs which have dozens of spells spread over a dozen classes, a rich palette of skills, and thousands upon thousands rooms, mobiles, and objects.
+\par
+Yet from a programmer's point of view, Circle is very highly developed.  While the look and feel of the original DikuMud has been maintained, most of the underlying code and many of the structures have been optimized, reworked, or completely redesigned to be efficient, compact, and easily changeable and extensible.  Dozens of features which have become standard in the MUDding world over the past few years, although they were not part of the original DikuMud release, were added to Circle as well.
+\par
+The result is that CircleMUD is a launching pad for your own MUD ideas.  Our hope in releasing it is that it will free potential MUD implementors from having to worry about dealing with bug-ridden code or wasting time reinventing the wheel by re-coding standard MUD features, allowing them to devote more effort towards creatively shaping Circle into their own unique vision of how a MUD should look and feel.  The reason why Circle has so few specialized spells, skills, classes, and races is to encourage implementors just like you to create your own unique system instead of just another stock MUD that everyone has seen before. 
+\par
+So, it is with this message that we inflict our code on the world: don't just put another generic MUD on the Net -- give us something new and exciting, and have as much fun as possible in the process! 
+
+\subsection{Are you a Player or an Administrator?}
+If you're playing a game like Zork or Doom, you're both the administrator and the player of the game: you're the one who has to download the software and get it running, and you're also the one who gets to play. MUDding isn't that way at all, because there's usually a very strong division between people who play MUDs and people who administer MUDs. If you've never played a MUD before, jumping right in and trying to run one of your own will probably just get you hopelessly confused.  Instead of trying to compile and run the CircleMUD package yourself (which is presumably what you're trying to do if you're reading this document), you should play someone else's copy of CircleMUD.  There is a partial list of sites  \url{<http://www.circlemud.org/sites.html>} using CircleMUD on the CircleMUD web server.
+
+\subsection{So, you're sure you want to run your own MUD?}
+If you're already an old hand at playing MUDs and you've decided you want to start one of your own, here is our advice: take a vailum, lie down, and hide in a dark closet until the desire goes away.  Just playing MUDs is masochistic enough, isn't it?  Or are you trying to shave that extra point off your GPA, jump down that one last notch on your next job evaluation, or get rid of that pesky Significant Other for good?  If you think silly distractions like having friends and seeing daylight are preventing you from realizing your full potential in the MUD world, being a MUD Administrator is the job for you. 
+\par
+Don't get me wrong: running a production MUD can be great fun.  It can also be overburdened by politics and plagued by spiteful players devoted to making your life difficult, and otherwise be a highly frustrating endeavour.  That's why I don't do it any more. 
+
+\subsection{Giving Credit Where Credit is Due}
+If I haven't scared you away yet, and you're still sure you want to use CircleMUD, please stop for a moment and look at the CircleMUD license in the file \texttt{license.doc}.  It outlines the terms under which you must use CircleMUD.
+\par
+The license is simple.  It boils down to the message, ``Don't rip off other people's work.''  Unfortunately, this simple message ended up becoming somewhat long-winded because I am trying to prevent people from abusing DikuMud in the future as they have in the past. 
+\par
+Also, out of courtesy if nothing else, please keep the \texttt{credits} file intact.  You can add your own credits on top of the existing file, but I'd appreciate it if you would not simply remove it and all references to the word ``Circle'' everywhere in the MUD.  How would {\em you} feel if  someone took {\em your} code and then took credit for it?
+\par
+USE OF THIS SOFTWARE IN ANY CAPACITY IMPLIES THAT YOU HAVE READ, UNDERSTOOD, AND AGREED TO ABIDE BY THE TERMS AND CONDITIONS SET DOWN BY THE CIRCLEMUD LICENSE. 
+
+\section{Getting Started}
+
+\subsection{Section Requirements}
+CircleMUD 3.0 was originally written as UNIX software and will automatically configure itself (using GNU autoconf) and compile under most versions of UNIX, both BSD and System V derivatives.  With minor adjustments (documented below), the same source should compile under Microsoft Windows 95 and NT, IBM OS/2, and the Amiga.  Users have also reported getting Circle to compile and run under MkLinux, the port of Linux to the Power Macintosh.  CircleMUD will {\em not} work under DOS, Windows 3.x, Windows for Workgroups 3.x, or Mac System 7.
+\par
+Specifically, the following variants of UNIX have been tested and are known to work with Circle:
+\begin{itemize}
+\item SunOS 4.1.4
+\item Solaris 2.3 and above
+\item Irix 5.2, 6.2
+\item AIX 3.2
+\item Ultrix 4.x
+\item HP-UX 9.x
+\item Linux 1.x, 2.x
+\item BSD/OS 2.1
+\item Mac OS X (10.0 and above)
+\end{itemize}
+If your system is not listed, don't despair; because of the \texttt{autoconf} program, Circle will compile under most versions of UNIX on its own.  A large effort was made to make Circle v3.0 more portable by converting many of its system calls over to POSIX compliance.  Converting Circle to POSIX vastly helps portability on modern operating systems, most of which are POSIX-compliant.  Unfortunately, on some older systems that are not (such as NextSTEP 2.x), it may be more difficult to compile 3.0 than it was to compile earlier versions of the code.  (POSIX stands for Portable Operating System Interface for UNIX and is an effort to standardize the way UNIX programs talk to the operating system.  For more information, see Stevens' excellent book, {\em Advanced Programming in the UNIX Environment}.)
+\par
+For a small, private MUD, or a MUD used only for testing and development, about 10 MB of disk space and 16 MB of memory should be sufficient. For large, public MUDs with a large player base, 30 to 50MB of disk space and at least 32 MB of memory are recommended.  Free memory is much more important than CPU speed; CircleMUD uses virtually no CPU time.
+\par
+Historically, CircleMUD has always been developed under different variants of UNIX.  The original CircleMUD was run on a DECstation 3100 running Ultrix 4.0, which remained Circle's development platform until v2.0.  Starting with v2.0, Circle was developed under various versions of Linux and Solaris over the years ranging from Linux 0.99.11 through the current Linux 2.2.x and including Solaris x86 5.6.
+
+\subsection{Downloading and Unpacking the Source}
+The first step in setting up CircleMUD is to make sure you have the most recent version of the source; if you downloaded CircleMUD from an unofficial mirror site, it could be out of date.  You can always find the most recent version of the source at CircleMUD's official FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}
+\par
+The archive is offered several formats: one which ends in \texttt{.tar.gz}, one which ends in \texttt{.zip} and one which ends in \texttt{.lha}.  The files have the same contents but have been compressed using different programs.  You should ensure that you get a copy that you can unpack on your operating system.
+\par
+Next, unpack the archive.  If you have the \texttt{.tar.gz} version, unpack it using \texttt{gzip} (GNU unzip) and the \texttt{tar} archiver.  If you don't already have them, both of these utilities can be downloaded from the GNU FTP site \url{<ftp://ftp.gnu.org/pub/gnu/>}. To unpack the archive on a UNIX system, type: 
+\begin{verbatim}
+        gzip -dc circle30xxx.tar.gz | tar xvf -
+\end{verbatim}
+\par
+If you downloaded the \texttt{.zip} or \texttt{.lha} version, make sure to use an UNZIP program capable of handling long filenames and which preserves the original directory structure of the archive (PKUNZIP 2.04 does {\em not} do either of these things by default.) The best unzip program is probably Info-Zip's unzip program \url{<http://www.info-zip.org/>}; it is compatible with all UNIX variants, Windows, OS/2, the Amiga, and pretty much every other computer on the planet.  If you have Windows 95/98 or NT, another good choice is WinZip \url{<http://www.winzip.com/>}.
+\par
+For the next few sections, please note that the Cygnus Tools (Cygwin) are available for the Windows platform, which allow users to use Unix tools on that operating system.
+
+\subsection{Configuring CircleMUD}
+{\bf Note: This section applies {\em only} to UNIX users.  If you're using Windows, OS/2, or the Amiga, read \texttt{README.WIN}, \texttt{README.OS2} or \texttt{README.AMIGA} instead.}
+\par
+Circle must be configured using the \texttt{configure} program which attempts to guess correct values for various system-dependent variables used during compilation.  It uses those values to create Makefiles and a header file called \texttt{conf.h}.
+\par
+From Circle's root directory, simply type
+\begin{verbatim}
+        ./configure
+\end{verbatim}
+If you're using \texttt{csh}, it may not execute ``configure'' properly, giving you an error message like ``\texttt{Permission denied}''.  If this occurs, try ``\texttt{sh ./configure}'' instead. 
+\par
+\texttt{configure} can take several minutes to run if you're using a slow  computer.  It will print out various status messages while it works, telling you what characteristics of your computer it has found. It should create two Makefiles (\texttt{src/Makefile} and \texttt{src/util/Makefile}) and one header file (\texttt{src/conf.h}).
+\par
+You should only need to run \texttt{configure} once -- right after you unpack CircleMUD from its archive.  You will probably compile the source dozens of times as you add new features, but \texttt{configure} only needs to be run before the first time you compile. Please note that there is one exception to this rule: if you move your MUD to a different computer, you must run \texttt{configure} again before you can recompile the source code.  To rerun configure after moving the source, make sure to delete the file called \texttt{config.cache} and then run \texttt{configure} again. 
+
+\subsection{Compiling CircleMUD}
+{\bf Note: This section applies {\em only} to UNIX or Cygwin users.  If you're using Windows, OS/2, or the Amiga, read \texttt{README.WIN}, \texttt{README.OS2}, or \texttt{README.AMIGA} instead.}
+\par
+The \texttt{src} directory contains the source code for the main MUD server; \texttt{src/util} has the source for a dozen or so MUD maintenance utilities.  There are two Makefiles, one in each source directory, but all compiling is normally performed from the \texttt{src} directory only.  To compile the only CircleMUD server itself, type ``\texttt{make}''.  Use ``\texttt{make utils}'' to compile the utilities, or ``\texttt{make all}'' to compile both the server and the utilities.  It is also possible to compile individual utilities from the \texttt{src/util} directory: from \texttt{src/util}, type ``\texttt{make [utility-name]}''.  All compiled binaries go to the \texttt{bin} directory.
+\par
+The stock (unmodified) CircleMUD code should compile with no warnings or errors.
+\par
+Despite my best efforts there's a chance that you'll have problems compiling Circle if you're using some version of UNIX that I've never seen before.  It's impossible to give general advice on how to port software, except to say that you should ask a friend who knows a lot about both UNIX and C to help you.  Also, if you have problems, you should definitely look at the CircleMUD FAQ (Frequently Asked Questions list with Answers), which you'll find in Circle's home directory.  
+\par
+If you do port Circle to some other platform successfully, please share your hard work with others by sending a description of what you had to do to get Circle to compile on your system to \url{<cdev@circlemud.org>}.  Be sure to include the specific name of your operating system and hardware.  Full details on porting to a new system can be found in the Porting CircleMUD document.
+\par
+The Makefile directs all compiled programs to the \texttt{/bin} directory.  Although not recommended, you may want to put Circle's \texttt{/bin} directory in your \$PATH.  The reason that this is not recommended is that most of the resources are referenced using relative paths, and thus require that you run the programs from the base CircleMUD directory.
+
+\section{Running CircleMUD}
+{\bf Note: This section applies {\em only} to UNIX or Cygwin users.  If you're using Windows, OS/2, or the Amiga, read \texttt{README.WIN}, \texttt{README.OS2}, or \texttt{README.AMIGA} instead.}
+
+\subsection{Execution and \texttt{autorun}}
+\begin{enumerate}
+\item type 'autorun \&'
+\item Wait a few moments for the server to boot.
+\item type: \texttt{telnet localhost 4000}
+\end{enumerate}
+\par
+Circle should always be run from circle's ``root'' directory, not the \texttt{/bin} directory.  You can run it manually by typing \texttt{bin/circle} (useful for testing and debugging).  For running the game ``for real,'' it is better to use the \texttt{autorun} shell script provided in Circle's root  directory.
+\par
+Autorun lets Circle run itself for long periods of time.  It continuously runs the game as well as removing old system logs, moving newer system logs to the \texttt{log} directory, and saving certain log entries to permanent files. 
+\par
+Autorun can be controlled by creating files with certain names.  You can use the '\texttt{touch}' command to create a file, and, of course, the '\texttt{rm}' command to remove a file.  If a file called '\texttt{.fastboot}' exists, the CircleMUD will reboot immediately if it crashes or is shut down instead of waiting 40 seconds as it normally does.  A file called '\texttt{.killscript}' will cause the script to terminate itself; i.e.\ if you want to bring the game down.  If you want to temporarily prevent the MUD from rebooting, create a file called ``\texttt{pause}''; the script will go into a wait loop until '\texttt{pause}' is removed.
+\par
+Although you can create these files manually, the{\bf shutdown} command from within the MUD has several options which will create these files for you.  See the {\bf shutdown} help entry in \texttt{wizhelp.doc} for more information.
+
+\subsection{Command-Line Options}
+Circle recognizes a number of command-line options.  You can use them by actually specifying them on the command-line when running Circle manually or, by adding them to the \texttt{FLAGS} variable in your autorun script to use the options automatically every time you run the MUD with autorun.\newline
+\newline
+The syntax is:
+\begin{verbatim}
+   circle [-m] [-q] [-r] [-s] [-d <path>] [port]
+\end{verbatim}
+\begin{description}
+\item[-m] Mini-Mud Mode.  Mini-mud will be one of your most powerful debugging tools; it causes Circle to boot with an abridged world, cutting the boot time down to several seconds.  It is useful for testing features which are not world-related (i.e, new commands or spells).\newline
+CircleMUD uses split world files (in the lib/world hierarchy); each directory (i.e.\ wld, obj, mob, shp, and zon) has a file called "\texttt{index}" which specifies which files should be loaded at boot-time.  The file "\texttt{index.mini}" specifies which parts of the world should be loaded with the -m option.
+\item[-q] Quick Boot.  Prevents checking of timed out object files.  Every time Circle boots, it checks every object file to see if it has timed out; if so, it is deleted.  This is done primarily to save disk space.  If time is more important to you than space, use the -q option.  -q is automatically activated when you use -m.
+\item[-r] Restricted Game.  Allows you to decide at run-time whether or not the game will allow new characters to be created.  Using -r is equivalent to typing "\texttt{wizlock 1}" (see \texttt{wizhelp.doc} for more information).
+\item[-s] Special Routines Disabled.  Allows you to suppress the assigning and calling of all mobile, object, and world special procedures. Historically used as a debugging tool in conjunction with the -d option (see below), but now obsolete because Circle checks to make sure entities exist before attempting to assign a special procedure to them.
+\item[-d] Data Directory.  Useful as a debugging and development tool, if you want to keep one or more sets of game data in addition to the standard set, and choose which set is to be used at run-time.  For example, you may wish to make a copy of the entire world in a separate directory, so that you can test additions to the world files without subjecting players to unnecessary hazards.  The default data directory is '\texttt{lib}'.  Any core dumps (may they never happen to you!) will take place in the selected data directory.
+\item[port] Port Selection.  Allows you to choose on which port the game is to listen for connections.  The default port is 4000, which is historically the port used by most DikuMuds.  You can change the default in \texttt{config.c} and the \texttt{PORT=} line of the autorun script.  (The \texttt{PORT=} line of \texttt{config.c} simply passes the value as a command-line parameter to Circle.)  The port specified on the command line or by the autorun script will take precedence over the port specified in \texttt{config.c}.
+\end{description}
+
+\subsection{Creating an Implementor Character}
+The first character to log in to the MUD will be made the maximum (Implementor) level.  If you log in and aren't made an implementor, then the playerfile probably is not empty -- take the MUD down, delete the playerfile (\texttt{lib/etc/players}), and start the MUD again.  You should fix your stats using the RESTORE command when you first create the character (i.e.\ type "\texttt{RESTORE $<$your-name$>$}".
+\par
+Once you are logged in as an implementor, type WIZHELP for a list of privileged commands.  Documentation of those commands is contained in the file \texttt{wizhelp.doc}.  \texttt{wizhelp.doc} is in the standard help file format, so you can simply add it to the help index file if you want online help available for wizard commands.  (\texttt{wizhelp.doc} is not contained in the online help by
+default as a security precaution.)
+\par
+To create additional wizard characters, log them in normally as level 1.  Then, advance them using your implementor character, using the \texttt{ADVANCE} command.  See \texttt{wizhelp.doc} for more information.
+
+\section{Customizing CircleMUD}
+Once you get over the initial euphoria of having your own MUD compile and run successfully for the first time, you should be aware of some of the files which control how Circle looks and feels so that you can configure it for your personal taste.
+
+\subsection{\texttt{config.c}}
+The most useful file for configuration is the config.c source file.  It has dozens of options useful for customizing your MUD.  Before you open your MUD to players, you should carefully read through config.c from beginning to end, checking what options are available as well as making sure they're all set the way you want them.  Remember, you have to recompile and rerun the MUD before any changes you make to \texttt{config.c} take effect, of course.
+
+\subsection{Text Files}
+The place where most of your day-to-day changes will be is in the \texttt{lib/text} directory, which contains all of the text files read by players.  The most visible file is ``\texttt{motd}'', (Message Of The Day), which is the message that mortals seen (though not necessarily read!) when they log in. Similarly, the ``\texttt{imotd}'' (Immortal MOTD) is seen by immortals when they log in.  Other interesting files are ``\texttt{news}'' (for the \texttt{NEWS} command), ``\texttt{help}'' (for the \texttt{HELP} command with no arguments), ``\texttt{help\_table}'' (for \texttt{HELP} with an argument), and others.
+\par
+One file is particularly important: ``\texttt{policy}''.  Despite what anyone tells you, and your best efforts to the contrary, your MUD will have political problems.  If anyone tells you that you can run a MUD without politics, they're wrong.  If you tell your players that you're going to run a revolutionary MUD that doesn't have any politics, you're lying.  Every MUD has political problems sooner or later. Unfortunately, this usually occurs ``sooner''.  There are various ways to make political problems easier to handle, but the best way is to decide on some ground rules from the very beginning, and then set those decisions down in writing.  That's what the ``\texttt{policy}'' file is for.  You probably know what kind of political problems MUDs have (you are not trying to run a MUD without ever having played one, are you!?) -- stuff like playerkilling, thieving, kill stealing, client use, multi-char playing, reimbursements, etc.  Decide on your policies early and make sure your characters know what those policies are.
+\par
+It is also important to write down a set of rules dictating what immortals are allowed to do and not allowed to do.  That's what the ``\texttt{handbook}'' (Immortal Handbook) is for.  Immortals will always try to bend you as far as they can, so it's important for you to decide on answers to questions before those questions come up.  Can immortals assist players?  What about giving a single 'cure light' for a player about to die?  Can immortals kill mobiles for their own enjoyment?  Can they kill players for the same reason?  Are they allowed to make policy?  Break policy?  Moderate disputes?  Turn over each others' decisions?
+
+\subsection{World Files}
+The root of the area hierarchy is \texttt{lib/world/}.  \texttt{lib/world/} has 5 subdirectories: wld, mob, obj, shp, and zon, which is where the world, mobile, object, shop, and zone files go, respectively.  Each directory has a set of world files in it with the appropriate extension (i.e.\ the obj subdir will have a bunch of files ending with ``\texttt{.obj}'', such as 30.obj, 31.obj, etc.) plus two special files called ``\texttt{index}'' and ``\texttt{index.mini}''.  ``\texttt{index}'' is a list of which world files are to be loaded by Circle.  This makes the job of adding new areas easier -- just add the new area files to
+your area directory, and then add the name of the new file to ``\texttt{index}''.  ``\texttt{index.mini}'' controls which (smaller) set of world files should be loaded in the debugging mode (Mini-Mud Mode, explained below.)
+
+\section{System Logs}
+CircleMUD writes a wide variety of information to standard output and standard error.  If you're using the autorun script, the boot messages are put into a file called ``\texttt{syslog}''.  During Circle's boot sequence, the system log keeps a record of everything the MUD is doing to initialize itself; this can be useful to determine what the problem is if the MUD dies while it is booting.  Once the game is up and running, the syslog contains player information, recording when players connect, disconnect, rent, unrent, quit, die, hit death traps, etc.  The game also records status information about itself, falling generally into two categories: usage information and errors.
+
+\subsection{Player Information}
+The player information recorded by Circle's system logs will serve you very well as your players start to make wild claims about strange bugs resulting in them losing equipment or points.  Many mudders prey on the insecurities of a new mud administrator who is terrified that his or her MUD is riddled with bugs and will do anything to satisfy grumpy players -- don't let yourself fall into that trap!  CircleMUD is bound to contain bugs, but most of the core systems have been well tested, so you should take claims such as ``I magically lost all my stuff!'' with a grain of salt and check your system logs.
+\par
+If a player ever asks you for reimbursement of equipment, money, gold, experience points (XP), or whatever, your gut reaction should always be to check the logs first.
+
+\begin{quote}
+As a sidebar, let me point out that the value of system logs is twofold: 1) they actually provide you with valuable information, and 2) they make your players paranoid.  When I first started mudding and I heard about this mysterious ``system log'', it made me incredibly paranoid.  Now that I've done a good deal of MUD administration, I've seen the same paranoia in \underline{many} other players.
+\par
+That paranoia is a very good thing.  The system logs become an abstract and shapeless but omnipresent force on the MUD.  Players hear about ``the System Log'' and then get paranoid that everything they do is being recorded, so they tend to behave, lest the evil System Log betray their wrongdoings to the Gods.
+\par
+For this reason, when you go to check your logs, it's a good idea to say something like ``Hold on... let me go check the system logs, OK?'' because it reinforces the syslog's presence in the collective
+psyche of your players.
+\end{quote}
+
+Back to the point.  When someone claims that they've been wronged by the evil system, always check the logs.  The logs give you power to say things like ``What do you mean your items disappeared in rent?  It says right here in the logs `Rasmussen has quit the game.'  You did not rent at all, you just {\em quit}!''
+\par
+To diffuse disputes such as, ``The game dumped my stuff, but I had enough money!!'' or ``I logged in and my stuff was gone, there must be a bug!!'', two types of log entries are written.  First, every time a character rents, the log records the character's per diem rent rate as well as the total amount of money on hand and in the bank.  Second, the log records makes a record of all characters' equipment dumped due to insufficient funds.
+\par
+Remember, rent is specified as a daily rate but is amortized on a per-second basis!  In other words, if you rent at the rate of 100 coins per day and come back 36 hours later, you'll be charged 150 coins.
+\par
+The \texttt{autorun} script saves 6 levels of raw system logs.  In addition, it greps the logs for certain pieces of extra-juicy information to save indefinitely.
+\par
+The system logs are your friends.  Love them.
+
+\subsection{Usage Information}
+Every 5 minutes, the game counts how many people are playing and records that information in the system log.  Optionally, if you define RUSAGE in \texttt{comm.c}, it will also record system resource information such as CPU time and memory used.  The usage information currently logged by Circle is, as you can see, somewhat sparse; local MUD admins are encouraged to add
+to this code as is appropriate for their particular site.
+\par
+Usage information isn't critical, but it is interesting to look at the usage patterns to determine when your peak playing hours are.  If you're good at using `cut' and other Unix utilities, you can even dazzle your friends by graphing your MUD's system usage.
+\par
+{\it Note: friends not included with the CircleMUD distribution.}
+
+\subsection{Errors}
+Just as your first gut instinct should be to look at the logs if a player starts begging you for something, your first gut instinct in the event of a crash or unexpected shutdown should also be to look at the system logs.
+\par
+A Unix utility called `\texttt{tail}' is used to look at the last few lines of a text file; it is very useful for looking at the last entries in the system log to see the last thing that happened before the shutdown.  Often, Circle will report an error in the logs just before it crashes.  This method is
+particularly useful if the MUD crashes during its boot sequence, because the logging during boot is intensive.
+\par
+If Circle shuts down unexpectedly and there is no core dump in the \texttt{/lib} directory, the game probably detected an internal error and killed itself. Such shutdowns are always preceded by entries in the system log describing the error.
+\par
+If there is no error message at the end of the log, then there probably IS a core dump, so you can use `\texttt{dbx}', `\texttt{gdb}', etc. to examine the core dump and determine the reason for the crash.  The file \texttt{hacker.doc}, generously provided by Furey of MERC Industries, offers useful insight into the art and science of debugging -- you'd be well advised to give it a look-see.
+\par
+Circle sometimes encounters a serious but non-fatal error; in this case, the error will be written to the system log with the prefix SYSERR, but the MUD will not shut itself down.  You should always be aware of any SYSERRs which occur -- they are often useful for foreseeing imminent danger or averting problems before they become critical.  If a SYSERR does occur, try to determine if a change you've made recently has caused it.  Ignoring SYSERRs is like ignoring compiler warnings: you can be tempted to ignore them because the game keeps going even if they exist, but you can easily get yourself into trouble by not listening.  The autorun script saves all SYSERRs to the file \texttt{log/errors}.
+
+\section{MUD Maintenance}
+\subsection{Technical Maintenance}
+Once you get the MUD up and running, you will surely want to modify it -- adding new areas, new features, new code, and new ideas, however these topics are beyond the scope of this document.  See \texttt{coding.doc}, \texttt{areas.doc}, and other creation documents for more information about how to customize your MUD once you get it up and running.  This section simply focuses on some of the simple maintenance that'll be necessary to keep your MUD running smoothly. Make sure not to get so caught up in being a God that you forgot you're also supposed to be acting as a software engineer!
+\par
+First, you should look at the log/errors file regularly to make sure there are no recurring problems, particularly problems that may have been caused by code you've added.  If the MUD crashes, it will usually generate what is called a ``core dump'' -- a big file called ``\texttt{core}'' in your lib directory, created by the operating system to record the state the game was in the moment before it crashed.  You should look at the core dump using a debugger such as ``\texttt{gdb}'' or ``\texttt{dbx}'' to determine why the MUD crashed.  See the file ``\texttt{hacker.doc}'' for more information about debugging.
+\par
+You probably will want to clean out the playerfile on a regular basis to remove deadweight characters (i.e.\ people who log in and look around for 10 minutes, and then never come back).  You can decide how often to purge the playerfile -- every day if disk space is tight, or every month if it isn't.  The \texttt{purgeplay} utility program included in the \texttt{src/util} directory removes deadweight players.  Make sure to run the ``\texttt{purgeobjs}'' script (in the \texttt{lib/plrobjs} directory) after you purge the playerfile.  \texttt{purgeobjs} removes the object files of players who no longer exist in the playerfile.
+\par
+The '\texttt{automaint}' script in the main circle directory will automatically purge the playerfile and player objects for you.  {\em DO NOT RUN THIS SCRIPT WHILE THE MUD IS RUNNING!}  Doing so will make your life (more) difficult.
+
+\subsection{Diplomatic Maintenance}
+Okay, so now you have your wonderful CircleMUD up and running smoothly and all is right with the world.  Right?
+\par
+Wrong.
+\par
+Well, technically, right.  Circle requires very little day-to-day attention in order to keep the program itself running smoothly.  But the MUD itself is just a series of instructions running on a computer, processing data.  Never lose sight of the fact that there will be dozens, hundreds, or maybe even thousands of people connecting to your MUD -- and they are not programs.  They are people!
+\par
+From the technical side, there are relatively few things you have to do to keep the game running.  But you cannot just dump a MUD on the Internet and then ignore it!  Spend time on your MUD.  Try to keep up with the boards, and make an effort to respond to the complaints, ideas, and
+suggestions posted there.  Take a look at the `\texttt{bug}', `\texttt{typo}', and `\texttt{idea}' files from time to time -- and maybe even respond to some of the ideas using Mudmail.  Try to respond to Mudmail you receive from players in a timely manner.  Make sure that your `\texttt{news}', `\texttt{policy}' and other text files are up-to-date and suit the political climate on your MUD.
+\par
+If you cannot or just do not want to deal with the player politics, make sure that you choose someone who can and will, and make them responsible for dealing with it.  If no one does it, your MUD will stagnate and die.
+
+\section{Final Thoughts}
+Try to remember that running a MUD should be fun.  It can sometimes be easy to lose sight of the ultimate goal of personal enjoyment that MUDs are supposed to provide, particularly when MUDs start to get crushed under the weight of their own politics or the egos of the administrators.  If you find that your MUD is more of a source of frustration than enjoyment, don't be afraid to close it.
+\par
+Good luck with your MUD!  Always feel free to write to us and let us know what you think of the MUD, and the interesting things you've done with it.  We cannot promise a timely response, but we love hearing from people who are using our code.
+\par
+For further information and updates, you can be certain to check out the CircleMUD homepages \url{<http://www.circlemud.org/>}, the associated pages of Ceramic Mouse \url{<http://developer.circlemud.org/>}, and the CircleMUD Mailing List \url{<http://www.circlemud.org/maillist/>}.
+
+\end{document}
+\end
Index: doc/sources/building.tex
===================================================================
RCS file: building.tex
diff -N building.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsZjsvaX	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,1403 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+\usepackage{times}
+\usepackage{varioref}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 4/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+\newenvironment{Ventry}[1]
+  {\begin{list}{}{\renewcommand{\makelabel}[1]{\textsf{##1:}\hfil}
+    \settowidth{\labelwidth}{\textsf{#1:}}
+    \setlength{\leftmargin}{\labelwidth}
+    \addtolength{\leftmargin}{\labelsep}
+  }
+  }
+  {\end{list}}
+
+\title{The CircleMUD Builder's Manual}
+\author{Jeremy Elson\\
+$<$jelson@circlemud.org$>$}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document describes how to create CircleMUD areas, and specifies the file formats for worlds, monsters, objects, shops, and zones, as well as providing examples of each.  All information necessary to build worlds can be found in this document.
+\par
+The intended audience is world builders interested in creating new worlds, implementors who need to decode existing world files, and coders extending the current world specification. Thanks to Jeff Fink (Teker) for documenting the shop format (as well as for submitting the shop code itself!), and Alex Fletcher (Furry) for writing parts of the Introduction.
+\par
+More information about CircleMUD, including up-to-date versions of this documentation in ASCII and Postscript, can be found at the CircleMUD Home Page \url{<http://www.circlemud.org/>} or 
+FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}
+\end{abstract}
+
+\tableofcontents
+
+\section{Introduction}
+\subsection{Your Job as a Tinyworld Architect}
+As a {\bf Tinyworld Architect} or {\bf Builder}, your job is to create the virtual world in which players can roam around, solve puzzles, find treasures, and gain experience.  A Builder creates the rooms, objects, and monsters with which players will interact, defining their textual descriptions, stats, abilities, and other special properties. A Builder should not be confused with the MUD's {\bf Coder}, whose job it is to modify the C code that makes the CircleMUD server actually run.  A Builder does not need to be a programmer, and building is not programming; building is done by writing data files in a particular format, which this document describes in detail. 
+\par
+There is a standard world included with the CircleMUD distribution which is intended to serve as a stepping stone and a basic guide to demonstrate what kind of worlds you can build for your MUD.  To {\em only} use the standard CircleMUD world, without adding any original work, is to guarantee your MUD will be boring and largely ignored.  MUDs are judged in many ways, but one of the most important is the number and quality of areas available. The areas are what tend to make a MUD original.  For example, one MUD could be based upon a magic-rich world and the code and areas would reflect this, while another could revolve around cities and thieves.  Each of these MUDs would have its areas designed in such a way to flesh out this theme.  In essence, building an area is like writing a book.  It needs to have a plot, needs to be descriptive, and needs to be populated with memorable people and places. 
+\par
+Writing an area requires inspiration and imagination before all else. Ideas for areas often come from literature; for example, an area that traces Alice's adventures through Wonderland or Dante's trip through the Inferno.  Areas usually start out on paper long before they reach a computer; a general map of the region can help to solidify the idea and a specific map of each individual room is absolutely required so that the rooms can be linked together in a way that makes sense geographically. Taking notes on ideas for which monsters should be encountered in the area, their descriptions, and in what location the monsters should appear can also help when planning an area.
+
+\subsection{Game Balance}
+{\bf Game Balance} is a term that brings a different thing to mind for every person that hears it.  What is most important about game balance is to keep in mind for whom each area is designed -- for example, high level players, newbies, or small groups.  The objects and monsters found
+in the area should match the level, abilities, and needs of the players expected to use the area.  Most players do not like to be given vast treasure with no difficulty in getting it, but on the other hand, nobody likes to fight the most difficult monster on the MUD and get nothing for doing it.  The job of the chief builder of a MUD and the authors of the individual areas is to find a happy medium between these two extremities.  The process of finding that medium on your MUD is what makes MUDs original. 
+\par
+The main factor that affects game balance is the areas that make up the MUD.  Because of this, each area should be checked against the others to ensure that one area is not impossibly hard or absurdly easy or rewarding relative to the rest of the world.  Each area that comes with the MUD or
+is added later should be checked by one or more implementors or builders, and the characteristics of the monsters and objects should be changed to suit to the balance of the MUD. Each new area that becomes part of the world should not be added until it has been similarly balanced to the implementors' satisfaction. Understandably, builders want their zones to be popular, but they sometimes attempt to achieve this goal by purposefully making their zone unbalanced, adding powerful weapons or armor with no harmful side-effects or monsters that are easy to kill yet give massive numbers of experience points. Such zones are destined both to become very popular and invariably to bring about the death of your MUD's game balance. 
+\par
+An area's balance should be an integral part of the design process, not something to be tacked on as an afterthought.  Too often, an area will be designed with outrageously good weapons and armor which throws off the balance of the game.  Naturally, after such zone is added, players complain bitterly if it is ever removed or toned down. Also, because the rent system saves hitrolls, damrolls, and ac-apply's, veteran players will be able to hold on to their old, spectacular equipment unless it is explicitly taken from them, even after the area has been changed. This does nothing but generate bad feelings on all sides. Therefore, the wise implementor will always carefully check a zone for balance {\em before} it is added to the production MUD. It is generally not a good idea to ``let the players balance the area'' by unleashing an unbalanced area on them and watching to see where the hordes of players go. 
+
+\subsection{Making Your Areas Interesting}
+An interesting area will always attract more players than a bland one.  There are many ways to make an area interesting.  Try to be as descriptive as possible; don't hold back on writing extra descriptions.  Players are so accustomed to not having richly described areas that finding an extra description can often be a real treat.  Also, one oft forgotten thing to describe are the door exits.  Describing all of these can give a feel of standing out in a field and looking off to the north and seeing something like: 
+
+\begin{quote}
+The fields stretch off towards the large hills on the horizon.  Far to the north you see what appears to be a plume of smoke.
+\end{quote}
+
+With door descriptions like these, an area will feel more fleshed out to the player.  Many players (both experienced and first timers) read the descriptions carefully the first time they walk through an area, and having many extra descriptions helps them fill out their idea of what things actually look like. 
+\par
+One thing that should never be done is to have generic room descriptions like ``You stand in a big room.  It is very dark.'' Descriptions like these detract in general from the rest of the world, and
+if they are found room after room can bore a player to tears.  Such a
+description could be changed to: 
+
+\begin{quote}
+You stand in a room of very large size.  Shadows cower along the walls and almost seem to be moving as you look around yourself.  The floor is made of heavy stones which are very dark in color.  The ceiling is quite some distance above you, but you can still make out objects hanging from it, ruining the smoothness that is characteristic of the rest of the room.
+\end{quote}
+
+Another way to make an area interesting is to create some sort of plot line for it, or a coherent theme, rather than a collection of haphazardly related rooms.  The plot can be complex like infiltrating a castle to garner the war plans of the evil Lord Zygol, simple like ridding the caves of goblins, or anything in between.  Often the plot in an area can be advanced by some fairly simple puzzles or descriptions.  With the help of special procedures written in C by the MUD's coder, involved puzzles of Zork-like complexity can be readily created. 
+\par
+Not all monsters have to be designed to be killed, nor does every shopkeeper have to buy or sell something -- they could just be created so that they refuse to trade with any player characters.  The players will then wonder why the shopkeeper exists.  Perhaps giving him a jewel will make him more friendly.  In this way, an area can be made infinitely more exciting by coding some special procedures for it.  Perhaps random teleporters throughout the area, perhaps some procedures that have monsters respond to questions from players. 
+\par
+All in all, the best way to make an area interesting is to use variety, intelligence, and imagination in building.  Try to imagine what it would be like for you to walk through and what you might try looking at or doing, and then try to incorporate that into your area.  Show your area to others and take their advice.  By taking all of this extra effort in creating your area, you will be rewarded by leaving a lasting memory of your area in the minds of many players. 
+
+\subsection{Using World-Building Programs}
+In the old days, the only tool that was used (or required) to write a MUD area was a simple text editor.  However, in the course of time, various people have written programs to help builders create worlds without having to understand the complex details of the world file format.  World-building programs are becoming more popular, especially the fancy graphical builders that run under Microsoft Windows.  You may prefer to use one of them rather than trying to use a simple text editor and understanding the format on your own.  New world-builders are constantly being written
+and released, so any attempt to describe them here will almost certainly be obsolete by the time you read it.  However, some of them can be found
+in the \texttt{contrib/} section of CircleMUD's official FTP site
+\url{<ftp://ftp.circlemud.org/pub/CircleMUD/contrib/>}.
+
+\section{The Mechanics of World Building}
+\subsection{Overview of the MUD World}
+CircleMUD's world is divided into distinct sections called {\bf zones}. Each zone typically consists of a single, modular, geographically coherent region of the MUD's virtual world with a consistent storyline.  Each zone can define its own physical space (the {\bf world}), monsters (usually called {\bf mobiles}), {\bf objects} (such as armor, weapons and treasures), and {\bf shops}, in which a mobile in a particular room can buy and sell objects to players.
+\par
+A single zone typically contains up to than 100 rooms, 100 monster definitions and 100 object definitions, but a large region can be subdivided into several zones at the author's discretion.  For example, the City of Midgaard is divided into two zones, one for the main city and one for the southern residential area.  In addition to this, with the new zone system describing top and bottom rooms of a zone, zones can contain very few rooms and indeed can overlap with other zones if desired.  A zone can also use mobiles and objects defined by another zone, but this practice is discouraged because it makes zones less modular, meaning that it becomes more difficult to add or remove one zone without affecting another zone. 
+\par
+Each room, mobile and object within a zone is given a unique number called a {\bf Virtual Number} or {\bf Vnum}. The Vnums for the rooms, mobiles and objects are independent, so there can be both a room number 3001 and an object number 3001.  When defining and referencing parts of a zone, the zone author always refers to each entity by its Vnum and {\em never} by name.  Vnums are normally not seen by players.  Each zone itself also has a Vnum.  A common convention is to number the zone with the Vnums of its component rooms, divided by 100.  For example, Midgaard is zone 30, consisting of rooms 3000 to 3099.  Mobile and object numbering follows the same convention. 
+\par
+The author of the zone can define aspects of each room such as the terrain type, special properties like whether the room has its own light source or is a death trap, and other parameters.  A very important aspect of each room is the position of other rooms in relation to it; for example, from room 3014, one can go north to reach room 3005, east to room 3015, etc. Great care should be given to making the room links logical and consistent. A player who moves east and then immediately west should find herself back in the same room in which she started. 
+\par
+Each mobile is given characteristics such as number of hit points, bare hand damage capability, strength, and special skills and abilities.  Objects have parameters such as weight, value, and magical properties.  The author can also choose how these three pieces of the world are combined to form the initial state of the zone: for example, the number of each mobile that exist and in which rooms they stand, the equipment that each mobile uses, objects which might be on the floor, and the doors which may be initially locked or unlocked. 
+\par
+When the CircleMUD server runs the zone, it sets each zone to its initial state as defined by the author, and then makes the zone ``come alive'' by randomly making mobiles wander through the zone and, if desired, attack players.  While the players are using the zone (killing the mobiles and picking up equipment) the server periodically resets the zone to its initial state (a {\bf zone reset}) to prepare the zone for the next group of players. 
+
+\subsection{Learning By Example}
+Before descending into the details of MUD building, it should be noted that the formats of the world files are sufficiently complex that it is probably not possible to gain a complete understanding of them merely by reading this documentation.  This document is designed to be a reference manual and therefore may not serve as a particularly good tutorial.  While there are examples provided at the end of each section, they are only meant to be representative and are not comprehensive examples of all possible ways to use the features that will be described.  The most effective way is to learn by example: examine some of the areas that come with CircleMUD and try to figure out the meanings of the numbers in different rooms, objects, mobiles, and zone files, using this manual as a guide.  Once you're proficient at reading world files, you'll find that creating them is a much easier task. 
+
+\subsection{CircleMUD World Files}
+Each CircleMUD zone is defined by five types of files: world files, mobile files, object files, shop files, and zone files. World files (*.wld) define the actual rooms and the links from one room to another. Mobiles (*.mob) are the monsters which inhabit the MUD.  Objects (*.obj) are the weapons, armor, treasure, and other objects manipulated by players and monsters.  Shop files (*.shp) define the MUD's shopkeepers, controlling what they buy, sell, and say.  Finally, Zone files (*.zon) bring all the previous elements together to define the initial state of the zone, describing how monsters should be equipped, where monsters should be placed, where objects on the ground should be, which doors should be locked, etc.  These five types of files are collectively referred to as {\bf the world}, or sometimes the {\bf tinyworld files}.
+\par
+CircleMUD uses {\bf split world files} to make the world easier to manipulate.  Instead of all the rooms being lumped together in a single, cumbersome file, the rooms are split into many different files, one file for each area of the world.  All five types of files are split in a similar manner.  Circle has one directory for the room files (\texttt{lib/world/wld/}), one directory for the object files (\texttt{lib/world/obj/}), and so forth. 
+\par
+Circle doesn't care how the world files are split or what the names of the files are, but certain conventions have developed to make management of the world easier.  Each file typically contains information for only a single zone and the filename is typically the zone number, with an extension indicating one of the 5 file types.  For example, the file \texttt{30.wld} contains rooms 3000 to 3099 of zone 30; \texttt{42.mob} contains mobiles 4200 to 4299 of zone 42, etc.
+\par
+Also in each of these directories is a file called ``\texttt{index}'' that tells the server which files from that directory should be loaded when the server boots and a file called ``\texttt{index.mini}'' which (minimal) set of files should be loaded when the server is booted with the \texttt{-m} option. 
+\par
+Every world file used by Circle (including the index files) must be terminated by the dollar sign (\$) to tell the server that the file has ended.  Without the dollar sign, the server will not boot properly. 
+\par
+The \texttt{split} utility that comes with CircleMUD can be used to divide a large file into a number of smaller files; for example, if you have a large zone that you'd like to break into several smaller zones. See the CircleMUD Utility Manual for more information on how to use \texttt{split}.
+
+\subsection{Using Bitvectors}\label{usingbitvectors}
+When learning about the formats of CircleMUD world files, you'll frequently see references to {\bf bitvectors}.  A bitvector is a group of flags which each can be either on or off.  Bitvectors and their flags are used in many ways within CircleMUD, such as to define the personality of mobiles, the characteristics of rooms, etc.  Understanding how to use bitvectors is essential if you want to build a CircleMUD world.
+\par
+At every point where this document says a bitvector is required, it will be accompanied by a table describing the flags which you can use with that bitvector.  The table will look something like this:
+\begin{verbatim}
+  1    a    DIRTY     The room is dirty.
+  2    b    STINKY    The room stinks.
+  4    c    MUSHY     The floor of the room feels mushy.
+  8    d    SWAMPY    The room resembles a swamp.
+\end{verbatim}
+
+Note there are four columns in the table.  The first column contains the numeric value of the flag.  The second contains the alphabetic representation of the flag.  The third is the name of the flag, and the fourth is a description of what the flag does.
+\par
+There are two ways you can construct a bitvector with the table above: the numeric method and the alphabetic method.  The numeric method is to select all flags you'd like to activate, take the numbers of those flags as listed in the first column of the table, and add them all up.  The resulting sum will be the bitvector.  The alphabetic method is much easier: just write down all the letters of the flags you'd like to use with no spaces in between.  For both numeric and alphabetic bitvectors, use ``0'' to indicate a bitvector where none of the flags are set.
+\par
+For example, imagine you want to create a room that is dirty, mushy, and resembles a swamp, but does not stink.  Using the numeric method, you'd look up the numbers of those three flags (1 for dirty, 4 for mushy, and 8 for swampy), and add them up to get 13.  Using the alphabetic method, the bitvector would simply be ``acd''.  Bitvectors are case-sensitive; ``acd'' is very different from ``Acd'' and ``ACD''. 
+\par
+At every point where the CircleMUD format requires a bitvector, you can write either a numeric bitvector or an alphabetic bitvector.  They are completely interchangeable.  However, be forewarned that if you use alphabetic bitvectors, your area will not be compatible with MUDs based on the original DikuMud.  Alphabetic bitvectors are a CircleMUD enhancement and may not be supported by MUDs based on Gamma Diku. 
+\par
+In some bitvector tables, you will see values whose descriptions say ``Reserved for internal use'' or ``Do not use''.  You should never set those flag values in your world files. 
+
+\subsection{Adding New Areas to the MUD}
+After an area is written, there are three steps required to add it to the MUD for testing: copying the files into the proper directories, adding the new filenames to the appropriate index files, and running the MUD in syntax-check mode to make sure the new area is formatted correctly. 
+\par
+All world-related files go in the directory \texttt{lib/world/}. In this example, we will imagine that your new area is zone number 57 (which should consist of rooms, objects and mobiles numbered 5701-5799).  Your zone probably has 5 files: \texttt{57.wld}, \texttt{57.mob}, \texttt{57.obj}, \texttt{57.shp}, and \texttt{57.zon}. The first step is to copy each of these files into their appropriate
+subdirectory: \texttt{57.wld} should be copied to the directory \texttt{lib/world/wld/}; \texttt{57.mob} should be copied to the directory \texttt{lib/world/mob/}, and so forth.
+\par
+The next step is to add the name of the newly copied world files to the \texttt{index} file contained in each of the world subdirectories.  Note you will need to change 5 index files: one for each of the world files that you copied in the previous step.  Adding the filenames to the index files tells CircleMUD that the files should be loaded; they will {\em not} be loaded simply by virtue of being in the correct directory. First, edit the file \texttt{lib/world/wld/index}; you should see a list of the current world (room) files.  Add a single line that says \texttt{57.wld} in the correct numeric order.  Next, add a similar line in the other index files: add \texttt{57.mob} to \texttt{lib/world/mob/index}; add \texttt{57.obj} to \texttt{lib/world/obj/index}, etc.  At the same time, if the area is to be a central core area for the game, it should also be added to the \texttt{index.mini} file.
+\par
+Now you can try to boot the MUD with the new world.  If you're adding a new area which hasn't been debugged yet, it's usually a good idea to run Circle in its syntax-checking mode first.  From Circle's root directory, type \texttt{bin/circle -c} to run Circle's syntax checker. If the check runs with no \texttt{SYSERR} messages, the syntax of the area is probably correct and the MUD can be safely booted.  Otherwise, check the CircleMUD SYSERR List for more information on how to correct the formatting errors.  also, see the CircleMUD Administrator's Guide for more information on how to run CircleMUD.
+
+\section{World (Room) Files}
+\subsection{The Format of a Room}
+The format of a room is:
+\begin{verbatim}
+#<virtual number>
+<room name>~
+<room description>
+~
+<zone number> <room bitvector> <sector type>
+{zero or more direction fields and/or extra descriptions}
+S
+\end{verbatim}
+
+There can be between 0 and 6 direction fields in the standard CircleMUD code.  There should not be more than one direction field for a particular direction.  {\it For more information on adding directions to the standard ``neswud'', see the Coding CircleMUD document.} No Extra Descriptions are required but an unlimited number are allowed.  Each room is terminated with the literal letter \texttt{S}.
+
+\begin{description}
+\item[Virtual Number]
+This number is critical; it is the identity of the room within the game.  All other files will use this number to refer to this room.  From within the game, this number can be used with ``goto'' to go to this room.  The virtual numbers must appear in increasing order in the world file.
+\item[Room Name] This string is the room's title, which is displayed before the room description when players look at the room, or displayed alone if players are using ``brief.''
+\item[Room Description] The description of the room seen when they type ``look,'' or when they enter the room with brief mode off.
+\item[Zone Number] This number is obsolete and no longer used.  Historically it contained the zone number of the current room but it is currently ignored for everything except debugging messages. It is maintained as part of the format for backwards compatibility.
+\item[Room Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors'), with the following values:
+\begin{verbatim}
+  1     a   DARK           Room is dark.
+  2     b   DEATH          Room is a death trap; char `dies'
+                           (no xp lost).
+  4     c   NOMOB          MOBs (monsters) cannot enter room.
+  8     d   INDOORS        Room is indoors.
+  16    e   PEACEFUL       Room is peaceful (violence not
+                           allowed).
+  32    f   SOUNDPROOF     Shouts, gossips, etc. won't be
+                           heard in room.
+  64    g   NOTRACK        `track' can't find a path through
+                           this room.
+  128   h   NOMAGIC        All magic attempted in this room
+                           will fail.
+  256   i   TUNNEL         Only one person allowed in room at
+                           a time.
+  512   j   PRIVATE        Cannot teleport in or GOTO if two
+                           people here.
+  1024  k   GODROOM        Only LVL_GOD and above allowed to
+                           enter.
+  2048  l   HOUSE          Reserved for internal use.
+                           Do not set.
+  4096  m   HOUSE_CRASH    Reserved for internal use.
+                           Do not set.
+  8192  n   ATRIUM         Reserved for internal use.
+                           Do not set.
+  16384 o   OLC            Reserved for internal use.
+                           Do not set.
+  32768 p   BFS_MARK       Reserved for internal use.
+                           Do not set.
+\end{verbatim}
+\item[Sector Type] A single number ({\em not} a bitvector) defining the type of terrain in the room.  Note that this value is not the number of movement points needed but just a number to identify the sector type (the movement loss is controlled by the array \texttt{movement\_loss[]} in the file \texttt{constants.c}). The Sector Type can be one of the following:
+\begin{verbatim}
+  0    INSIDE         Indoors (small number of move points
+                      needed).
+  1    CITY           The streets of a city.
+  2    FIELD          An open field.
+  3    FOREST         A dense forest.
+  4    HILLS          Low foothills.
+  5    MOUNTAIN       Steep mountain regions.
+  6    WATER_SWIM     Water (swimmable).
+  7    WATER_NOSWIM   Unswimmable water - boat required for
+                      passage.
+  8    UNDERWATER     Underwater.
+  9    FLYING         Wheee!
+\end{verbatim}
+\item[Direction Fields and Extra Descriptions] This section defines the room's exits, if any, as well as any extra descriptions such as signs or strange objects that might be in the room.  This section can be empty if the room has no exits and no extra descriptions.  Otherwise, it can have any number of \texttt{D} (Direction Field) and \texttt{E} (Extra Description) sections, in any order.  After all exits and extra descriptions have been listed, the end of the room is signaled with the letter \texttt{S}.  The Direction Fields and Extra Descriptions are described in more detail in the following sections.
+\end{description}
+
+\subsection{The Direction Field}
+The general format of a direction field is:
+\begin{verbatim}
+D<direction number>
+<general description>
+~
+<keyword list>~
+<door flag> <key number> <room linked>
+\end{verbatim}
+\begin{description}
+\item[Direction Number] The compass direction that this Direction Field describes.  It must be one of the following numbers:
+\begin{verbatim}
+     0    North
+     1    East
+     2    South
+     3    West
+     4    Up
+     5    Down 
+\end{verbatim}
+\item[General Description] The description shown to the player when she types ``look $<$direction$>$''.  This should not be confused with the room description itself.  Unlike the room description which is automatically viewed when a player walks into a room, the General Description of an exit is only seen when a player looks in the direction of the exit (e.g., ``look north'').
+\item[Keyword List] A list of acceptable terms that can be used to manipulate the door with
+commands such as ``open,'' ``close,'' ``lock,'' ``unlock,'' etc. The list should be separated by spaces, such as \verb*=door oak big~=
+\item[Door Flag] Can take one of three values (0, 1 or 2):
+\begin{description}
+\item[0] An unrestricted exit that has no door, or a special door cannot be opened or closed with the ``open'' and ``close'' commands.  The latter is useful for secret doors, trap doors, or other doors that are opened and closed by something other than the normal commands, like a special procedure assigned to the room or an object in the room.
+\item[1] Normal doors that can be opened, closed, locked, unlocked, and picked.
+\item[2] Pickproof doors: if locked, can be opened only with the key.
+\end{description}
+The initial state of all doors is open, but doors can be opened, closed, and locked automatically when zones reset; see Section zone file documentation for details.
+\item[Key Number] The virtual number of the key required to lock and unlock the door in the direction given.  A value of -1 means that there is no keyhole; i.e., no key will open this door.  If the Door Flag for this door is 0, the Key Number is ignored.
+\item[Room Linked] The virtual number of the room to which this exit leads.  If this number is -1 (NOWHERE), the exit will not actually lead anywhere; useful if you'd like the exit to show up on ``exits,'' or if you'd like to add a description for ``look $<$direction$>$'' without actually adding an exit in that direction.
+\end{description}
+
+\subsection{Room Extra Descriptions}
+Extra descriptions are used to make rooms more interesting, and make them more interactive.  Extra descriptions are accessed by players when they type ``look at $<$thing$>$'', where $<$thing$>$ is any word you choose. For example, you might write a room description which includes the tantalizing sentence, ``The wall looks strange here.''  Using extra descriptions, players could then see additional detail by typing ``look at wall.''  There can be an unlimited
+number of Extra Descriptions in each room.\newline
+The format of an extra description is simple:
+\begin{verbatim}
+E
+<keyword list>~
+<description text>
+~
+\end{verbatim}
+\begin{description}
+\item[Keyword List] A space-separated list of keywords which will access the description in this \texttt{E} section.
+\item[Description Text] The text that will be displayed when a player types ``look $<$keyword$>$,'' where $<$keyword$>$ is one of the keywords specified in the Keyword List of this \texttt{E} section.
+\end{description}
+
+\subsection{World File Example}
+Here is a sample entry from a CircleMUD world file:
+\begin{verbatim}
+#18629
+The Red Room~
+   It takes you a moment to realize that the red glow here is
+coming from a round portal on the floor.  It looks almost as
+if someone had painted a picture of a dirt running through a
+field on the floor of this room.  Oddly enough, it is so
+realistic you can feel the wind in the field coming out of the
+picture.
+~
+186 ad 0
+D0
+You see a big room up there.
+~
+~
+0 -1 18620
+D1
+You see a small room.
+~
+oak door~
+1 18000 18630
+E
+portal floor~
+It looks as if you could go down into it... but you can't be
+sure of where you will end up, or if you can get back.
+~
+S
+\end{verbatim}
+This room is virtual number 18629, called ``The Red Room''.  It is dark and indoors, with an ``INDOORS'' sector type.  It has an exit north and east.  The north exit leads to room 18620; if a player types ``look north'' it will say ``You see a big room up there.''  The exit east is a normal, pickable door that leads to room 18630 and which takes key number 18000.  There is one extra description for ``portal'' and ``floor''.
+
+\section{Mobile (Monster) Files}
+\subsection{The Format of a Mobile}
+The format of a mobile is:
+\begin{verbatim}
+#<virtual number>
+<alias list>~
+<short description>~
+<long description>
+~
+<detailed description>
+~
+<action bitvector> <affection bitvector> <alignment> <type flag>
+{type-specific information; see below for details}
+\end{verbatim}
+The format of mobiles varies depending on the Type Flag.  See below for documentation of the formats of the various types.
+\begin{description}
+\item[Virtual Number] This number is critical; it is the identity of the mobile within the game.  It is the number that will be used to reference the mobile from zone files and is the number used to ``load'' mobiles from within the game.  The virtual numbers must appear in increasing order in the mob file.
+\item[Alias List] The list of keywords, separated by spaces, that can be used by players to identify the mobile.  The mobile can only be identified using the keywords that appear in its alias list; it cannot be identified by a word that appears only in its name.  Great care should be taken to ensure that the spellings of names and aliases match. Fill words such as ``the,'' ``a,'' and ``an'' should not appear in the Alias List.
+\item[Short Description] The description of the mobile used by the MUD when the mobile takes some action.  For example, a short description of ``The Beastly Fido'' would result in messages such as ``The Beastly Fido leaves south.'' and ``The Beastly Fido hits you hard.''  The Short Description should never end with a punctuation mark because it will be inserted into the middle of sentences such as those above.
+\item[Long Description] The description displayed when a mobile is in its default position; for example, ``The Beastly Fido is here, searching through garbage for food.''  When the mobile is in a position other than its default position, such as sleeping or incapacitated, the short description is used instead; for example, ``The Beastly Fido is lying here, incapacitated.''  Unlike the Short Description, the Long Description should end with appropriate punctuation.
+\item[Detailed Description] The description displayed for a mobile when a player looks at the mobile by typing ``look at $<$mobile$>$.''
+\item[Action Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors') with the following values:
+\begin{verbatim}
+  1      a  SPEC           This flag must be set on mobiles
+                           which have special procedures
+                           written in C.  In addition to
+                           setting this bit, the procedure
+                           must be assigned in spec_assign.c,
+                           and the specproc itself must (of
+                           course) must be written.  See the
+                           section on Special Procedures in
+                           the file coding.doc for more
+                           information.
+  2      b  SENTINEL       Mobiles wander around randomly by
+                           default; this bit should be set
+                           for mobiles which are to remain
+                           stationary.
+  4      c  SCAVENGER      The mob should pick up valuables
+                           it finds on the ground.  More
+                           expensive items will be taken
+                           first.
+  8      d  ISNPC          Reserved for internal use.
+                           Do not set.
+  16     e  AWARE          Set for mobs which cannot be
+                           backstabbed. Replaces the
+                           ACT_NICE_THIEF bit from Diku
+                           Gamma.
+  32     f  AGGRESSIVE     Mob will hit all players in the
+                           room it can see. See also the
+                           WIMPY bit.
+  64     g  STAY_ZONE      Mob will not wander out of its own
+                           zone -- good for keeping your mobs
+                           as only part of your own area.
+  128    h  WIMPY          Mob will flee when being attacked
+                           if it has less than 20% of its hit
+                           points.  If the WIMPY bit is set
+                           in conjunction with any of the
+                           forms of the AGGRESSIVE bit, the
+                           mob will only attack mobs that are
+                           unconscious (sleeping or
+                           incapacitated).
+  256    i  AGGR_EVIL      Mob will attack players that are
+                           evil-aligned.
+  512    j  AGGR_GOOD      Mob will attack players that are
+                           good-aligned.
+  1024   k  AGGR_NEUTRAL   Mob will attack players that are
+                           neutrally aligned.
+  2048   l  MEMORY         Mob will remember the players
+                           that initiate attacks on it, and
+                           initiate an attack on that player
+                           if it ever runs into him again.
+  4096   m  HELPER         The mob will attack any player it
+                           sees in the room that is fighting
+                           with a mobile in the room. Useful
+                           for groups of mobiles that travel
+                           together; i.e. three snakes in a
+                           pit, to force players to fight all
+                           three simultaneously instead of
+                           picking off one at a time.
+  8192   n  NOCHARM        Mob cannot be charmed.
+  16384  o  NOSUMMON       Mob cannot be summoned.
+  32768  p  NOSLEEP        Sleep spell cannot be cast on mob.
+  65536  q  NOBASH         Large mobs such as trees that can
+                           not be bashed.
+  131072 r  NOBLIND        Mob cannot be blinded.
+  262144 s  NOTDEADYET     Reserved for internal use.
+                           Do not set.
+\end{verbatim}
+\item[Action Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors') with the following values:
+\begin{verbatim}
+  1       a BLIND          Mob is blind.
+  2       b INVISIBLE      Mob is invisible.
+  4       c DETECT_ALIGN   Mob is sensitive to the alignment
+                           of others.
+  8       d DETECT_INVIS   Mob can see invisible characters
+                           and objects.
+  16      e DETECT_MAGIC   Mob is sensitive to magical
+                           presence.
+  32      f SENSE_LIFE     Mob can sense hidden life.
+  64      g WATERWALK      Mob can traverse unswimmable
+                           water sectors.
+  128     h SANCTUARY      Mob is protected by sanctuary
+                           (half damage).
+  256     i GROUP          Reserved for internal use.
+                           Do not set.
+  512     j CURSE          Mob is cursed.
+  1024    k INFRAVISION    Mob can see in dark.
+  2048    l POISON         Reserved for internal use.
+                           Do not set.
+  4096    m PROTECT_EVIL   Mob is protected from evil
+                           characters. No effect at present.
+  8192    n PROTECT_GOOD   Mob is protected from good
+                           characters. No effect at present.
+  16384   o SLEEP          Reserved for internal use.
+                           Do not set.
+  32768   p NOTRACK        Mob cannot be tracked.
+  65536   q UNUSED16       Unused (room for future
+                           expansion).
+  131072  r UNUSED17       Unused (room for future
+                           expansion).
+  262144  s SNEAK          Mob can move quietly (room not
+                           informed).
+  524288  t HIDE           Mob is hidden (only visible with
+                           sense life).
+  1048576 u UNUSED20       Unused (room for future
+                           expansion).
+  2097152 v CHARM          Reserved for internal use.
+                           Do not set.
+\end{verbatim}
+\item[Alignment] A number from -1000 to 1000 representing the mob's initial alignment.
+\begin{verbatim}
+     -1000...-350   Evil
+      -349...349    Neutral
+       350...1000   Good
+\end{verbatim}
+\item[Type Flag] This flag is a single letter which indicates what type of mobile is currently being defined, and controls what information CircleMUD expects to find next (i.e., in the file from the current point to the end of the current mobile).
+\par
+Standard CircleMUD 3.0 supports two types of mobiles: \texttt{S} (for Simple), and \texttt{E} (for Enhanced).  Type \texttt{C} (Complex) mobiles was part of the original DikuMUD Gamma and part of CircleMUD until version 3.0, but are no longer supported by CircleMUD v3.0 and above.
+\par
+Check with your local implementor to see if there are any additional types supported on your particular MUD.
+\end{description}
+
+\subsection{Type S Mobiles}
+For type S mobs, the type-specific information should be in the following format:
+\begin{verbatim}
+<level> <thac0> <armor class> <max hit points> <bare hand damage>
+<gold> <experience points>
+<load position> <default position> <sex>
+\end{verbatim}
+\begin{description}
+\item[Level] The level of the monster, from 1 to 30.
+\item[THAC0] ``To Hit Armor Class 0'' -- a measure of the ability of the monster to penetrate armor and cause damage, ranging from 0 to 20.  Lower numbers mean the monster is more likely to penetrate armor.  The formal definition of THAC0 is the minimum roll required on a 20-sided die required to hit an opponent of equivalent Armor Class 0.
+\item[Armor Class] The ability of the monster to avoid damage.  Range is from -10 to 10, with lower values indicating better armor.  Roughly, the scale is:
+\begin{verbatim}
+     AC  10    Naked person
+     AC   0    Very heavily armored person (full plate mail)
+     AC -10    Armored Battle Tank (hopefully impossible for
+               players)
+\end{verbatim}
+Note on THAC0 and Armor Class (AC): When an attacker is trying to hit a victim, the attacker's THAC0 and the victim's AC, plus a random roll of the dice, determines whether or not the attacker can hit the victim.  (If a hit occurs, a different formula determines how much damage is done.)  An attacker with a low THAC0 is theoretically just as likely to hit a victim with a low AC as an attacker with a high THAC0 is to hit a victim with a high AC.  Lower attacker THAC0's and higher victim AC's favor the attacker; higher attacker THAC0's and lower victim AC's favor the victim.
+\item[Max Hit Points] The maximum number of hit points the mobile is given, which must be given in the form ``xdy+z'' where x, y, and z are integers.  For example, \texttt{4d6+10} would mean sum 4 rolls of a 6 sided die and add 10 to the result.  Each individual instance of a mob will have the same max number of hit points from the time it is loaded into the game right up to the time it dies; the dice will only be rolled once when a particular instance of the mob is created.  In other words, a particular copy of a mob will always have the same number of max hit points during its life, but different copies of the same mob may have different numbers of max hit points.
+\par
+Note that all three numbers, the ``\texttt{d}'' and the ``\texttt{+}'' must always appear, even if some of the numbers are 0.  For example, if you want every copy of a mob to always have exactly 100 hit points, write \texttt{0d0+100}.
+\item[Bare Hand Damage (BHD)] The amount of damage the mob can do per round when not armed with a weapon.  Also specified as ``xdy+z'' and subject to the same formatting rules as Max Hit Points.  However, unlike Max Hit Points, the dice are rolled once per round of violence; the BHD of a mob will vary from round to round, within the limits you set.
+\par
+For BHD, xdy specifies the dice rolls and z is the strength bonus added both to BHD and weapon-inflicted damage.  For example, a monster with a BHD of 1d4+10 will do between 11 and 14 hitpoints each round without a weapon.  If the monster picks up and wields a tiny stick which gives 1d2 damage, then the monster will do 1d2 + 10 points of damage per round with the stick.
+\item[Gold] The number of gold coins the mobile is initially loaded with.
+\item[Experience] The number of experience points the mobile is initially loaded with.
+\item[Load Position] The position the mobile is in when loaded into the game, which should be one of the following numbers:
+\begin{verbatim}
+  0   POSITION_DEAD       Reserved for internal use.
+                          Do not set.
+  1   POSITION_MORTALLYW  Reserved for internal use.
+                          Do not set.
+  2   POSITION_INCAP      Reserved for internal use.
+                          Do not set.
+  3   POSITION_STUNNED    Reserved for internal use.
+                          Do not set.
+  4   POSITION_SLEEPING   The monster is sleeping.
+  5   POSITION_RESTING    The monster is resting.
+  6   POSITION_SITTING    The monster is sitting.
+  7   POSITION_FIGHTING   Reserved for internal use.
+                          Do not set.
+  8   POSITION_STANDING   The monster is standing.
+\end{verbatim}
+\item[Default Position] The position to which monsters will return after a fight, which should be one of the same numbers as given above for Load Position. In addition, the Default Position defines when the mob's long description is displayed (see ``Long Description'' above).
+\item[Sex] One of the following:
+\begin{verbatim}
+     0    Neutral (it/its)
+     1    Male (he/his)
+     2    Female (she/her)
+\end{verbatim}
+\end{description}
+
+\subsection{Type S Mobile Example}
+\begin{verbatim}
+#3062
+fido dog~
+the beastly fido~
+A beastly fido is mucking through the garbage looking for food.
+~
+The fido is a small dog that has a foul smell and pieces of
+rotted meat hanging around his teeth.
+~
+afghq p -200 S
+0 20 10 1d6+4 1d4+0
+0 25
+8 8 1
+\end{verbatim}
+\par This is mobile vnum 3062.  The Fido's action bitvector indicates that it has a special procedure (bit a), is aggressive (bit f), stays in its own zone (bit g), is wimpy (bit h), and cannot be bashed (bit q). Also, the Fido cannot be tracked (affection bit p), and has an initial alignment of -200. After the \texttt{S} flag we see that the Fido is level 0, has a THAC0 of 20, an Armor Class of 10, 1d6+4 hit points (a random value from 5 to 10), and will do 1d4 hit points of bare hand damage per round.  The Fido has 0 gold and 25 experience points, has a load position and default position of STANDING, and is male.
+
+\subsection{Type E Mobiles}
+Type E mobiles are specific to Circle 3.0 and are designed to provide an easy way for MUD implementors to extend the mobile format to fit their own needs.  A type E mobile is an extension of type S mobiles; a type E mobile is a type S mobile with extra data at the end.  After the last line normally found in type S mobs (the one ending with the mob's sex), type E mobiles end with a section called the Enhanced section.  This section consists of zero or more enhanced mobile specifications (or {\bf E-specs}), one per line.  Each E-spec consists of a keyword followed by a colon (``:'') and a value.  The valid keywords are listed below.  The literal letter \texttt{E} must then come after all E-specs to signal the end of the mob.\newline
+The format of an E mobile is as follows:
+\begin{verbatim}
+<level> <thac0> <armor class> <max hit points> <bare hand damage>
+<gold> <experience points>
+<load position> <default position> <sex>
+{E-spec list}
+E
+\end{verbatim}
+
+\subsection{Type E Mobile Example}
+Let's say that you wanted to create an enhanced Fido like the one in the previous example, but one that has a bare-hand attack type of 4 so that the Fido bites players instead of hitting them.  Let's say you also wanted to give this Fido the a strength of 18.  You might write:
+\begin{verbatim}
+#3062
+fido dog~
+the beastly fido~
+A beastly fido is mucking through the garbage looking for food.
+~
+The fido is a small dog that has a foul smell and pieces
+of rotted meat hanging around his teeth.
+~
+afghq p -200 E
+0 20 10 1d6+4 1d4+0
+0 25
+8 8 1
+BareHandAttack: 4
+Str: 18
+E
+\end{verbatim}
+In the above example, the two E-specs used were BareHandAttack and Str.  Any number of the E-specs can be used in an Enhanced section and they may appear in any order.  The format is simple: the E-spec keyword, followed by a colon, followed by a value.  Note that unlike type S mobiles, type E mobiles require a terminator at the end of the record (the letter \texttt{E}).
+
+\subsection{E-Spec Keywords Valid in CircleMUD 3.0}
+The only keywords supported under Circle 3.0 are BareHandAttack, Str, StrAdd, Int, Wis, Dex, Con, and Cha.  However, the E-Specs have been designed such that new ones are quite easy to add; check with your local implementor to see if your particular MUD has added any additional E-Specs.  Future versions of CircleMUD will have considerably more features available in the Enhanced section such as the ability to individually set mobs' skill proficiencies.
+\begin{description}
+\item[BareHandAttack] This controls the description of violence given during battles, in messages such as ``The Beastly fido bites you very hard.''  BareHandAttack should be one of the following numbers:
+\begin{verbatim}
+     0    hit/hits
+     1    sting/stings
+     2    whip/whips
+     3    slash/slashes
+     4    bite/bites
+     5    bludgeon/bludgeons
+     6    crush/crushes
+     7    pound/pounds
+     8    claw/claws
+     9    maul/mauls
+     10   thrash/thrashes
+     11   pierce/pierces
+     12   blast/blasts
+     13   punch/punches
+     14   stab/stabs
+\end{verbatim}
+Messages given when attackers miss or kill their victims are taken from the file \texttt{lib/misc/messages}. The attack type number for weapons is 300 plus the number listed in the table above, so to modify the message given to players when they are mauled, attack type number 309 in \texttt{lib/misc/messages} should be changed.  Note that adding new attack types requires code changes and {\em cannot} be accomplished simply by adding new messages to \texttt{lib/misc/messages} (see the CircleMUD Coding Manual for more information).
+\item[Str, Int, Wis, Dex, Con, Cha] The mobile's Strength, Intelligence, Wisdom, Dexterity, Constitution and Charisma, respectively.  These values should be between 3 and 18, but can be between 1 and 25 (which is the default statistic maximum).
+\item[StrAdd] The mobile's strength addition, which can range from 1 to 99.
+\end{description}
+
+\section{Object Files}
+\subsection{The Format of an Object}
+\begin{verbatim}
+#<virtual number>
+<alias list>~
+<short description>~
+<long description>~
+<action description>~
+<type flag> <extra (effects) bitvector> <wear bitvector>
+<value 0> <value 1> <value 2> <value 3>
+<weight> <cost> <rent per day>
+{Zero or more Extra Descriptions and/or Affect Fields}
+\end{verbatim}
+There can be an unlimited number of Extra Descriptions and up to 6 Affect Fields.
+\begin{description}
+\item[Virtual Number] This number is critical; it is the identity of the object within the game.  It is the number that will be used to reference the object from zone files and is the number used to ``load'' objects from within the game.  The virtual numbers must appear in increasing order in the object file.
+\item[Alias List] The list of keywords, separated by spaces, that can be used by players to identify the object.  The object can only be identified using the keywords that appear in its alias list; it cannot be identified by a word that appears only in its name.  Great care should be taken to ensure that the spellings of names and aliases match.  Fill words such as ``the,'' ``a,'' and ``an'' should not appear in the Alias List.
+\item[Short Description] The description of the object used by the MUD when the object is used. 
+For example, a short description of ``a long, green stick'' would result in messages such as ``The Beastly Fido picks up the long, green stick.''  The Short Description should never end with a punctuation mark because it will be inserted into the middle of sentences.
+\item[Long Description] The description displayed when the object is seen lying on the ground,
+for example, ``A furled umbrella is lying here.'' Unlike the Short Description, the Long Description should end with appropriate punctuation.
+\item[Action Description] Action Descriptions are primarily used for magical objects (staves, wands, scrolls, and potions) to specify what message displayed to the room when the magical item is used.  The Action Description should be given in the act format specified in act.doc.  If no Action Description is present, a default message will be used:
+\begin{Ventry}{Potions}
+\item[Staves]  Rasmussen taps $<$object$>$ three times on the ground.\\
+  \$n taps \$p three times on the ground.
+\item[Wands] Rasmussen points $<$object$>$ at $<$target$>$.\\
+  \$n points \$p at \$N.
+\item[Scrolls] Rasmussen recites $<$object$>$.\\
+  \$n recites \$p.
+\item[Potions] Rasmussen quaffs $<$object$>$.\\
+  \$n quaffs \$p.
+\end{Ventry}
+For more information on the character codes used in the above strings, see the {\bf \texttt{act()} Function} document. For objects which are readable papers, the Action Description contains the text on the paper.
+\item[Type Flag] A number which specifies what type of object is being defined; also controls the meanings of value0 through value4.  The Type Flag must be one of the following numbers:
+\begin{verbatim}
+  1    LIGHT          Item is a light source.
+  2    SCROLL         Item is a magical scroll.
+  3    WAND           Item is a magical wand.
+  4    STAFF          Item is a magical staff.
+  5    WEAPON         Item is a weapon.
+  6    FIREWEAPON     Currently not implemented.  Do not use.
+  7    MISSILE        Currently not implemented.  Do not use.
+  8    TREASURE       Item is treasure other than gold coins
+                      (e.g. gems).
+  9    ARMOR          Item is armor.
+  10   POTION         Item is a magical potion.
+  11   WORN           Currently not implemented.  Do not use.
+  12   OTHER          Miscellaneous object with no special
+                      properties.
+  13   TRASH          Trash -- junked by cleaners, not bought
+                      by shopkeepers.
+  14   TRAP           Currently not implemented.  Do not use.
+  15   CONTAINER      Item is a container.
+  16   NOTE           Item is a note (can be written on).
+  17   DRINKCON       Item is a drink container.
+  18   KEY            Item is a key.
+  19   FOOD           Item is food.
+  20   MONEY          Item is money (gold coins).
+  21   PEN            Item is a pen.
+  22   BOAT           Item is a boat; allows you to
+                      traverse SECT_WATER_NOSWIM.
+  23   FOUNTAIN       Item is a fountain.
+\end{verbatim}
+\item[Extra (Effects) Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors'), to define the ``special effects'' of the object.  Flags that are marked as ``cosmetic'' merely add an interesting message to the object when it is examined, but has no substantive effect otherwise.  The flags have the following values:
+\begin{verbatim}
+ 1     a   GLOW            Item is glowing (cosmetic).
+ 2     b   HUM             Item is humming (cosmetic).
+ 4     c   NORENT          Item cannot be rented.
+ 8     d   NODONATE        Item cannot be donated.
+ 16    e   NOINVIS         Item cannot be made invisible.
+ 32    f   INVISIBLE       Item is invisible.
+ 64    g   MAGIC           Item has a magical aura and can't
+                           be enchanted.
+ 128   h   NODROP          Item is cursed and cannot be
+                           dropped.
+ 256   i   BLESS           Item is blessed (cosmetic).
+ 512   j   ANTI_GOOD       Item can't be used by good-aligned
+                           characters.
+ 1024  k   ANTI_EVIL       Item can't be used by evil-aligned
+                           characters.
+ 2048  l   ANTI_NEUTRAL    Item can't be used by neutrally-
+                           aligned characters.
+ 4096  m   ANTI_MAGIC_USER Item can't be used by the Mage
+                           class.
+ 8192  n   ANTI_CLERIC     Item can't be used by the Cleric
+                           class.
+ 16384 o   ANTI_THIEF      Item can't be used by the Thief
+                           class.
+ 32768 p   ANTI_WARRIOR    Item can't be used by the Warrior
+                           class.
+ 65536 q   NOSELL          Shopkeepers will not buy or sell
+                           the item.
+\end{verbatim}
+\item[Wear Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors') with the following values:
+\begin{verbatim}
+  1     a   WEAR_TAKE      Item can be taken (picked up off
+                           the ground).
+  2     b   WEAR_FINGER    Item can be worn on the fingers.
+  4     c   WEAR_NECK      Item can be worn around the neck.
+  8     d   WEAR_BODY      Item can be worn on the body.
+  16    e   WEAR_HEAD      Item can be worn on the head.
+  32    f   WEAR_LEGS      Item can be worn on the legs.
+  64    g   WEAR_FEET      Item can be worn on the feet.
+  128   h   WEAR_HANDS     Item can be worn on the hands.
+  256   i   WEAR_ARMS      Item can be worn on the arms.
+  512   j   WEAR_SHIELD    Item can be used as a shield.
+  1024  k   WEAR_ABOUT     Item can be worn about the body.
+  2048  l   WEAR_WAIST     Item can be worn around the waist.
+  4096  m   WEAR_WRIST     Item can be worn around the wrist.
+  8192  n   WEAR_WIELD     Item can be wielded; e.g. weapons.
+  16384 o   WEAR_HOLD      Item can be held (the ``hold''
+                           command).
+\end{verbatim}
+Note that the TAKE bit controls whether or not an item can be picked up using the ``get'' command, whereas the HOLD bit controls if the object can be worn using the ``hold'' command.
+\item[Value 0, Value 1, Value 2, Value 3] These values are very central.  They define the object's abilities based on the Type Flag.  See the subsection ``Object Value Definitions'' below for a detailed description of the four Value fields.
+\item[Weight] The weight of the object.  The weight controls how many strength points a character must have to take the object, and is used to calculate when bags and other containers become full.
+\item[Cost] The value of the object in gold coins; used by shopkeepers.
+\item[Rent Per Day] The cost per day to rent the object in the Reception.
+\end{description}
+
+\subsection{Object Value Definitions}
+The meaning of an object's four values (value 0 through value 3) vary depending on the Type Flag of the object.
+\par
+In the table below, ``unused'' means that the server ignores the value; it can be set to any number (but 0 is always a safe bet).  ``unimplemented'' indicates a Type Flag currently not recognized by the server.
+\par
+An index of spell numbers for use with magical objects can be found in the Appendix Spell Numbers.
+\begin{Ventry}{DRINK CONTAINER}
+\item[LIGHT] (Type Flag 1)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: Capacity of light in hours.
+                0: Burned out light.
+               -1: Eternal light source.
+     value 3: unused
+\end{verbatim}
+\item[SCROLL] (Type Flag 2)
+\begin{verbatim}
+     value 0: Level at which scroll's spells are
+              cast.
+     value 1: Spell number 1
+     value 2: Spell number 2
+     value 3: Spell number 3
+\end{verbatim}
+\item[WAND] (Type Flag 3)
+\begin{verbatim}
+     value 0: Level at which wand's spell is
+              cast
+     value 1: Charge capacity of wand (>= 1)
+     value 2: Current number of charges remaining
+     value 3: Spell number
+\end{verbatim}
+\item[STAFF] (Type Flag 4)
+\begin{verbatim}
+     value 0: Level at which staff's spell is
+              cast
+     value 1: Charge capacity of staff (>= 1)
+     value 2: Current number of charges remaining
+     value 3: Spell number
+\end{verbatim}
+\item[WEAPON] (Type Flag 5)
+\begin{verbatim}
+     value 0: unused
+     value 1: Number of damage dice
+     value 2: Size of damage dice
+     value 3: Weapon type for damage messages,
+              one of:
+               0    hit/hits
+               1    sting/stings
+               2    whip/whips
+               3    slash/slashes
+               4    bite/bites
+               5    bludgeon/bludgeons
+               6    crush/crushes
+               7    pound/pounds
+               8    claw/claws
+               9    maul/mauls
+               10   thrash/thrashes
+               11   pierce/pierces
+               12   blast/blasts
+               13   punch/punches
+               14   stab/stabs
+\end{verbatim}
+\item[FIREWEAPON] (Type Flag 6) unimplemented (do not use)
+\item[MISSILE] (Type Flag 7) unimplemented (do not use)
+\item[TREASURE] (Type Flag 8)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[ARMOR] (Type Flag 9)
+\begin{verbatim}
+     value 0: AC-apply of the armor.  Note that
+              the effective change to AC is this
+              value times a multiplier based on
+              where the armor is worn.  Values
+              >0 enhance the AC; values <0 damage
+              the AC (cursed armor, for example).
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[POTION] (Type Flag 10)
+\begin{verbatim}
+     value 0: Level at which the potion's spells
+              are cast.
+     value 1: Spell number 1
+     value 2: Spell number 2
+     value 3: Spell number 3
+          If less than 3 spells are desired, set
+          unused values to -1.
+\end{verbatim}
+\item[WORN] (Type Flag 11) unimplemented (do not use)
+\item[OTHER] (Type Flag 12)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[TRASH] (Type Flag 13)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[TRAP] (Type Flag 14) unimplemented (do not use)
+\item[ CONTAINER] (Type Flag 15)
+\begin{verbatim}
+     value 0: Capacity (max containable weight)
+              of container
+     value 1: Container flag bitvector (MUST be
+              a numeric bitvector)
+          1    CLOSEABLE      Container can be
+                              closed and locked.
+          2    PICKPROOF      Lock on container
+                              can't be picked.
+          4    CLOSED         Container is closed
+                              when loaded.
+          8    LOCKED         Container is locked
+                              when loaded.
+     value 2: The vnum of the key object that
+              opens this container. -1 if it has
+              no key.
+     value 3: Reserved for internal use -- always
+              set as 0.
+\end{verbatim}
+\item[NOTE] (Type Flag 16)
+\begin{verbatim}
+     value 0: Language of writing
+              (unimplemented).
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[DRINK CONTAINER] (Type Flag 17) See Appendix Item Values for Drink Containers.
+\item[KEY] (Type Flag 18)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[FOOD] (Type Flag 19)
+\begin{verbatim}
+     value 0: The number of hours of hunger
+              satisfied by this food.
+     value 1: unused
+     value 2: unused
+     value 3: Non-zero if the food is poisoned,
+              0 otherwise.
+\end{verbatim}
+\item[MONEY] (Type Flag 20)
+\begin{verbatim}
+     value 0: The number of gold coins in the
+              pile.
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[PEN] (Type Flag 21)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[BOAT] (Type Flag 22)
+\begin{verbatim}
+     value 0: unused
+     value 1: unused
+     value 2: unused
+     value 3: unused
+\end{verbatim}
+\item[FOUNTAIN] (Type Flag 23) See Appendix Item Values for Drink Containers.
+\end{Ventry}
+
+\subsection{Object Extra Descriptions}
+Object Extra Descriptions allow players to examine certain aspects of objects defined by the world builder, just like Room Extra Descriptions.  There can be an unlimited number of Extra Descriptions per object.  The format is exactly the same as for rooms:
+\begin{verbatim}
+E
+<keyword list>~
+<description text>
+~
+\end{verbatim}
+\begin{description}
+\item[Keyword List] A space-separated list of keywords which will access the description in this E section.
+\item[Description Text] The text that will be displayed when a player types ``look $<$keyword$>$,'' where $<$keyword$>$ is one of the keywords specified in the Keyword List of this E section.
+\end{description}
+
+\subsection{Object Affect Fields}
+Object Affect Fields give objects magical properties.  They affect characters when the object is worn, not when picked up.  There can be up to six affect fields per object.\newline
+The format of an Object Affect Field is:
+\begin{verbatim}
+A
+<location> <value>
+\end{verbatim}
+\begin{description}
+\item[Location] The aspect of the character affected by the object.  It must be one of the following numbers:
+\begin{verbatim}
+  0    NONE           No effect (typically not used).
+  1    STR            Apply to strength.
+  2    DEX            Apply to dexterity.
+  3    INT            Apply to intelligence.
+  4    WIS            Apply to wisdom.
+  5    CON            Apply to constitution.
+  6    CHA            Apply to charisma.
+  7    CLASS          Unimplemented.  Do not use.
+  8    LEVEL          Unimplemented.  Do not use.
+  9    AGE            Apply to character's MUD age, in MUD
+                      years.
+  10   CHAR_WEIGHT    Apply to weight.
+  11   CHAR_HEIGHT    Apply to height.
+  12   MANA           Apply to MAX mana points.
+  13   HIT            Apply to MAX hit points.
+  14   MOVE           Apply to MAX movement points.
+  15   GOLD           Unimplemented.  Do not use.
+  16   EXP            Unimplemented.  Do not use.
+  17   AC             Apply to armor class (AC).
+  18   HITROLL        Apply to hitroll.
+  19   DAMROLL        Apply to damage roll bonus.
+  20   SAVING_PARA    Apply to save throw: paralyze
+  21   SAVING_ROD     Apply to save throw: rods
+  22   SAVING_PETRI   Apply to save throw: petrif
+  23   SAVING_BREATH  Apply to save throw: breath
+  24   SAVING_SPELL   Apply to save throw: spells
+\end{verbatim}
+\item[Value] The number used to modify the Location.
+\end{description}
+For example, an A field which reads:
+\begin{verbatim}
+A
+12 50
+\end{verbatim}
+will add 50 to the maximum mana of the character.
+
+\subsection{Object File Example}
+\begin{verbatim}
+#901
+shield minotaur~
+a dark minotaur shield~
+A dark minotaur shield has been left here.~
+~
+9 dgh 513
+12 0 0 0
+15 5000 1350
+E
+shield minotaur~
+A strong, sturdy shield.  It brings to mind legends of a shield
+that provided protection from poisonous gases.
+~
+A
+23 -4
+A
+4 2
+\end{verbatim}
+This object is virtual number 901, is a Type 9 object (armor), cannot be donated, has a magical aura, and cannot be dropped.  It can be picked up and worn as a shield.  It has an AC-apply of 12, weighs 15 pounds, is valued at 5000 coins and costs 1350 coins per day to rent.  Its Affect fields indicate that this object affects breath weapon saving throws by -4 and increases Wisdom by 2.
+
+\section{Zone Files}
+Zone files are the files that control how areas are configured and how they reset.  They integrate the mobiles, objects, and rooms to create an inhabited world.
+\par
+A zone file contains certain initial information (specified below), followed by a series of reset commands.  Each time a zone is reset, the server executes all the commands in order from beginning to end.  All zones are reset when the server first boots, and periodically reset again while the game is running.
+
+\subsection{The Format of a Zone File}
+\begin{verbatim}
+#<virtual number>
+<zone name>~
+<bottom room number> <top room number> <lifespan> <reset mode>
+{zero or more zone commands}
+S
+\end{verbatim}
+Lines starting with \texttt{*} are considered comments and ignored.  Zone commands themselves may also be followed by a comment which does not need to be delimited by a single \texttt{*}. Please note that the initial lines of a zone file may {\bf not} have comments on them at all.  The zone's commands must then be terminated by the literal letter \texttt{S}.
+\begin{description}
+\item[Virtual Number] An arbitrary number used to identify the zone.  Zone numbers are traditionally the room numbers of the zone divided by 100; for example, Midgaard, which consists of rooms 3000 through 3099, is zone 30.
+\item[Zone Name] A label given to the zone so that it can be identified in system logs.
+\item[Bottom Room Number] The lowest numbered room belonging to this zone.  This should be a larger number than the TopRoom of the previous zone.
+\item[Top Room Number] The highest numbered room belonging to this zone.  A room belongs to a zone if its virtual number falls in the range from BottomRoom to TopRoom of that zone.
+\item[Lifespan] The number of real-time minutes between zone resets for this zone.  When the age of the zone (measured in minutes since the last time that zone has been reset) reaches the zone's lifespan, the zone is queued for reset.  The zone is then reset when it reaches the front of the queue, and the conditions of the Reset Mode (see below) are satisfied.
+\item[Reset Mode] Can take one of three values (0, 1, or 2):
+\begin{description}
+\item[0] Never reset the zone.  In this case, the age of the zone is never updated, and it will never be queued for reset.  Thus, the value of the Lifespan is effectively ignored.
+\item[1] Reset the zone only after it reaches its Lifespan {\em and} after the zone becomes deserted, i.e. as soon as there are no players located within the zone (checked once every minute).  This can make a zone more ``fair'' because it will keep the hard mobs from reappearing in the zone until everyone leaves, but on a busy MUD it can prevent a zone from ever being reset since the zone may never stay empty for more than one minute.
+\item[2] Reset the zone as soon as it reaches its Lifespan, regardless of who or what is in it.  This is the most commonly used Reset Mode.
+\end{description}
+\end{description}
+
+\subsection{Zone Commands}
+Each command consists of a letter, identifying the command-type, followed by three or four arguments.  The first argument, common to all the commands, is called the ``if-flag.''  If the if-flag for a command is 1, that command is only executed if the command immediately before it was executed as well.  If the if-flag is 0, the command is always executed.  If-flags are useful for things like equipping mobiles--you don't want to try to equip a mobile that has not been loaded.
+\par
+Commands that load mobiles and objects also include a ``max existing'' argument.  This specifies the maximum number of copies of the mobile or object that are allowed to exist in the entire world at once.  If the number currently existing is greater than or equal to the ``max existing'' limit, the command is not executed.
+\par
+The valid zone-reset commands are M, O, G, E, P, D, and R.
+\begin{description}
+\item[M: load a mobile] Format: M $<$if-flag$>$ $<$mob vnum$>$ $<$max existing$>$ $<$room vnum$>$\newline
+Mob vnum is the vnum of the mob to be loaded.  Room vnum is the vnum of the room in which the mob should be placed.  The mob will be loaded into the room.
+\item[O: load an object] Format: O $<$if-flag$>$ $<$obj vnum$>$ $<$max existing$>$ $<$room vnum$>$\newline
+Obj vnum is the vnum of the obj to be loaded.  Room vnum is the vnum of the room in which the obj should be placed.  The object will be loaded and left lying on the ground.
+\item[G: give object to mobile] Format: G $<$if-flag$>$ $<$obj vnum$>$ $<$max existing$>$\newline
+Obj vnum is the vnum of the obj to be given.  The object will be loaded and placed in the inventory of the last mobile loaded with an ``M'' command.\newline
+This command will usually be used with an if-flag of 1, since attempting to give an object to a non-existing mobile will result in an error.
+\item[E: equip mobile with object] Format: E $<$if-flag$>$ $<$obj vnum$>$ $<$max existing$>$ $<$equipment position$>$\newline
+Obj vnum is the vnum of the obj to be equipped.  The object will be loaded and added to the equipment list of the last mobile loaded with an ``M'' command.  Equipment Position should be one of the following:
+\begin{verbatim}
+          0    Used as light
+          1    Worn on right finger
+          2    Worn on left finger
+          3    First object worn around neck
+          4    Second object worn around neck
+          5    Worn on body
+          6    Worn on head
+          7    Worn on legs
+          8    Worn on feet
+          9    Worn on hands
+          10   Worn on arms
+          11   Worn as shield
+          12   Worn about body
+          13   Worn around waist
+          14   Worn around right wrist
+          15   Worn around left wrist
+          16   Wielded as a weapon
+          17   Held
+\end{verbatim}
+This command will usually be used with an if-flag of 1, since attempting to give an object to a non-existing mobile will result in an error.
+\item[P: put object in object] Format: P $<$if-flag$>$ $<$obj vnum 1$>$ $<$max existing$>$ $<$obj vnum 2$>$\newline
+An object with Obj Vnum 1 will be loaded, and placed inside of the copy of Obj Vnum 2 most recently loaded.\newline
+This command will usually be used with an if-flag of 1, since attempting to put an object inside of a non-existing object will result in an error.
+\item[D: set the state of a door] Format: D $<$if-flag$>$ $<$room vnum$>$ $<$exit num$>$ $<$state$>$\newline
+Room vnum is the virtual number of the room with the door to be set. Exit num being one of:
+\begin{verbatim}
+          0    North
+          1    East
+          2    South
+          3    West
+          4    Up
+          5    Down 
+\end{verbatim}
+State being one of:
+\begin{verbatim}
+          0    Open
+          1    Closed
+          2    Closed and locked
+\end{verbatim}
+Care should be taken to set both sides of a door correctly.  Closing the north exit of one room does not automatically close the south exit of the room on the other side of the door.
+\item[R: remove object from room] Format: R $<$if-flag$>$ $<$room vnum$>$ $<$obj vnum$>$\newline
+If an object with vnum Obj Vnum exists in the room with vnum Room Vnum, it will be removed from the room and purged.
+\end{description}
+
+\subsection{Zone File Example}
+A sample zone file annotated with comments follows.
+\begin{verbatim}
+#30                           * This is zone number 30
+Northern Midgaard Main City~  * The name of the zone
+3099 15 2                     * Top of zone is room #3099; it
+*                             * resets every 15 minutes; resets
+*                             * regardless of people
+*
+* Mobile
+M 0 3010 1 3062         Load the Postmaster to room 3062
+* Shopkeepers
+M 0 3003 1 3011         Load the Weaponsmith into room 3011
+* Now, give the weaponsmith items (to be placed in his inventory)
+* max 100 of each of these objects can exist at a time in the
+* world at any given time.
+G 1 3020 100                    Dagger
+G 1 3021 100                    Small Sword
+G 1 3022 100                    Long Sword
+G 1 3023 100                    Wooden Club
+G 1 3024 100                    Warhammer
+G 1 3025 100                    Flail
+* and lastly, give him a long sword to wield
+E 1 3022 100 16                 Long Sword
+* Load Boards
+O 0 3099 2 3000         Mortal Bulletin Board in room 3000
+O 1 3096 5 3003         Social Bulletin Board in room 3003
+O 1 3096 5 3018         Social Bulletin Board in room 3018
+O 1 3096 5 3022         Social Bulletin Board in room 3022
+O 1 3096 5 3028         Social Bulletin Board in room 3028
+* "S" must appear after all commands for a particular zone
+S
+\end{verbatim}
+
+\section{Shop Files}
+CircleMUD v3.0 now has a new shop file format.  Since the old format is still supported, both formats will be documented.  If you'd like to convert shop files in the old format to that of the new format, compile and run the utility \texttt{shopconv}.  3.0 shops must have a special marker (described below) to tell the server that the file is in the new format.
+
+\subsection{CircleMUD v3.0 Shop Format}
+The overall format of a v3.0 Shop File is:
+\begin{verbatim}
+CircleMUD v3.0 Shop File~
+<Shop 1>
+<Shop 2>
+.
+.
+.
+<Shop n>
+$~
+\end{verbatim}
+3.0 shop files start with the literal line ``\texttt{CircleMUD v3.0 Shop File\~{}}'', followed by any number of shop definitions, and terminated by \$\~{}.  The format of a shop definition is:
+\begin{verbatim}
+#<Shop Number>~
+<Item Vnum 1>
+<Item Vnum 2>
+<Item Vnum 3>
+  .
+  .
+  .
+<Item Vnum n>
+-1
+<Profit when selling>
+<Profit when buying>
+<Buy Type 1>  [Buy Namelist 1]
+<Buy Type 2>  [Buy Namelist 1]
+<Buy Type 3>  [Buy Namelist 1]
+  .
+  .
+  .
+<Buy Type n>  [Buy Namelist n]
+-1
+<Message when item to buy does not exist>~
+<Message when item to sell does not exist>~
+<Message when shop does not buy offered item>~
+<Message when shop can't afford item>~
+<Message when player can't afford item>~
+<Message when successfully buying an item>~
+<Message when successfully selling an item>~
+<Temper>
+<Shop Bitvector>
+<Shop Keeper Mobile Number>
+<With Who Bitvector>
+<Shop Room 1>
+<Shop Room 2>
+<Shop Room 3>
+   .
+   .
+   .
+<Shop Room n>
+-1
+<Time when open start 1>
+<Time when open end 1>
+<Time when open start 2>
+<Time when open end 2>
+\end{verbatim}
+\begin{description}
+\item[Shop Number] A unique number for the shop (used only for display purposes).  This is often the same number as the initial Shop Room.
+\item[Item Vnum 1...Item Vnum n] An arbitrarily long list of the virtual numbers of objects that the shop produces (i.e., items which will always be available, no matter how many are bought).  The list must be terminated with -1.
+\item[Profit When Selling] The price of an object when a shopkeeper sells it is the object's value times Profit When Selling.  This is a floating point value. It should be $>$= 1.0.
+\item[Profit When Buying] The amount of money a shopkeeper will offer when buying an object is the object's value times Profit When Buying.  This is a floating point value. It should be $<$= 1.0.
+\item[Buy Types and Buy Namelists] These lines control what types of items that the shop will buy.  There can be an arbitrarily long list of buy types terminated by -1. The first argument, called ``Buy Type'' is the Type Flag of items the shop will buy (see ``Type Flag'' under ``Format of an Object'' in this document). Numerical and English forms are both valid (5 or WEAPON, 9 or ARMOR, etc.).
+\par
+The second (optional) argument is called a Buy Namelist and allows you to provide optional keywords to define specific keywords that must be present on the objects for the shopkeeper to buy or sell it.  For further details on these expressions, see the section ``Item Name Lists'' below.
+\item[Message when item to buy does not exist] The message given to a player if he tries to buy an item that the shopkeeper does not have in his inventory.
+\item[Message when item to sell does not exist] The message given to a player if he tries to sell an item that the player does not have in his inventory.
+\item[Message when shop does not buy offered item] The message given to a player if he tries to sell an item that the shopkeeper does not want to buy (controlled by the Buy Types and Buy Namelists.)
+\item[Message when shop can't afford item] The message given to a player if he tries to sell an item to a shop, but the shopkeeper does not have enough money to buy it.
+\item[Message when player can't afford item] The message given to a player if he tries to buy an item from a shop but doesn't have enough money.
+\item[Message when successfully buying an item]  The message given to a player when he successfully buys an item from a shop.  The expression \texttt{\%d} can be used in place of the cost of the item (e.g., \texttt{That'll cost you \%d coins, thanks for your business!}
+\item[Message when successfully selling an item] The message given to a player when he successfully sells an item to a shop.  The expression \texttt{\%d} can be used in place of the cost of the item as above.
+\item[Temper] When player can't afford an item, the shopkeeper tells them they can't afford the item and then can perform an additional action (-1, 0, or 1):
+\begin{description}
+\item[-1] No action other than the message.
+\item[0] The shopkeeper pukes on the player.
+\item[1] The shopkeeper smokes his joint.
+\end{description}
+Further actions can be added by your local coder (e.g., attacking a player, stealing his money, etc.)
+\item[Shop Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors') with the following values:
+\begin{verbatim}
+  1    a    WILL_START_FIGHT    Players can try to kill
+                                shopkeeper.
+  2    b    WILL_BANK_MONEY     Shopkeeper will put money
+                                over 15000 coins in the bank.
+\end{verbatim}
+A brief note:  Shopkeepers should be hard (if even possible) to kill.  The benefits players can receive from killing them is enough to unbalance most non monty-haul campaigns.
+\item[Shop Keeper Mobile Number] Virtual number of the shopkeeper mobile.
+\item[With Who Bitvector] A bitvector (see section~\vref{usingbitvectors}~`Using Bitvectors') used to designate certain alignments or classes that the shop will not trade with, with the following values:
+\begin{verbatim}
+  1     a   NOGOOD         Don't trade with positively-
+                           aligned players.
+  2     b   NOEVIL         Don't trade with evilly-aligned
+                           players.
+  4     c   NONEUTRAL      Don't trade with neutrally-
+                           aligned players.
+  8     d   NOMAGIC_USER   Don't trade with the Mage class.
+  16    e   NOCLERIC       Don't trade with the Cleric class.
+  32    f   NOTHIEF        Don't trade with the Thief class.
+  64    g   NOWARRIOR      Don't trade with the Warrior
+                           class.
+\end{verbatim}
+\item[Shop Room 1...Shop Room n] The virtual numbers the mobile must be in for the shop to be effective. (So transferred shopkeepers can't sell in the desert).  The list can be arbitrarily long but must be terminated by a -1.
+\item[Times when open] The times (in MUD-hours) between which the shop is open.  Two sets of Open/Close pairs are allowed so that the shop can be open twice a day (for example, once in the morning and once at night). To have a shop which is always open, these four values should be
+\begin{verbatim}
+  0
+  28
+  0
+  0
+\end{verbatim}
+\end{description}
+
+\subsection{Item Name Lists for 3.0 Shops}
+Name lists are formed by boolean expressions.  The following operators are available:
+\begin{verbatim}
+          ',^ = Not      *, & = And     +, | = Or
+\end{verbatim}
+The precedence is Parenthesis, Not, And, Or.  Take the following line for an example:
+\begin{verbatim}
+  WEAPON [sword & long | short | warhammer | ^golden & bow]
+                                                     & magic]
+\end{verbatim}
+This shop will buy the following items of type WEAPON:
+\begin{enumerate}
+\item sword long magic
+\item short magic (the first \& is done before the first $|$)
+\item warhammer magic
+\item \^golden bow magic
+\end{enumerate}
+Note that the \texttt{\^} in front of golden affects ONLY golden, and nothing else in the listing.  Basically, the above expression could be written in English as:\newline
+[(sword and long) or short or warhammer or (not golden and bow)] and magic\newline
+If you want the shop to only buy ``short magic'' only if they were also swords, you could change the expression to:
+\begin{verbatim}
+WEAPON [sword & (long|short) | warhammer | ^golden & bow]
+                ^-Changes--^                       & magic
+\end{verbatim}
+You can also include object extra flags (listed in the section ``Format of an Object'' above).  The previous example used ``magic'' as a keyword that had to be on the object.  If we wanted to make it so that the MAGIC flag had to be set on the item, we would change ``magic'' to ``MAGIC''.  Similar changes could be made to add other flags such as ``HUM'' or ``GLOW''.  It should be noted that these expressions are case sensitive and that all keywords should appear in lower-case, while the flag names should be in all caps.
+
+\subsection{The DikuMud Gamma and CircleMUD 2.20 Shop Format}
+This format is obsolete but is presented because it is still supported by CircleMUD 3.0.  In most cases, it is strongly recommended to simply use the \texttt{shopconv} utility shipped with Circle to convert older shop files to the new format.
+\begin{verbatim}
+#num~
+     Shop Number (Used only for display purposes)
+
+num1
+num2
+num3
+num4
+num5
+     Virtual numbers of the objects that the shop produces.
+-1's should be inserted in unused slots.
+
+Profit when selling
+     The object value is multiplied by this value when sold.
+This is a floating point value.  Must be >= 1.0
+
+Profit when buying
+     The object value is multiplied by this value when bought.
+This is a floating point value.  Must be <= 1.0
+
+num1
+num2
+num3
+num4
+num5
+     These five numbers are the item-types traded with by the
+shop (i.e. valid Type Flags of objects that the shopkeeper will
+buy).
+
+Message When Item to buy is non existing~
+Message When item trying to sell is non existing~
+Message When wrong item-type sold~
+Message when shop can't afford item~
+Message when player can't afford item~
+Message when buying an item~
+     Price is represented by %d.
+Message when selling an item~
+     Price is represented by %d.
+
+Temper
+     When player can't afford an item, the shopkeeper tells
+them they can't afford the item and then:
+     0 - The shopkeeper pukes on the player.
+     1 - The shopkeeper smokes his joint.
+     other - No action besides message above.
+
+Shop Bitvector
+     A bitvector (see section `Using Bitvectors') with the
+following values:
+1    a    WILL_START_FIGHT    Players can to try to kill this
+                              shopkeeper.
+2    b    WILL_BANK_MONEY     Shopkeeper will put money over
+                              15000 coins in the bank.
+
+     A brief note:  Shopkeepers should be hard (if even possible)
+to kill.  The benefits players can receive from killing them is
+enough to unbalance most non monty-haul campaigns.
+
+Shop Keeper Mobile Number
+     Virtual number of the shopkeeper mobile.
+
+With Who Bitvector
+     A bitvector (see section `Using Bitvectors') used to
+designate certain alignments or classes that the shop will not
+trade with, with the following values:
+1     a   NOGOOD         Keeper won't trade with positively-
+                         aligned players.
+2     b   NOEVIL         Keeper won't trade with evilly-aligned
+                         players.
+4     c   NONEUTRAL      Keeper won't trade with neutrally-
+                         aligned players.
+8     d   NOMAGIC_USER   Keeper won't trade with the Mage class.
+16    e   NOCLERIC       Keeper won't trade with the Cleric
+                         class.
+32    f   NOTHIEF        Keeper won't trade with the Thief class.
+64    g   NOWARRIOR      Keeper won't trade with the Warrior
+                         class.
+
+Shop Room Number
+     The virtual number the mobile must be in for the shop to be
+effective. (So trans'ed shopkeepers can't sell in the desert).
+
+Time when open start 1
+Time when open end 1
+     The hours between which the shop is open.
+
+Time when open start 2
+Time when open end 2
+     The hours between which the shop is open.
+\end{verbatim}
+
+\appendix
+\section{Spell Numbers}
+These spell numbers are the spells shipped by default with CircleMUD 3.0. Note that most implementors add new spells so this list may not be complete for your particular MUD.  Check with your implementor for details.
+\begin{verbatim}
+animate dead           45
+armor                   1
+bless                   3
+blindness               4
+burning hands           5
+call lightning          6
+charm                   7
+chill touch             8
+clone                   9
+color spray            10
+control weather        11
+create food            12
+create water           13
+cure blind             14
+cure critic            15
+cure light             16
+curse                  17
+detect align           18
+detect invis           19
+detect magic           20
+detect poison          21
+dispel evil            22
+dispel good            46
+earthquake             23
+enchant weapon         24
+energy drain           25
+fireball               26
+group armor            47
+group heal             48
+group recall           49
+harm                   27
+heal                   28
+identify              201
+infravision            50
+invisible              29
+lightning bolt         30
+locate object          31
+magic missile          32
+poison                 33
+prot from evil         34
+remove curse           35
+remove poison          43
+sanctuary              36
+sense life             44
+shocking grasp         37
+sleep                  38
+strength               39
+summon                 40
+teleport                2
+ventriloquate          41
+waterwalk              51
+word of recall         42
+\end{verbatim}
+
+\section{Item Values for Drink Containers}
+DRINKCON (Type Flag 17) and FOUNTAIN (Type Flag 23)
+\begin{verbatim}
+     value 0: Capacity of container
+     value 1: Current quantity in container
+     value 2: see below
+     value 3: Non-zero if the drink poisoned, 0 otherwise.
+\end{verbatim}
+Value 2 is a number which defines the type of liquid in the drink container, from the following table:
+\begin{verbatim}
+         Type           nr.         Effect of Liquid On:
+                               Drunkness   Fullness   Thirst
+         LIQ_WATER      0      0           1           10
+         LIQ_BEER       1      3           2           5
+         LIQ_WINE       2      5           2           5
+         LIQ_ALE        3      2           2           5
+         LIQ_DARKALE    4      1           2           5
+         LIQ_WHISKY     5      6           1           4
+         LIQ_LEMONADE   6      0           1           8
+         LIQ_FIREBRT    7      10          0           0
+         LIQ_LOCALSPC   8      3           3           3
+         LIQ_SLIME      9      0           4           -8
+         LIQ_MILK       10     0           3           6
+         LIQ_TEA        11     0           1           6
+         LIQ_COFFE      12     0           1           6
+         LIQ_BLOOD      13     0           2           -1
+         LIQ_SALTWATER  14     0           1           -2
+         LIQ_CLEARWATER 15     0           0           13
+\end{verbatim}
+The above values for drunkness, fullness, and thirst are in the units of one hour of effect per four units of liquid drunk.  For example, imagine that Quifael drinks an entire bottle (say 7 units) of saltwater. According to the table above, saltwater has a drunkness value of 0, fullness value of 1 and thirst value of -2.  Therefore:
+\begin{quote}
+His Drunkness is not changed ((7/4)*0)\newline
+His Fullness increases by ((7/4)*1) hours\newline
+His Thirst increases by ((7/4)*-2) hours, thus making him more thirsty.\newline
+\end{quote}
+A player's drunkness, fullness, and thirst can range from 0 to 24.  24 is the maximum; 0 means the person is completely sober, hungry, or thirsty respectively.  For immortals, these values are typically -1.
+
+\end{document}
+\end
Index: doc/sources/color.tex
===================================================================
RCS file: color.tex
diff -N color.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsk4KRu5	Mon Apr 15 20:36:21 2002
@@ -0,0 +1,125 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+\usepackage{times}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 4/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+\newenvironment{Ventry}[1]
+  {\begin{list}{}{\renewcommand{\makelabel}[1]{\textsf{##1:}\hfil}
+    \settowidth{\labelwidth}{\textsf{#1:}}
+    \setlength{\leftmargin}{\labelwidth}
+    \addtolength{\leftmargin}{\labelsep}
+  }
+  }
+  {\end{list}}
+
+\title{Using Color In CircleMUD}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document is a description of how to write C code which displays messages to players in color in the CircleMUD game engine.  Its intended audience is for Coders of CircleMUD.
+\end{abstract}
+
+CircleMUD allows you to create colorful messages by using ANSI control sequences.  Each player may select what ``level'' of color he/she desires from the four levels ``off,'' ``sparse,'' ``normal,'' and ``complete.''  Each player can select his/her color level by using the \texttt{COLOR} command from within the MUD; you as the programmer must decide which messages will be colored for each of the color levels.
+\par
+All files in which you wish to use color must have the line:
+\begin{verbatim}
+  #include "screen.h"
+\end{verbatim}
+This should be put in after all other includes in the beginning of the file.
+\par
+There are 8 colors available -- ``normal,'' red, green, yellow, blue, magenta, cyan and white.  They are accessible by sending control sequences as part of another string, for example:
+\begin{verbatim}
+  sprintf(buf, "If you're %shappy%s and you know it clap "
+               "%d of your hands.\n\r", x, y, num_of_hands);
+  send_to_char(buf, ch);
+\end{verbatim}
+In this example, \texttt{x} and \texttt{y} are the ``on'' and ``off'' sequences for the color you want.  There are 2 main series of color macros available for you to use (don't actually use ``x'' and ``y,'' of course!): the K series and the CC series. The CC (Conditional Color) series is recommended for most general use.
+\par
+The name of the actual sequence starts with the name of its series, plus a 3-letter color code, as follows:
+\begin{description}
+\item[Normal:] NRM
+\item[Red:] RED
+\item[Yellow:] YEL
+\item[Green:] GRN
+\item[Blue:] BLU
+\item[Magenta:] MAG
+\item[Cyan:] CYN
+\item[White:] WHT
+\end{description}
+For example, white in the K series is \texttt{KWHT}; blue in the CC series is \texttt{CCBLU()} (arguments defined below).
+\par
+The K series requires no arguments, and is simply a macro to the ANSI color code.  Therefore, if you use a K-series color code, the color will ALWAYS be sent, even if the person you're sending it to has color off. This can very bad -- some people who do not have ANSI-compatible terminals will see garbage characters instead of colors.  If the terminal correctly ignores ANSI color codes, then nothing will show up on their screen at all.  The K series is mainly used to print colors to a string if the player's color level will later be tested manually (for an example, see \texttt{do\_gen\_com} in \texttt{act.comm.c}).
+\par
+The recommended series is the CC series (i.e.\ \texttt{CCNRM()}, \texttt{CCRED()}, etc.) The CC series macros require two arguments -- a pointer to the character to whom the string is being sent, and the minimum color level the player must be set to in order to see the color.  Color sent as `sparse' (\texttt{C\_SPR}) will be seen by people with color set to sparse, normal, or complete;
+color sent as `normal' (\texttt{C\_NRM}) will be seen only by people with color set to normal or complete; color sent as `complete' (\texttt{C\_CMP}) will be seen only by people with color set to complete.
+\par
+To illustrate the above, an example is in order:
+\begin{verbatim}
+#include "screen.h"
+/* include screen.h in all files that you use color in */
+
+ACMD(do_showcolor)
+{
+  char buf[300];
+
+  sprintf(buf, "Don't you just love %scolor%s, %scolor%s, "
+               "%sCOLOR%s!\n\r",
+      CCBLU(ch, C_CMP), CCNRM(ch, C_CMP),
+      CCYEL(ch, C_NRM), CCNRM(ch, C_NRM),
+      CCRED(ch, C_SPR), CCNRM(ch, C_SPR));
+  send_to_char(buf, ch);
+}
+\end{verbatim}
+What does this do?  For people with color set to Complete, it prints:
+\begin{verbatim}
+    Don't you just love color, color, COLOR!
+                       (blue)  (yellow)  (red)
+\end{verbatim}
+People who have color set to Normal will see:
+\begin{verbatim}
+    Don't you just love color, color, COLOR!
+                               (yellow)  (red)
+\end{verbatim}
+People who have color set to Sparse will see:
+\begin{verbatim}
+    Don't you just love color, color, COLOR!
+                                         (red)
+\end{verbatim}
+People who have color set to Off will see:
+\begin{verbatim}
+    Don't you just love color, color, COLOR!
+                    (no color, as you'd expect)
+\end{verbatim}
+There are several common pitfalls with using the CC series of color macros:
+\begin{itemize}
+\item Do not confuse \texttt{CCNRM} with \texttt{C\_NRM}.  \texttt{CCNRM()} is a macro to turn the color back to normal; \texttt{C\_NRM} is a color level of ``normal''.
+\item Always make sure that every pair of ``on'' and ``off'' codes are at the same color level.  For example:
+\begin{verbatim}
+WRONG:  sprintf(buf, "%sCOLOR%s\n\r", CCBLU(ch, C_NRM),
+                                      CCNRM(ch, C_CMP));
+\end{verbatim}
+\par
+This is wrong because if someone has their color level set to Normal, the \texttt{CCBLU} code will be sent but the \texttt{CCNRM} command will not, causing all subsequent output to be blue.
+\begin{verbatim}
+WRONG:  sprintf(buf, "%sCOLOR%s\n\r", CCBLU(ch, C_CMP),
+                                      CCNRM(ch, C_NRM));
+\end{verbatim}
+The above statement is also wrong, although not as bad.  In this case, someone with color set to Normal will (correctly) not get the \texttt{CCBLU} code, but will then unnecessarily get the \texttt{CCNRM} code.  Never send a color code if you don't have to -- the codes are several bytes long, and cause a noticeable pause at 2400 baud.
+\par
+\item This should go without saying, but don't ever send color at the \texttt{C\_OFF} level.
+\item Special precautions must be taken when sending a colored string to a large group of people -- you can't use the color level of ``ch'' (the person sending the string) -- each person receiving the string must get a string appropriately colored for his/her level.  In such cases, it is usually best to set up two strings (one colored and one not), and test each player's color level individually (see \texttt{do\_gen\_com} in \texttt{act.comm.c} for an example).
+\end{itemize}
+
+\end{document}
+\end
Index: doc/sources/files.tex
===================================================================
RCS file: files.tex
diff -N files.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsQpAGv6	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,136 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{CircleMUD File Manifest}
+\author{}
+\begin{document}
+
+\maketitle
+
+The main `\texttt{circle/}' directory has the following subdirectories and files:
+
+\begin{verbatim}
+  README          - Information for the new CircleMudder
+  automaint       - shell script to perform maintenance .. see running.doc
+  autorun         - shell script to run the MUD .. see running.doc
+  bin/            - directory of all the compiled programs (binaries)
+  doc/            - documentation
+  lib/            - MUD data (playerfile, world files, etc.)
+  log/            - system logs
+  src/            - source code
+  syslog          - the current system log
+\end{verbatim}
+
+The \texttt{bin/} directory contains only binaries: `\texttt{circle}' (the main MUD) and its utilities, which are described in the CircleMUD Utility document.
+\par
+The \texttt{doc/} directory has its own \texttt{README} file, describing the contents of each of the documentation files.
+\par
+The \texttt{lib/} directory contains the following subdirectories:
+\begin{verbatim}
+  etc             - Files which the MUD uses internally (playerfile, mail, etc.)
+  misc            - Misc. database files meant to be changed (i.e. socials)
+  plrobjs         - Player object hierarchy and utility scripts
+  plralias        - Hierarchy for saved player aliases.
+  text            - Text files such as MOTD, news, help, etc.
+  world           - The world hierarchy
+\end{verbatim}
+
+The \texttt{lib/etc/} directory contains the following files (the MUD actively maintains these files while it is running; they should not be modified unless the game is down):
+\begin{verbatim}
+  Board.*         - Binary files with the contents of the bulletin boards
+  badsites        - List of banned sites
+  hcontrol        - Binary file with the state of the house control system
+  players         - Binary file containing data on all players
+  plrmail         - Binary file containing player mail
+\end{verbatim}
+
+The \texttt{lib/misc/} directory contains the following files:
+\begin{verbatim}
+  bugs            - Bugs reported by players with the 'bug' command
+  ideas           - Ideas from players from 'idea' command
+  messages        - Spell and skill damage messages
+  socials         - Text file with text of the socials
+  typos           - Typos reported by players with the 'typo' command
+  xnames          - Text file of invalid names
+\end{verbatim}
+
+The \texttt{lib/plrobjs/} contains the following files and directories:
+\begin{verbatim}
+  a-e  \
+  f-j   \
+  k-o    \ Subdirectories where player objects files are stored
+  p-t    /
+  u-z  /
+  zzz/
+  purgedir        - Script to purge an object dir (meant for use by purgeobjs)
+  purgeobjs       - Script to purge player objects (see utils.doc)
+  searchfor       - Script to search for objects in obj files (see utils.doc)
+\end{verbatim}
+
+The \texttt{lib/plralias/} contains the following directories:
+\begin{verbatim}
+  a-e  \
+  f-j   \
+  k-o    \ Subdirectories where player alias files are stored.
+  p-t    /
+  u-z  /
+  zzz/
+\end{verbatim}
+
+The \texttt{lib/text/} directory contains the following files:
+\begin{verbatim}
+  background      - Background story (for option 3 from main menu)
+  credits         - Text for 'credits' command
+  handbook        - Text for Immortal Handbook ('handbook' command)
+  help            - Text for 'help' command with no arguments
+  help_table      - File of all help entries for 'help' command
+  immlist         - Text for 'immlist' command
+  imotd           - Immortal MOTD -- seen by immortals on login
+  info            - Text for 'info' command
+  motd            - MOTD -- seen by mortals on login
+  news            - Text for 'news' command
+  policies        - Text for 'policy' command
+  wizlist         - Text for 'wizlist' command
+\end{verbatim}
+
+The \texttt{lib/world/} directory contains the following subdirectories:
+\begin{verbatim}
+  mob     - Contains *.mob files (mobile files)
+  obj     - Contains *.obj files (object files)
+  shp     - Contains *.shp files (shop files)
+  wld     - Contains *.wld files (world files)
+  zon     - Contains *.zon files (zone files)
+\end{verbatim}
+
+Each of the 5 subdirectories in the \texttt{lib/world/} directory also contains two additional files -- one called `\texttt{index}', which specifies which files in that directory should be loaded when the MUD boots, and `\texttt{index.mini}', which specifies which files should be loaded if the MUD is booted with the \texttt{-m} (mini-mud) option.
+\par
+The \texttt{log/} directory contains several files of the form \texttt{syslog.{\it n}}, where {\it n} is a small number.  These are the most recent CircleMUD syslogs.
+\par
+In addition, it contains the following more permanent system logs:
+\begin{verbatim}
+  badpws          - Records of bad password attempts
+  delete          - Players who have self-deleted
+  dts             - Players who have hit death traps
+  errors          - MUD system errors ("SYSERR" messages)
+  levels          - Records of all levels gained by all players
+  newplayers      - Records of the creation of new players
+  rentgone        - Players who have lost their items in rent
+  restarts        - List of times at which the MUD rebooted
+  rip             - Player deaths
+  usage           - Mud system usage (player load & memory usage info)
+\end{verbatim}
+
+The src directory contains all of the C and header files for the MUD, along with a \texttt{Makefile}.  The \texttt{src/util/} directory contains source for CircleMUD's utility programs.  See the Administering CircleMUD document for more information on how to compile the MUD.  See the CircleMUD Utility document for more information on how to use CircleMUD's utilities.
+
+\end{document}
+\end
Index: doc/sources/hacker.tex
===================================================================
RCS file: hacker.tex
diff -N hacker.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsQe7jd7	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,133 @@
+\documentclass{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@cambot.circlemud.org> on Dec 4/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{The Art of Debugging}
+\author{Michael Chastain}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+The following documentation is excerpted from Merc 2.0's \texttt{hacker.txt} file.  It was written by Furey of MERC Industries and is included here with his permission.  We have packaged it with CircleMUD (very slightly changed in a couple of places, such as specific filenames) because it offers good advice and insight into the art and science of software engineering.  More information about CircleMUD, including up-to-date versions of this documentation in ASCII and Postscript, can be found at the CircleMUD home page \url{<http://www.circlemud.org/>} or FTP site \url{<ftp://ftp.circlemud.org/pub/CircleMUD/>}.
+\end{abstract}
+
+\section{``I'm running a Mud so I can learn C programming!''}
+Yeah, right.
+\par
+The purpose of this document is to record some of our knowledge, experience and philosophy.  No matter what your level, we hope that this document will help you become a better software engineer.
+\par
+Remember that engineering is work, and {\em no} document will substitute for your own thinking, learning and experimentation.
+
+\section{How to Learn in the First Place}
+\begin{itemize}
+\item Play with something.
+\item Read the documentation on it.
+\item Play with it some more.
+\item Read documentation again.
+\item Play with it some more.
+\item Read documentation again.
+\item Play with it some more.
+\item Read documentation again.
+\item Get the idea?
+\end{itemize}
+The idea is that your mind can accept only so much ``new data'' in a single session.  Playing with something doesn't introduce very much new data, but it does transform data in your head from the ``new'' category to the ``familiar'' category.  Reading documentation doesn't make anything ``familiar,'' but it refills your ``new'' hopper.
+\par
+Most people, if they even read documentation in the first place, never return to it.  They come to a certain minimum level of proficiency and then never learn any more.  But modern operating systems, languages, networks, and even applications simply cannot be learned in a single
+session.  You have to work through the two-step learning cycle {\em many} times to master it.
+
+\section{Basic Unix Tools}
+\begin{description}
+\item[man] gives you online manual pages
+\item[grep] stands for ``global regular expression print;'' searches for strings in text files
+\item[vi, emacs, jove] use whatever editor floats your boat, but learn the hell out of it; you should know {\em every} command in your editor
+\item[ctags] mags ``tags'' for your editor which allows you to go to functions by name in any source file
+\item[$>$, $>>$, $<$, $|$] input and output redirection at the command line; get someone to show you, or dig it out of ``man csh''
+\end{description}
+These are the basic day-in day-out development tools.  Developing without knowing how to use {\em all} of these well is like driving a car without knowing how to change gears.
+
+\section{Debugging: Theory}
+
+Debugging is a science.  You formulate a hypothesis, make predictions based on the hypothesis, run the program and provide it experimental input, observe its behavior, and confirm or refute the hypothesis.
+\par
+A good hypothesis is one which makes surprising predictions which then come true; predictions that other hypotheses don't make.
+\par
+The first step in debugging is not to write bugs in the first place. This sounds obvious, but sadly, is all too often ignored.
+\par
+If you build a program, and you get {\em any} errors or {\em any} warnings, you should fix them before continuing.  C was designed so that many buggy ways of writing code are legal, but will draw warnings from a suitably smart compiler (such as ``gcc'' with the \texttt{-Wall} flag enabled).  It
+takes only minutes to check your warnings and to fix the code that generates them, but it takes hours to find bugs otherwise.
+\par
+``Desk checking'' (proof reading) is almost a lost art these days. Too bad.  You should desk check your code before even compiling it, and desk-check it again periodically to keep it fresh in mind and find new errors.  If you have someone in your group whose {\em only} job it is to desk-check other people's code, that person will find and fix more bugs than everyone else combined.
+\par
+One can desk-check several hundred lines of code per hour.  A top-flight software engineer will write, roughly, 99\% accurate code on the first pass, which still means one bug per hundred lines.  And you are not top flight.  So... you will find several bugs per hour by desk checking.  This is a very rapid bug fixing technique.  Compare that to all the hours you spend screwing around with broken programs trying to find {\em one} bug at a time.
+\par
+The next technique beyond desk-checking is the time-honored technique of inserting ``print'' statements into the code, and then watching the logged values.  Within Circle code, you can call \texttt{printf()}, \texttt{fprintf()}, or \texttt{log()} to dump interesting values at interesting times.  Where and when to dump these values is an art, which you will learn only with practice.
+\par
+If you don't already know how to redirect output in your operating system, now is the time to learn.  On Unix, type the command ``\texttt{man csh}'', and read the part about the ``\texttt{>}'' operator.  You should also learn the difference between ``standard output'' (for example, output from ``\texttt{printf}'') and ``standard error'' (for example, output from ``\texttt{fprintf(stderr, ...)}'').
+\par
+Ultimately, you cannot fix a program unless you understand how it is operating in the first place.  Powerful debugging tools will help you collect data, but they can't interpret it, and they can't fix the underlying problems.  Only you can do that.
+\par
+When you find a bug... your first impulse will be to change the code, kill the manifestation of the bug, and declare it fixed.  Not so fast! The bug you observe is often just the symptom of a deeper bug.  You should keep pursuing the bug, all the way down.  You should grok the bug and cherish it in fullness before causing its discorporation.
+\par
+Also, when finding a bug, ask yourself two questions: ``What design and programming habits led to the introduction of the bug in the first place?''  And: ``What habits would systematically prevent the introduction of bugs like this?''
+
+\section{Debugging: Tools}
+When a Unix process accesses an invalid memory location, or (more rarely) executes an illegal instruction, or (even more rarely) something else goes wrong, the Unix operating system takes control. The process is incapable of further execution and must be killed. Before killing the process, however, the operating system does something for you: it opens a file named ``\texttt{core}'' and writes the entire data space of the process into it.
+\par
+Thus, ``dumping core'' is not a cause of problems, or even an effect of problems.  It's something the operating system does to help you find fatal problems which have rendered your process unable to continue.
+\par
+One reads a ``core'' file with a debugger.  The two most popular debuggers on Unix are \texttt{adb} and \texttt{gdb}, although occasionally one finds \texttt{dbx}.  Typically one starts a debugger like this: ``\texttt{adb bin/circle}'' or ``\texttt{gdb bin/circle lib/core}''.
+\par
+The first thing, and often the only thing, you need to do inside the debugger is take a stack trace.   In \texttt{adb}, the command for this is ``\texttt{\$c}''.  In \texttt{gdb}, the command is ``{\texttt{backtrace}''.  In \texttt{dbx}, the command is ``\texttt{where}''.  The stack trace will tell you what function your program was in when it crashed, and what functions were calling it.  The debugger will also list the arguments to these functions. Interpreting these arguments, and using more advanced debugger features, requires a fair amount of knowledge about assembly language programming.
+\par
+If you have access to a program named ``\texttt{Purify}''... learn how to use it.
+
+\section{Profiling}
+Another useful technique is ``profiling,'' to find out where your program is spending most of its time.  This can help you to make a program more efficient.
+\par
+Here is how to profile a program:
+\par
+\begin{enumerate}
+\item Remove all the .o files and the ``circle'' executable:
+\begin{verbatim}
+  make clean
+\end{verbatim}
+\item Edit your Makefile, and change the \texttt{PROFILE=} line:
+\begin{verbatim}
+  PROFILE = -p
+\end{verbatim}
+\item Remake circle:
+\begin{verbatim}
+  make
+\end{verbatim}
+\item Run circle as usual.  Shutdown the game with the \texttt{shutdown} command when you have run long enough to get a good profiling base under normal usage conditions.  If you crash the game, or kill the process externally, you won't get profiling information.
+\item Run the \texttt{prof} command:
+\begin{verbatim}
+  prof bin/circle > prof.out
+\end{verbatim}
+\item Read \texttt{prof.out}.  Run ``\texttt{man prof}'' to understand the format of the output.
+\end{enumerate}
+For advanced profiling, you can use ``\texttt{PROFILE = -pg}'' in step 2, and use the ``\texttt{gprof}'' command in step 5.  The ``\texttt{gprof}'' form of profiling gives you a report which lists exactly how many times any function calls any other function.  This information is valuable for debugging as well as performance analysis.
+\par
+Availability of ``\texttt{prof}'' and ``\texttt{gprof}'' varies from system to system. Almost every Unix system has ``\texttt{prof}''.  Only some systems have ``\texttt{gprof}''.
+
+\section{Books for Serious Programmers}
+Out of all the thousands of books out there, three stand out:
+\begin{itemize}
+\item Kernighan and Plaugher, ``{\em The Elements of Programming Style}''
+\item Kernighan and Ritchie, ``{\em The C Programming Language}''
+\item Brooks, ``{\em The Mythical Man Month}''
+\end{itemize}
+
+ \end{document}
+ \end
+
Index: doc/sources/license.tex
===================================================================
RCS file: license.tex
diff -N license.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsmCpNx7	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,189 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{0pt}
+
+\title{CircleMUD License}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document presents the CircleMUD License and the DikuMud License.  Both of these licenses must be followed in order to legally use or modify CircleMUD or any part of it.
+\end{abstract}
+
+\section{CircleMUD License}
+CircleMUD was created by:
+\par
+Jeremy Elson\newline
+Department of Computer Science\newline
+Johns Hopkins University\newline
+Baltimore, MD  21218  USA\newline
+\url{<jelson@circlemud.org>}
+\par
+CircleMUD is licensed software.  This file contains the text of the CircleMUD license.  If you wish to use the CircleMUD system in any way, or use any of its source code, you must read this license and are legally bound to comply with it.
+\par
+CircleMUD is a derivative work based on the DikuMud system written by Hans Henrik Staerfeldt, Katja Nyboe, Tom Madsen, Michael Seifert, and Sebastian Hammer.  DikuMud is also licensed software; you are legally bound to comply with the original DikuMud license as well as the CircleMUD license if you wish to use CircleMUD.
+\par
+Use of the CircleMUD code in any capacity implies that you have read, understood, and agreed to abide by the terms and conditions set down by this license and the DikuMud license.  If you use CircleMUD without complying with the license, you are breaking the law.
+\par
+Using CircleMUD legally is easy.  In short, the license requires three things:
+\begin{enumerate}
+\item You must not use CircleMUD to make money or be compensated in any way.
+\item You must give the authors credit for their work.
+\item You must comply with the DikuMud license.
+\end{enumerate}
+
+That's it -- those are the main conditions set down by this license. Unfortunately, past experience has shown that many people are not willing to follow the spirit of the license, so the remainder of this document will clearly define those conditions in an attempt to prevent people from circumventing them.
+
+\subsection{You must not use CircleMUD to make money or be compensated in any way.}
+The first condition says that you must not use CircleMUD to make money in any way or be otherwise compensated.  CircleMUD was developed in people's uncompensated spare time and was given to you free of charge, and you must not use it to make money.  CircleMUD must not in any way be used to facilitate your acceptance of fees, donations, or other compensation. Examples include, but are not limited to the following:
+\begin{itemize}
+\item If you run CircleMUD, you must not require any type of fee or donation in exchange for being able to play CircleMUD.  You must not solicit, offer or accept any kind of donation from your players in exchange for enhanced status in the game such as increased levels, character stats, gold, or equipment.
+\item You must not solicit or accept money or other donations in exchange for running CircleMUD.  You must not accept money or other donations from your players for purposes such as hardware upgrades for running CircleMUD.
+\item You must not sell CircleMUD.  You must not accept any type of fee in exchange for distributing or copying CircleMUD.
+\item If you are a CircleMUD administrator, You must not accept any type of reimbursement for money spent out of pocket for running CircleMUD, i.e., for equipment expenses or fees incurred from service providers.
+\end{itemize}
+
+\subsection{You must give the authors credit for their work.}
+The second part of the license states that you must give credit to the creators of CircleMUD.  A great deal of work went into the creation of CircleMUD, and it was given to you completely free of charge; claiming that you wrote the MUD yourself is a slap in the face to everyone who worked to bring you a high quality product while asking for nothing but credit for their work in return.
+\par
+Specifically, the following are required:
+\begin{itemize}
+\item The text in the `\texttt{credits}' file distributed with CircleMUD must be preserved.  You may add your own credits to the file, but the existing text must not be removed, abridged, truncated, or changed in any way. This file must be displayed when the `\texttt{credits}' command is used from within the MUD.
+\item The ``\texttt{CIRCLEMUD}'' help entry must be maintained intact and unchanged, and displayed in its entirety when the `\texttt{help circlemud}' command is used.
+\item The login sequence must contain the names of the DikuMud and CircleMUD creators.  The 'login sequence' is defined as the text seen by players between the time they connect to the MUD and when they start to play the game itself.
+\item This license must be distributed AS IS with all copies or portions of the CircleMUD that you distribute, if any, including works derived from CircleMUD.
+\item You must not remove, change, or modify any notices of copyright, licensing or authorship found in any CircleMUD source code files.
+\item Claims that any of the above requirements are inapplicable to a particular MUD for reasons such as ``our MUD is totally rewritten'' or similar are completely invalid.  If you can write a MUD completely from scratch then you are encouraged to do so by all means, but use of any part of the CircleMUD or DikuMud source code requires that their respective licenses be followed, including the crediting requirements.
+\end{itemize}
+
+\subsection{You must comply with the DikuMud license.}   
+The third part of the license simply states that you must comply with the DikuMud license.  This is required because CircleMUD is a DikuMud derivative. The DikuMud license is included below.
+\par
+You are allowed to use, modify and redistribute all CircleMUD source code and documentation as long as such use does not violate any of the rules set down by this license.
+\par
+--Jeremy Elson
+\par
+CircleMUD 3 -- Copyright \copyright 1994-2001, The CircleMUD Group\newline
+Other portions copyright by authors as noted in ChangeLog and source code.
+
+\section{DikuMud License}
+Everything below this point is the original, unmodified DikuMud license. You must comply with the CircleMUD license above, as well as the DikuMud license below.
+
+\begin{verbatim}
+/* ************************************************************************
+*  Copyright (C) 1990, 1991                                               *
+*  All Rights Reserved                                                    *
+************************************************************************* */
+
+                             DikuMud License
+
+                      Program & Concept created by
+
+
+Sebastian Hammer
+Prss. Maries Alle 15, 1
+1908 Frb. C.
+DENMARK
+(email quinn@freja.diku.dk)
+
+Michael Seifert
+Nr. Soeg. 37C, 1, doer 3
+1370 Copenhagen K.
+DENMARK
+(email seifert@freja.diku.dk)
+
+Hans Henrik St{rfeldt
+Langs} 19
+3500 V{rl|se
+DENMARK
+(email bombman@freja.diku.dk)
+
+Tom Madsen
+R|de Mellemvej 94B, 64
+2300 Copenhagen S.
+DENMARK
+(email noop@freja.diku.dk)
+
+Katja Nyboe
+Kildeg}rdsvej 2
+2900 Hellerup
+31 62 82 84
+DENMARK
+(email katz@freja.diku.dk)
+
+
+This document contains the rules by which you can use, alter or publish
+parts of DikuMud. DikuMud has been created by the above five listed persons
+in their spare time, at DIKU (Computer Science Instutute at Copenhagen
+University). You are legally bound to follow the rules described in this
+document.
+
+Rules:
+
+   !! DikuMud is NOT Public Domain, shareware, careware or the like !!
+
+   You may under no circumstances make profit on *ANY* part of DikuMud in
+   any possible way. You may under no circumstances charge money for
+   distributing any part of dikumud - this includes the usual $5 charge
+   for "sending the disk" or "just for the disk" etc.
+   By breaking these rules you violate the agreement between us and the
+   University, and hence will be sued.
+
+   You may not remove any copyright notices from any of the documents or
+   sources given to you.
+
+   This license must *always* be included "as is" if you copy or give
+   away any part of DikuMud (which is to be done as described in this
+   document).
+
+   If you publish *any* part of dikumud, we as creators must appear in the
+   article, and the article must be clearly copyrighted subject to this
+   license. Before publishing you must first send us a message, by
+   snail-mail or e-mail, and inform us what, where and when you are
+   publishing (remember to include your address, name etc.)
+
+   If you wish to setup a version of DikuMud on any computer system, you
+   must send us a message , by snail-mail or e-mail, and inform us where
+   and when you are running the game. (remember to include 
+   your address, name etc.)
+
+
+   Any running version of DikuMud must include our names in the login
+   sequence. Furthermore the "credits" command shall always cointain
+   our name, addresses, and a notice which states we have created DikuMud.
+
+   You are allowed to alter DikuMud, source and documentation as long as
+   you do not violate any of the above stated rules.
+
+
+Regards,
+
+
+
+The DikuMud Group
+
+Note:
+
+We hope you will enjoy DikuMud, and encourage you to send us any reports
+on bugs (when you find 'it'). Remember that we are all using our spare
+time to write and improve DikuMud, bugs, etc. - and changes will take their
+time. We have so far put extremely many programming hours into this project.
+If you make any major improvements on DikuMud we would be happy to
+hear from you. As you will naturally honor the above rules, you will receive
+new updates and improvements made to the game.
+
+\end{verbatim}
+
+\end{document}
+\end
Index: doc/sources/porting.tex
===================================================================
RCS file: porting.tex
diff -N porting.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsKfwrR9	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,85 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@cambot.circlemud.org> on Dec 6/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{Porting CircleMUD to New Platforms}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+CircleMUD is a very portable program by design, but is not guaranteed to run on every platform that exists.  This document is for experienced programmers trying to make CircleMUD work on their platform.
+\end{abstract}
+
+\section{Introduction}
+CircleMUD should work on most UNIX platforms without any modifications; simply run the ``\texttt{configure}'' script and it should automatically detect what type of system you have and anything that may be strange about it.  These findings are all stored in a header file called \texttt{conf.h} which is created in the src directory from a template called \texttt{conf.h.in}.  A \texttt{Makefile} is also created from the template \texttt{Makefile.in}. 
+\par
+Non-UNIX platforms are a problem.  Some can't run CircleMUD at all.  However, any multitasking OS that has an ANSI C compiler, and supports non-blocking I/O and socket-based TCP/IP networking, should theoretically be able to run CircleMUD; for example, OS/2, AmigaOS, Mac OS (Classic versions; Mac OS X supports CircleMUD's configure script from the command line), Windows 3.11/NT/9*.
+\par
+The port can be very easy or very difficult, depending mainly on whether or nor your OS supports the Berkeley socket API.  Windows 95, for example, supports Berkeley sockets with a few modifications using the WinSock library, and OS/2 supports Berkeley sockets with no source changes at all. 
+\par
+The general steps for porting CircleMUD to a non-UNIX platform are listed below.  A number of tips for porting can be found after the porting steps. Note that we have already ported Circle to Windows 95, so if you're confused as to how to perform some of these steps, you can look at what we have done as an example (see the files \texttt{conf.h.win}, \texttt{Makefile.win} and \texttt{README.WIN}). 
+\par
+Note that you should not try to do this unless you are an experienced C programmer and have a solid, working knowledge of the system to which you are trying to port the code. 
+
+\section{Porting the Code}
+\begin{description}
+\item[Step 1.] Create a ``\texttt{conf.h}'' file for your system.\newline
+Copy the template ``\texttt{conf.h.in}'' to ``\texttt{conf.h}'', and then define or undefine each item as directed by the comments and based on the characteristics of your system.  To write the \texttt{conf.h} file, you'll need to know which header files are included with your system, the return type of signals, whether or not your compiler supports the `\texttt{const}' keyword, and whether or not you have various functions such as \texttt{crypt()} and \texttt{random()}.\newline
+Also, you can ignore the \texttt{HAVE\_LIBxxx} and \texttt{HAVE\_xxx\_PROTO} constants at the end of \texttt{conf.h.in}; they are not used in the code (they are part of UNIX \texttt{autoconf}).
+
+\item[Step 2.] Create a \texttt{Makefile}.\newline
+Again, copy the template \texttt{Makefile.in} and make any changes which may be appropriate for your system.  Make sure to remove the \texttt{@xxx@} variables such as \texttt{@LIBS@}, \texttt{@CC@}, \texttt{@NETLIB@}, etc., and replace them with the appropriate values if necessary.
+
+\item[Step 3.] Make the appropriate patches to the code so that the TCP/IP reads and writes and signal handling are compatible with your system. This is the hardest part of porting CircleMUD.  All of the changes you will need to make will probably be in the source file \texttt{comm.c}.
+
+\item[Step 4.] Test your changes!  Make sure that multiple people can log in simultaneously and that they can all type commands at the same time.  No player should ever have a ``frozen'' screen just because another is waiting at a prompt.  Leave the MUD up for at least 24 hours, preferably with people playing it, to make sure that your changes are stable.  Make sure that automatic events such as zone resets, point regeneration, and corpse decomposition are being timed correctly (a tick should be about 75 seconds).  Try resetting all the zones repeatedly by typing ``\texttt{zr *}'' many times.  Play the MUD and make sure that the basic commands (killing mobs as a mortal, casting spells, etc.) work correctly.
+
+\item[Step 5.] If you are satisfied that your changes work correctly, you are encouraged to submit them to be included as part of the stock CircleMUD distribution so that future releases of Circle will support your platform.  This prevents you from re-porting the code every time a new version is released and allows other people who use your platform to enjoy CircleMUD as well.\newline
+To submit your changes you must make a patch file using the GNU `\texttt{diff}' program which can be downloaded by anonymous FTP from \url{ftp://ftp.gnu.org:/pub/gnu/diffutils-x.x.tar.gz}.  \texttt{diff} will create a patch file which can be later used with the `\texttt{patch}' utility to incorporate your changes into the stock CircleMUD distribution.  For example, if you have a copy of stock (plain) CircleMUD in the ``\texttt{stock-circle}'' directory, and your changes are in ``\texttt{my-circle}'', you can create a patch file like this:
+\begin{verbatim}
+ diff -u --new-file --recursive stock-circle/src my-circle/src > patch
+\end{verbatim}
+This will create a file called `\texttt{patch}' with your patches.  You should then try to use the `\texttt{patch}' program (the inverse of `\texttt{diff}') on a copy of stock circle to make sure that Circle is correctly changed to incorporate your patches.\newline
+This step is very important: if you don't create these patches correctly, your work will be useless because no one will be able to figure out what you did!  Make sure to read the documentation to `\texttt{diff}' and `\texttt{patch}' if you don't understand how to use them.\newline
+If your patches work, CELEBRATE!!
+
+\item[Step 6.] Write a \texttt{README} file for your operating system that describes everything that has to be done by another user of your operating system to get CircleMUD to compile from scratch.  You should include a section on required hardware, software, compilers, libraries, etc. Also include detailed, step-by-step instructions on how to compile and run everything.  You can look at the other \texttt{README} files in the distribution (\texttt{README.WIN}, \texttt{README.OS2}, etc.) for examples of what your \texttt{README} file should include.
+
+\item[Step 7.] You are done!  Congratulations!  Mail your \texttt{conf.h}, \texttt{Makefile}, patches,
+and \texttt{README} file to the CircleMUD Group $<$cdev@circlemud.org$>$ so that they can be included in future releases of CircleMUD.  Please share your work so that other users of your OS can use Circle, too.
+\end{description}
+
+\section{Porting Tips}
+Some tips about porting:
+
+\subsection{Making your own \texttt{CIRCLE\_system} constant}
+Each system to which Circle is already ported has a \texttt{CIRCLE\_xx} constant associated with it: \texttt{CIRCLE\_UNIX} for plain vanilla UNIX CircleMUD, \texttt{CIRCLE\_WINDOWS} for MS Win95/NT, \texttt{CIRCLE\_OS2} for IBM OS/2, and \texttt{CIRCLE\_AMIGA} for the Amiga.  You must use a similar constant for your system.  At the top of your \texttt{conf.h}, make sure to comment out ``\texttt{\#define CIRCLE\_UNIX}'' and add ``\texttt{\#define CIRCLE\_YOUR\_SYSTEM}''.
+
+\subsection{ANSI C and GCC}
+As long as your system has an ANSI C compiler, all of the code (except for \texttt{comm.c}) should compile with no major complaints. However, Circle was written using \texttt{gcc}, and some compilers are nitpicky about things that \texttt{gcc} does not care about (and the other way around).  Therefore, you are {\em highly} encouraged to use \texttt{gcc} if at all possible.  \texttt{gcc} has been ported to a very large number of platforms, possibly including yours, and your port will be made much easier if you use \texttt{gcc}.  You can download \texttt{gcc} via anonymous FTP from \url{ftp://ftp.gnu.org:/pub/gnu/}.
+
+\subsection{Non-Blocking I/O}
+Make absolutely sure to use non-blocking I/O; i.e.\ make sure to enable the option so that the \texttt{read()} system call will immediately return with an error if there is no data available. If you do {\em not} use non-blocking I/O, \texttt{read()} will ``block,'' meaning it will wait infinitely for one particular player to type something even if other players are trying to enter commands.  If your system does not implement non-blocking I/O correctly, try using the \texttt{POSIX\_NONBLOCK\_BROKEN} constant in \texttt{sysdep.h}.
+
+\subsection{Timing}
+CircleMUD needs a fairly precise (on the order of 5 or 10 ms) timer in order to correctly schedule events such as zone resets, point regeneration (``ticks''), corpse decomposition, and other automatic tasks.  If your system supports the \texttt{select()} system call with sufficient precision, the default timing code should work correctly.  If not, you'll have to find out which system calls your system supports for determining how much time has passed and replace the \texttt{select()} timing method.
+
+\subsection{Signals and Signal Handlers}
+A note about signals: Most systems don't support the concept of signals in the same way that UNIX does.  Since signals are not a critical part of how Circle works anyway (they are only used for updating the wizlist and some other trivial things), all signal handling is turned off by default when compiling under any non-UNIX platform (i.e.\ the Windows 95 and Amiga ports do not use signals at all.)  Simply make sure that \texttt{CIRCLE\_UNIX} is {\em not} defined in your \texttt{conf.h} file and all signal code will be ignored automatically.
+
+\section{Final Note}
+{\bf IMPORTANT:} Remember to keep any changes you make surrounded by \texttt{\#ifdef} statements (i.e.\ ``\texttt{\#ifdef CIRCLE\_WINDOWS} ... \texttt{\#endif}'').  If you make absolutely sure to mark all of your changes with \texttt{\#ifdef} statements, then your patches (once you get them to work) will be suitable for incorporation into the CircleMUD distribution, meaning that CircleMUD will officially support your platform.
+
+\end{document}
+\end
Index: doc/sources/release.tex
===================================================================
RCS file: release.tex
diff -N release.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsW8ZTLb	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,256 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{0pt}
+
+\title{CircleMUD Release History}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document is basically just a a compliation of all the \texttt{README} files which accompanied each release of CircleMUD.  At the end is the post to \texttt{rec.games.mud.diku} which originally anounced CircleMUD as a publically available MUD source code.
+\end{abstract}
+
+\begin{itemize}
+\item Version 2.20:  November 17, 1993
+\item Version 2.11:  September 19, 1993
+\item Version 2.10:  September 1, 1993
+\item Version 2.02:  Early August
+\item Version 2.01:  July 20, 1993
+\item Version 2.00:  July 16, 1993
+\end{itemize}
+
+The latest production version of Circle is 2.20, released on November 17, 1993.  Version 2.20 supercedes version 2.11, which was released on September 19, 1993.
+
+\section{Version 2.20 - November 17, 1993}
+New features:
+\begin{itemize}
+\item A completely new output buffering system which is far more network-efficient, and somewhat more memory- and speed-efficient, than the original Diku system. Definitely a major win for people with slow Net links.  (Details available by request, but this was discussed on rgmd recently.)  Several other functions (such as do\_where() and do\_who()) have been rewritten to take advantage of the new system.
+\item Redesigned stat screens with better readability
+\item Command-line substitution via the ``\^{}'' character (works identically to the csh command)
+\item Code sent by Jeff Fink (thanks Jeff!): Help now handles ambiguous cases correctly (i.e., ``help color'' will give you help for color and not colorspray)
+\item vstat command to stat mobiles and object by virtual number
+\item updated documentation
+\end{itemize}
+And, bug fixes of varying degrees of severity:
+\begin{itemize}
+\item SunOS Bus errors on stealing
+\item +hit item bug
+\item Switched immort re-login bug
+\item Mob memory bug
+\item Poison/Stat bug (I think this one is native to Diku Gamma 0.0 -- the function hit\_gain was responsible for subtracting hits when a char is poisoned, so you'd lose hits when someone statted you.)
+\item Stat room bug under Solaris and IRIX
+\item Ungroup bug
+\item ``goto 3.guard'' now works (takes you to the third guard instead of room 3)
+\item various other minor fixes
+\end{itemize}
+
+\section{Version 2.11 - September 19, 1993}
+Changes in 2.11 (from 2.10):\newline
+Mostly bug fixes, including:
+\begin{itemize}
+\item SET FILE bug
+\item SIGBUS/unaligned data errors under SunOS and other OS's
+\item Move limit modifier bug
+\item wrist-wearing bug
+\item Compilation problems with utility.c under some operating systems
+\end{itemize}
+The only notable change is that the hit\_limit, move\_limit, and mana\_limit functions have been removed (for many reasons).  From the players' point of view, this means that a character no longer gains movement points with age. Hit, move, and mana gain speeds are still a function of age, however.
+
+\section{Version 2.10 - September 1, 1993}
+Changes in 2.10 (from 2.01):
+\begin{itemize}
+\item Rewritten get/put/drop/junk/donate/give/wear/remove, so that ``all'' and ``all.x'' work in a much wider variety of cases.  Loosely based on code sent in by Jeff Fink.
+\item ``Track'' function based on breadth-first search
+\item Configurable auto-save feature to automatically crash-save players periodically
+\item More intense error-checking in object saving system to detect problems with file permissions
+\item Many configuration options added to config.c
+\item  Option to make death traps automatically have dump spec-proc assigned
+\item ASPELL and ACAST macros added to match the ACMD macros; spells1.c, spells2.c, spell\_parser.c, and magic.c changed to use the macros.
+\item SKILL macro split into GET\_SKILL and SET\_SKILL macros so that error checking can be done
+\item Enhanced documentation -- a help entry now exists for every command
+\item Linux compatibility, and further steps to SVR4 compatibility which will make it into Circle eventually.  (Note: you must make a change in one line of the Makefile for Linux compatibility.)
+\item All functions now prototyped before use
+\end{itemize}
+
+Jeremy Elson\newline
+August 31, 1993
+
+\section{Version 2.01 - July 20, 1993}
+Version 2.01 is basically the same as 2.00; most of the changes are for making the MUD more portable, based on mail I've received after the release of version 2.00.
+\begin{itemize}
+\item Problems with OPEN\_MAX and SEEK\_x resolved
+\item Some problems with the Makefile fixed
+\item Compiles much more cleanly with the -Wall option
+\item A couple of minor bugs fixed
+\item A few small fixes to the documentation
+\end{itemize}
+July 20, 1993
+
+\section{Version 2.00 - July 16, 1993}
+CircleMUD was developed and tested under Ultrix 4.0; your mileage may vary. If I have time, I'll try and port it to other machines.  If you port it and want to share your work with others, feel free to drop me a line.
+\par
+The CircleMUD `press release' is included below, in case you haven't seen it and want to.
+\par
+Good Luck!
+\par
+Jeremy Elson aka Rasmussen (Ras)\newline
+July 16, 1993
+
+\begin{verbatim}
+Wake the kids and find the dog, because it's the FTP release of
+
+
+                    C  I  R  C  L  E  M  U  D     2  .  0
+
+
+That's right -- CircleMUD 2.0 is done and is now available for anonymous FTP
+at ftp.cs.jhu.edu!
+
+CircleMUD is highly developed from the programming side, but highly UNdeveloped
+on the game-playing side.  So, if you're looking for a huge MUD with billions
+of spells, skills, classes, races, and areas, Circle will probably disappoint
+you severely.  Circle still has only the 4 original Diku classes, the original
+spells, the original skills, and about a dozen areas.
+
+On the other hand, if you're looking for a highly stable, well-developed,
+well-organized "blank slate" MUD on which you can put your OWN ideas for
+spells, skills, classes, and areas, then Circle might be just what you're
+looking for.
+
+Just take a gander at some of Circle's nifty features:
+
+        -- In-memory mobile and object prototypes and string sharing for
+           decreased memory usage and blazingly fast zone resets
+
+        -- All large realloc()s have been removed and replaced by boot-time
+           record counting and a single malloc() for superior memory efficiency
+
+        -- Split world/obj/mob/zon/shp files for easy addition of areas; plus,
+           all the world files are still in the original Diku format for
+           compatibility with existing areas
+
+        -- Boot-time and run-time error checking of most data files with
+           diagnostic messages a lot more helpful than "segmentation fault"!
+
+        -- Player mail system and bank
+
+        -- Rewritten board system: boards are now stable, robust, more
+           intelligent, and easily expandable -- adding a new board is
+           as easy as adding another line to an array
+
+        -- ANSI color codes with a fully documented programmers' interface
+
+        -- On-line system logs
+
+        -- Optional automatically regenerating wizlist -- a final end
+           to new immortals constantly asking you when they'll be added
+           to the immlist!
+
+        -- "config.c" file allows you to change aspects of the game such
+           as playerkilling/playerthieving legality, max number of objects
+           rentable, and nameserver usage -- WITHOUT recompiling the
+           entire MUD!
+
+        -- All text (help, mortal/immort MOTDs, etc.) is rebootable at
+           run-time with the "reboot" command
+
+        -- All players are given a unique serial number -- no more messy,
+           time consuming str_cmp()s when you're trying to identify people!
+
+        -- Fully integrated and robust rent/crash system -- allows normal
+           renting, cryo-renting, crash protection, and forced rent
+           (at an increased price) after an hour of idling
+
+        -- All the standard wizard stuff you're used to: level-sensitive
+           invisibility, settable poofin/poofouts, wizline
+
+        -- Advanced 'set' command which allows you to set dozens of aspects
+           of players -- even if they aren't logged in!  "Stat" also allows
+           you to stat people who aren't logged in!
+
+        -- Intelligent 'autorun' script handles different types of reboots,
+           organizing your system logs, and more!
+
+        -- Circle comes with more than a dozen utilities, all fully
+           documented, to make maintenance a snap!
+
+        -- And much, much more!
+
+Unfortunately, the original Circle had more than its fair share of Bad People
+when it was alive, but it DID lead to an impressive list of security and
+"asshole control" features:
+
+        -- 3 types of sitebanning available: 'all' to refuse all connections,
+           'new' to refuse new players, or 'select' to refuse new players and
+           all registered players who don't have a SITEOK flag.
+
+        -- 'wizlock' allows you to close the game to all new players or all
+           players below a certain level.
+
+        -- Handy 'mute' command squelches a player off of all public
+           communication channels
+
+        -- Handy 'freeze' command freezes a player in his tracks: the MUD
+           totally ignores all commands from that player until he's thawed.
+
+        -- Even handier DELETE flag allows you to delete players on the fly.
+
+        -- 'set' command (mentioned above) allows you to freeze/unfreeze/
+           delete/siteok/un-siteok players -- even if they aren't logged in!
+
+        -- Bad password attempts are written to the system log and saved;
+           if someone tries to hack your account, you see "4 LOGIN FAILURES
+           SINCE LAST SUCCESSFUL LOGIN" next time you log on.
+
+        -- Passwords don't echo to the screen; allows 3 bad PW attempts
+           before disconnecting you.  
+
+        -- Players aren't allowed to choose their character's name as their
+           password -- you'd be surprised how many do!
+
+        -- "xnames" text file specifies a list of invalid name substrings
+           to prevent creation of characters with overly profane names.
+
+Listen to all the rave reviews of CircleMUD 2.0!
+
+        "How long ago was that deadline you set for yourself?" -- My Friend
+
+        "NO ONE should be denied the power of computation." -- My Professor
+
+        "Multi-user WHAT?" -- My Mom
+
+Give it a try -- what do you have to lose other than your GPA/job, friends,
+and life?
+
+---------------------------------------------------------------------------
+
+Circle's complete source code and areas are available now for anonymous FTP
+at ftp.cs.jhu.edu (128.220.13.50) in the directory pub/CircleMUD.
+
+I welcome comments and constructive criticism about CircleMUD and would be
+happy to discuss any design decisions I've made, but I'm not particularly
+receptive to lunatics frothing at the mouth and thus will probably ignore
+you if you flame me.
+
+Also, remember the odds here: one person (me) against 29,000 lines of
+code (Circle), so there are bound to be some mistakes in there somewhere.
+
+Good luck, and happy Mudding,
+
+  Jeremy Elson aka Ras
+
+\end{verbatim}
+
+\end{document}
+\end
Index: doc/sources/socials.tex
===================================================================
RCS file: socials.tex
diff -N socials.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsMq4rkd	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,71 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 4/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{CircleMUD Socials}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document is a description of how to create new `social' commands in CircleMUD. C programming experience generally not required at all for creating new CircleMUD socials.  The intended audience for this document is all CircleMUD administrators.  This document ties together closely with the document on the \texttt{act()} function.
+\end{abstract}
+
+\section{Introduction}
+A general system exists to handle the `social' commands -- those which generally have no game-related purpose other than to convey emotions between players.   Socials are also useful for creating advanced DikuMud adventures and quests through the use of speical procedures; for example, you could add a `detonate' social which, within your quest, is handled by a special procedure to cause something to explode.
+\par
+Socials are all handled through the generalized command \texttt{do\_action}.  The
+text file \texttt{lib/text/socials} contains information on the game's socials. New socials can be added by 1) adding the name and level of the social to the master command list in \texttt{interpreter.c} (giving \texttt{do\_action} as the function pointer), and 2) adding information for the new social to the \texttt{lib/text/socials} file.
+
+\section{File Format}
+In Circle 3.0, socials in the file are specified by name (instead of by command number, as was true of the original DikuMud and versions of CircleMUD before 3.0.).  In the standard CircleMUD distribution, the socials appear in alphabetical order in the file, but they can appear in any order and can be rearranged if necessary.
+\par
+The file is formatted as follows:
+\begin{verbatim}
+<command name> <hide-flag> <minimum position of victim>
+<messg to character if no argument>
+<messg to others if no argument>
+<messg to char if victim found>           <---If this field is empty,
+<messg to others if victim found>          <- 
+<messg to victim>                            | then these fields must be
+<messg to char if victim not found>          | skipped, and the action will
+<messg to char if vict is char>              | ignore arguments.
+<messg to others if vict is char>          <-
+
+<command name> <hide-flag> <minimum position of victim>
+.
+.
+$~
+\end{verbatim}
+Each social must contain either 1) only the first two messages (if the social ignores arguments), or 2) all eight messages (if the social takes an argument). Each message must be contained in one line.
+\par
+The command-name indicates which social is being specified.  The hide-flag can be either 0 or 1; if 1, the social is hidden from OTHERS if they cannot see the character performing the social.  The action is not hidden from the VICTIM, even if s/he cannot see the character performing the social, although in such cases the character's name will, of course, be replaced with ``\texttt{someone}''.
+\par
+Where it makes sense to do so, text fields may be left empty. This is done by putting a `\#' in the first column on the line.  Doing so is legal in the following fields:
+\begin{itemize}
+\item a: messg to others if no arg
+\item b: messg to others if victim found
+\item c: messg to others if vict is char
+\end{itemize}
+
+Note again that if the field {\it messg to char if victim found} is empty, then the following fields must be omitted entirely (not even the `\~{}'), and the action will ignore any arguments supplied.
+\par
+The procedure sends the text strings through \texttt{act()}, and they may contain control codes (see the documentation for the \texttt{act()} function for details.) Note that not all of \texttt{act()}'s control codes may be used; for example, codes which refer to objects such as \texttt{\$p}.
+\par
+For the sake of efficiency, no tests or sanity checks are made on the consistency or logic of the \texttt{act()} codes found in the social messages. Hence, grave disorder may result if, say, the code `\texttt{\$N}' occurs in a text field that does not refer to a victim; like {\it messg to others if no arg}.
+In previous versions of Circle, such grave disorder often manifested itself in the form of crashes.  However, the \texttt{act()} function itself in CircleMUD 3.0 and above does sanity checks to make sure it is not dereferencing null pointers, hopefully with the result of avoiding crashes.  Nevertheless, great care should be taken in making sure that the \$ codes of socials are used consistently and correctly.
+\par
+More information can be found in the documentation on the \texttt{act()} function.
+
+\end{document}
+\end
Index: doc/sources/utils.tex
===================================================================
RCS file: utils.tex
diff -N utils.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsEjdDGe	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,157 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+\usepackage{times}
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{0pt}
+
+\title{CircleMUD Utility Programs}
+\author{Alex Fletcher}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+This document gives a brief summary of the various utility programs that come with the CircleMUD distribution.  The summaries include the description of the utility, how it is called, and any caveats to watch out for when using them.
+\end{abstract}
+
+\tableofcontents
+
+\section{Conversion Utilities}
+These utilities are generally one-time use utilities.  Some are for converting older CircleMUD data files to the versions used in CircleMUD 3.0, while others are used to convert currently existing files into different formats.
+\par
+Overall, these utilities have been created in an attempt to make the CircleMUD administrator's life a bit easier, and to give the administrator some ideas of further and more grandiose utilities to create.
+\par
+Please note that these utilities are not as rigorously tested as the rest of the CircleMUD server, and you should be certain to backup your data before using these utilities on it.  Also note that the code layout and design for these utilities is not as tight and as thought out as the rest of the source code distributed with CircleMUD.
+
+\subsection{play2to3}
+This utility is designed to convert player files from CircleMUD v2.20 to player files that will run under CircleMUD 3.0.  This utility is designed to be run once, at which point the player file will be one that the CircleMUD 3.0 server will understand.  It will not remove or overwrite the old player file when it runs.
+\par
+The code is not terribly attractive, but should also serve as a good base for converting your binary player files if you make any changes to the player file structure.
+\par
+The command line syntax for \texttt{play2to3} is as follows:
+\begin{verbatim}
+   play2to3 <old plrfile> <new plrfile>
+\end{verbatim}
+where \texttt{$<$old plrfile$>$} is the CircleMUD 2.20 player file, and \texttt{$<$new plrfile$>$} is the name of the new CircleMUD 3.0 player file.
+
+\subsection{shopconv}
+As discussed in the CircleMUD Building Guide, the format of shops changed between CircleMUD 2.20 and CircleMUD 3.0.  To make the transition easier, Jeff Fink submitted a shop conversion utility, \texttt{shopconv}.  Similar to the player file converter, this should only be run against any file once.  It is best to run this immediately before the initial v2.2 to v3.0 changeover.
+\par
+The command line syntax for \texttt{shopconv} is as follows:
+\begin{verbatim}
+   shopconv <file1> [<file2> .. <filen>]
+\end{verbatim}
+where \texttt{$<$file1$>$} is the first file to convert, \texttt{$<$file2$>$} the second, and so forth.
+
+\subsection{split}
+The split utility is designed to split large world files into smaller, zone-sized files that are easier to manage and maintain.  The utility reads its input from the standard input and writes the output to files with names specified within the larger world file.  This is done by inserting `\texttt{={\it filename}}' into the world file at the appropriate points, where {\it filename} is the name of the file for the following section.
+\par
+The command line syntax for \texttt{split} is as follows:
+\begin{verbatim}
+   split < [filename]
+\end{verbatim}
+where \texttt{[filename]} is the file to redirect into the utility.  The syntax above indicates how to do this on platforms that support command line redirection.
+
+\subsection{wld2html}
+This utility began its life as a small toy written by Jeremy Elson to put a CircleMUD world file on the world wide web.  It converts the world file into a series of HTML files, one per room, all named according to the virtual number of the room, and linked via their exits.
+\par 
+An example of its use on Midgaard can be found online
+\url{http://www.circlemud.org/~jelson/dikutest/>}.
+\par
+The command line syntax for \texttt{wld2html} is as follows:
+\begin{verbatim}
+   wld2html <wldfile>
+\end{verbatim}
+where \texttt{$<$wldfile$>$} is the world file to be turned into web pages.
+
+\section{Maintenance Utilities}
+\subsection{mudpasswd}
+The \texttt{mudpasswd} utility allows you to change the password of any player from the shell prompt.  It does not require any verification beyond the initial login to the shell account.
+\par
+The command line syntax for \texttt{mudpasswd} is as follows:
+\begin{verbatim}
+   mudpasswd <plrfile> <charname> <newpwd>
+\end{verbatim}
+where \texttt{$<$plrfile$>$} is your player file, \texttt{$<$charname$>$} is the name of the character to change the password for, and \texttt{$<$newpwd$>$} is the new password for the character.
+\par
+This utility must be recompiled if you make any changes to the player file structure.
+
+\subsection{purgeplay}
+This utility is used to purge {\em useless} players from the game's player file.  It is best to run this utility fairly regularly, but it should only be run when the CircleMUD server is not running.  It will delete all players that have had the \texttt{DELETED} flag set, except for those that also have the \texttt{NODELETE} flag set.
+\par
+The \texttt{purgeplay} utility will also remove idle players from the player file.  For example, any character with an invalid name, of level 0 (or less) or, of a level greater than \texttt{LVL\_IMPL} will be immediately marked for removal.  Level 1 characters that have not played for 4 days will be removed, as will characters of levels 2-4 that have not played for 7 days, levels 5-10 that have not played for 30 days, levels 11-30 that have not played for 60 days, and immortals that have not played for 90 days.
+\par
+The command line syntax for \texttt{purgeplay} is as follows:
+\begin{verbatim}
+   purgeplay <plrfile>
+\end{verbatim}
+where \texttt{$<$plrfile$>$} is your player file.
+\par
+This utility must be recompiled if you make any changes to the player file structure.
+
+\subsection{sign}
+This utility allows you to display some static text on a port when anyone connects to it.  This is useful when the mud server is moving, changing ports, or is down for maintenance.
+\par
+The command line syntax for \texttt{sign} is as follows:
+\begin{verbatim}
+   sign <port> <filename | - (for stdin)>
+\end{verbatim}
+where \texttt{$<$port$>$} is the tcp port to put the information on.  This is usually the same as the mud server port (when the server is not running), which defaults to 4000.  The \texttt{$<$filename$>$} is an ASCII file to display on the port when a connection is made to it.  If \texttt{-} is specified as a filename, the utility will wait for you to enter the text to be displayed and will take in all text until ended by an EOF marker (\texttt{ctrl}-D on Unix based systems).
+
+\section{Informational Utilities}
+\subsection{listrent}
+This utility allows you to view player rent files offline.  It displays the type of rent; {\em Rent}, {\em Crash}, {\em Cryo}, or lost link ({\em TimedOut}).  It also displays the object vnum and first keyword.
+\par
+The command line syntax for \texttt{listrent} is as follows:
+\begin{verbatim}
+   listrent <objfile1> [<objfile2> .. <objfilen>]
+\end{verbatim}
+where \texttt{$<$objfile1$>$} is the first object file to view, \texttt{$<$objfile2$>$} the second, and so forth.
+\par
+This utility must be recompiled if you make any changes to the rent file structure.
+
+
+\subsection{showplay}
+This utility is used to list the contents of the game's player file.  It gives a brief summary of the characters contained therein including their idnumber, sex, level, class, name, gold, and banked gold.
+\par
+The command line syntax for \texttt{showplay} is as follows:
+\begin{verbatim}
+   showplay <plrfile>
+\end{verbatim}
+where \texttt{$<$plrfile$>$} is the player file to summarize.
+\par
+This utility must be recompiled if you make any changes to the player file structure.
+
+\section{Internal Utilities}
+\subsection{autowiz}
+This utility is called from within the CircleMUD server and manages the self-updating Wizlist and Immlist.  At this point, it only works on Unix-based systems, but a solution for all other systems is being designed.  If you wish to change the text in the headers of the Wizlist or the Immlist, this is the utility to edit.
+\par
+The command line syntax for \texttt{autowiz} is as follows:
+\begin{verbatim}
+   autowiz <wizlev> <wizlistfile> <immlev> <immlistfile> [pid to signal]
+\end{verbatim}
+where \texttt{$<$wizlev$>$} is equal to whatever \texttt{LVL\_GOD} is set to in your CircleMUD server, \texttt{$<$wizlistfile$>$} is the filename for the file containing the game's Wizlist.  \texttt{$<$immlev$>$} should be set to your game's \texttt{LVL\_IMMORT}, while \texttt{$<$immlistfile$>$} is the name of the Immlist file.
+\par
+This utility must be recompiled if you make any changes to the player file structure.
+
+\subsection{delobjs}
+This utility is to be used in conjunction with the \texttt{purgeplay} utility.  It cleans out the rent files for players who no longer exist in the player file.  As with \texttt{purgeplay}, this should never be run when the CircleMUD server is running.  It is best not to run the \texttt{delobjs} utility on its own, and there is a script in the \texttt{lib/plrobjs/} directory called \texttt{purgeobjs} that should be used in its place.  This script will walk through each rent directory and check each and every file to ensure that all of the characters exist.
+\par
+The command line syntax for \texttt{delobjs} is as follows:
+\begin{verbatim}
+   delobjs <plrfile> <objfile1> [<objfile2> .. <objfilen>]
+\end{verbatim}
+where \texttt{$<$plrfile$>$} is the player file to search for non-existant players in, \texttt{$<$objfile1$>$} is the first rent file to check, \texttt{$<$objfile2$>$} is the second rent file to check, and so forth.
+\par
+This utility must be recompiled if you make any changes to the player file or rent file structure.
+
+
+\end{document}
+\end
Index: doc/sources/wizhelp.tex
===================================================================
RCS file: wizhelp.tex
diff -N wizhelp.tex
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsMWjd1h	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,491 @@
+\documentclass[11pt]{article}
+\usepackage{url}
+% Document typeset from the original document that was typeset by Jeremy Elson.
+% This document typeset by Alex Fletcher <furry@circlemud.org> on Dec 9/2001
+
+\addtolength{\topmargin}{-.5in}       % repairing LaTeX's huge  margins...
+\addtolength{\textheight}{1in}        % more margin hacking
+\addtolength{\textwidth}{1in}         % and here...
+\addtolength{\oddsidemargin}{-0.5in}
+\addtolength{\evensidemargin}{-0.5in}
+\setlength{\parskip}{\baselineskip}
+\setlength{\parindent}{20pt}
+
+\title{CircleMUD Wizard Commands}
+\author{Jeremy Elson}
+\begin{document}
+
+\maketitle
+
+\begin{abstract}
+Help text for all priveldged CircleMUD commands.  File is in help text format so that it can be pasted into the \texttt{lib/text/help\_text} if online help is desired.\newline
+Intended Audience: CircleMUD immortals, Gods, and player administrators.
+\end{abstract}
+
+\begin{verbatim}
+ADVANCE
+
+advance <victim> <level>
+
+ADVANCE moves a player to a new level.  If used to promote a player to an
+immortal level, and if you have the autowiz program installed, the wizlist and
+immlist will automatically be recreated.
+
+> advance rasmussen 34
+#
+WIZAT
+
+AT can be used to perform an action in a location other than where you are
+standing.  The first argument can be a virtual room number or the name of a
+character or object.  The remainder of the line is passed to the command
+interpreter.
+
+> at 3001 look
+> at fido kill fido
+> at 3.corpse get all corpse
+
+See also: GOTO
+#
+BAN UNBAN
+These commands prevent anyone from a site with a hostname containing the
+site substring from logging in to the game. You may ban a site to ALL, NEW
+or SELECT players.  Banning a site to NEW players prevents any new players
+from registering.  Banning a site to ALL players disallows ANY connections
+from that site.  Banning a site SELECTively allows only players with site-ok
+flags to log in from that site. Ban with no argument returns a list of
+currently banned sites.
+
+Unban removes the ban.
+
+ban [<'ALL' | 'NEW' | 'SELECT'> <site>]
+unban <site>
+
+> ban new ai.mit.edu
+> unban ai.mit.edu
+#
+DATE
+
+Shows the current real time.
+#
+DC
+
+dc <descriptor number>
+
+DC (DisConnect) is used to disconnect a socket.  If used on a playing socket,
+the player will lose his/her link, but, unlike PURGE, will not extract the
+player or dump the player's inventory on the ground.
+
+DC is also useful for disconnecting people who have accidentally left
+themselves at the main menu, or connections sitting in the "Get name" state.
+
+See also: USERS
+#
+ECHO GECHO SEND
+
+echo <message>
+gecho <message>
+send <victim> <message>
+
+ECHO displays a string to everyone in your room.  GECHO displays the string
+to everyone in the game.  SEND displays the string to a particular person.
+
+> echo Hi, everyone in the room.
+> gecho Hi, everyone in the game, isn't this annoying?
+> send rasmussen You are being watched.
+#
+FORCE
+
+FORCE forces a character, either monster or player, to perform a certain
+action.  FORCE ALL forces everyone in the game; FORCE ROOM forces everyone in
+your room.
+
+> force fido drop meat
+> force all save
+> force room look fido
+#
+FREEZE THAW
+
+FREEZE, originally invented here at CircleMUD (we think), is used to prevent
+a player from playing.  If frozen, the game will ignore all commands entered
+by the player, including QUIT, until the player is unfrozen with THAW.
+
+Obviously, this command should only be used in extreme disciplinary
+circumstances.
+
+See also: SET FROZEN
+#
+GOTO TRANS WIZTELEPORT
+
+goto <location>
+trans <victim>
+teleport <victim> <location>
+
+These commands are used to transports yourself and others to different rooms.
+GOTO allows you to go to other rooms; TRANS transports a person from wherever
+they are to the room YOU are in; TELEPORT transports your victim to some other
+location.
+
+For both GOTO and TELEPORT, the location specifier can be either a virtual
+room number, or the name of a character or object.
+
+> goto 3001
+> goto rasmussen
+> trans fido
+> teleport fido 3001
+> teleport fido 2.fido
+
+See also: WIZAT, SET ROOM, POOFIN
+#
+HANDBOOK
+
+Guidelines for having an Immortal character -- you should read it.
+#
+HOLYLIGHT
+
+A toggle which allows you to see:
+   Invisible people and objects, even if you don't have 'detect invisibility'
+   Hidden people, even if you don't have 'sense life'
+   Dark rooms, even if you don't have a light
+
+It is expected most immortals will keep HOLYLIGHT on most of the time;
+it exists so that you have the ability to see what mortals see for
+debugging purposes.
+#
+INVIS
+
+invis [level]
+
+INVIS sets your invisibility level.  With no argument, invis toggles between
+making you fully visible and fully invisible.  If you specify a level, only
+people at and above the level you specify will be able to see you.
+
+> invis
+> invis 31
+#
+LAST
+
+last <player_name>
+
+For checking the last time a person logged on, their sitename, and their
+ID number.
+
+> last rasmussen
+#
+LOAD
+
+load <mob|obj> <virtual number>
+
+LOAD is used to create mobiles and objects.  The first argument specifies if
+you are trying to load a mobile or an object; the second is the virtual
+number.
+
+> load obj 3099
+> load char 3005
+
+See also: VNUM
+#
+MUTE
+
+MUTE is used to shut a player up; if a player is muted, he/she will not be
+able to use most communication channels until he/she is unmuted.
+
+> mute MrNoisy
+#
+NOHASSLE
+
+Toggles a flag to prevent aggressive monsters from attacking.
+#
+NOTITLE
+
+NOTITLE is used to prevent players from being able to set their own titles;
+i.e., if the player consistently has an offensive title.  The definition of
+offensive is left as an exercise for the reader.
+#
+NOWIZ
+
+Allows you to hear or ignore messages coming over the wizline.
+
+See also: WIZNET
+#
+PAGE
+
+page <player|'all'> <message>
+
+PAGE is used to send a message, along with a beep, to another player.  Use
+PAGE ALL to send a message and a beep to everyone in the game.
+
+> page rasmussen Hey, are you still at the keyboard?
+> page all GAME WILL BE SHUTTING DOWN IN 10 MINUTES
+
+Do not abuse this command.
+#
+PARDON
+
+Removes killer and thief flags from a player.
+#
+POOFIN POOFOUT
+
+Sets the message seen by players when you use GOTO to move to a different
+room.  POOFIN with no argument resets your poofin to the default "appears with
+an ear-splitting bang"; POOFOUT with no argument defaults to "disappears in
+a puff of smoke."
+
+See also: GOTO
+#
+PURGE
+
+purge [name]
+
+Purge destroys things.  If used with no arguments, it will clear a room of all
+mobiles and objects, but will not harm players.  If the argument is an object,
+that object (and all of its contents, if any) will be destroyed.  If the
+argument is a mobile, the mobile will be destroyed, leaving its inventory and
+equipment lying on the ground.
+
+If the argument is the name of a player, the player's inventory and equipment
+will drop on the ground and the player will lose his/her connection.  For this
+reason, PURGE should only be used on players in disciplinary situations.
+
+> purge
+> purge <character>
+> purge <object>
+
+See also: DC
+#
+REBOOT
+
+reboot <'*'|file>
+
+REBOOT is used to load text files such as the MOTD from disk into memory. 
+REBOOT * reads all text files.  Valid files are:
+#
+REROLL
+
+reroll <player>
+
+REROLL gives a player new stats (i.e., str, int, wis, dex, and con.)
+#
+RESTORE
+
+RESTORE restores a player or mobile to full hit, mana, and move points.  If
+used on immortals, it sets all skill levels to 100%.
+#
+RETURN
+
+RETURN returns you to your regular body if you are switched.
+
+See also: SWITCH
+#
+ROOMFLAGS
+
+Toggles a flag which causes the virtual room number and room flags, if any,
+to be displayed next to room names.
+#
+SET
+
+set [file|player] <character> <field> <value>
+
+SET is an extremely powerful command, capable of setting dozens of aspects of
+characters, both players and mobiles.
+
+SET PLAYER forces set to look for a player and not a mobile; useful for
+players with lame names such as 'guard'.
+
+SET FILE lets you change players who are not logged on.  If you use SET FILE
+on a player who IS logged on, your change will be lost.  If you wish to set
+a player who is in the game but is linkless, use set twice -- once with the
+FILE argument, and once without -- to make sure that the change takes.
+
+For toggled fields, the value must be ON, OFF, YES, or NO.
+
+Look at do_set in act.wizard.c for a list of valid set fields.
+
+See also: STAT
+#
+SHOW
+
+show <mode> [argument]
+
+The SHOW command displays information.  Some modes of show require additional
+information, such as a player name.  Show without any arguments shows a list
+of valid modes.
+
+#
+SHUTDOWN
+
+shutdown [reboot|die|pause]
+
+SHUTDOWN shuts the MUD down.  The SHUTDOWN command works in conjunction with
+CircleMUD's 'autorun' script.  If you are not using autorun, the arguments are
+meaningless.  If you are using autorun, the following arguments are available:
+
+REBOOT     Pause only 5 seconds instead of the normal 60 before trying to
+           restart the MUD.
+DIE        Kill the autorun script; the MUD will not reboot until autorun is
+           explicitly run again.
+PAUSE      Create a file called 'paused' in Circle's root directory; do not
+           try to restart the MUD until 'paused' is removed.
+#
+SLOWNS
+
+Toggles the namserver_is_slow setting.  See circle/src/config.c for
+more information.
+#
+SNOOP
+
+Snoop allows you to listen in on another player's session; everything the
+player sees or types will be displayed on your terminal preceeded by a '%'.
+
+Obviously, there are many ethical considerations to the use of this command; 
+snoop should be used minimally, and only for disciplinary purposes.
+
+Type snoop <your name> to stop snooping.
+#
+SNOWBALL
+
+Snowball is just a social -- it prints a funny message, and nothing more.
+#
+STAT
+
+STAT [player|object|mobile|file] <name>
+
+Gives information about players, monsters, and objects in the game.  The type
+argument is optional.
+
+STAT PLAYER will search only for players; useful for statting people with lame
+names such as Red or Cityguard.
+
+STAT OBJECT will search only for objects.
+
+STAT MOBILE will search only for monsters.
+
+STAT FILE is used to stat players who are not logged in; the information
+displayed comes from the playerfile.
+
+> stat fido
+> stat player red
+> stat mobile red
+> stat file rasmussen
+> stat object thunderbolt
+
+See also: VSTAT
+#
+SWITCH
+
+switch <monster>
+
+SWITCH is used to take over the body of mobiles; useful for interactive
+adventures.
+
+See also: RETURN
+#
+SYSLOG
+
+The SYSLOG command controls how detailed of an on-line system log you see.
+Messages surrounded by '[' and ']' are syslog messages and are in green
+if you have color on.
+
+The messages you receive are level dependent.
+
+syslog <off | brief | normal | complete>
+
+> syslog complete
+> syslog off
+
+See also: COLOR
+#
+UNAFFECT
+
+unaffect <victim>
+
+Removes all affections (i.e., spell effects) from a player.
+#
+UPTIME
+
+Displays when the game was booted and calculates how long ago that was.
+
+> uptime
+#
+USERS
+
+USERS gives a list of all sockets (i.e., connections) currently active on the
+MUD.  The multi-column display shows the socket number (used by DC), class,
+level, and name of the player connected, connection state, idle time, and
+hostname.
+
+The following switches are available:
+
+-k or -o   Show only outlaws (killers and thieves)
+-p         Show only sockets in the playing sockets
+-d         Show only non-playing (deadweight) sockets.
+-l min-max Show only sockets whose characters are from level min to max
+-n <name>  Show the socket with <name> associated with it.
+-h <host>  Show all sockets from <host>.
+-c list    Show only sockets whose characters' classes are in list
+
+See also: DC
+#
+VNUM
+
+vnum <mob|obj> <name>
+
+Gives a list of the virtual numbers of objects or mobiles which have the
+specified name.
+
+> vnum obj ring
+> vnum mob dragon
+#
+VSTAT
+
+vstat <mob|obj> <virtual number>
+
+Used to stat a prototypical mobile or object by virtual number.
+
+> vstat obj 3000
+> vstat mob 3001
+
+See also:  STAT  VNUM  LAOD
+#
+WIZHELP
+
+Gives a list of the special commands available at your level.
+#
+WIZLOCK
+
+wizlock [value]
+
+WIZLOCK allows you to restrict the game.  WIZLOCK 1 prevents new characters
+from being created.  WIZLOCK n, 2 <= n <= 34, prevents new characters and
+allows only characters level n and above to log on.  WIZLOCK with no argument
+displays the current WIZLOCK level.
+#
+WIZNET ;
+
+The immortal communication channel.
+
+wizsay [ '@' | '+' | '-' | '#' ] [<text>]
+
+>; <text>    - just sends text
+>; @         - shows all gods that are on and visible to you
+             - also shows if the gods who are visible to you are writing
+>; +         - allows you to hear the wizchannel
+>; -         - turns off the wizchannel
+
+This code was provided by Gnort.
+
+See also: NOWIZ
+#
+ZRESET
+
+zreset <zone | '*' | '.'>
+
+Used to force a zone to reset.  '*' forces all zones to reset.  '.' forces
+the zone you are in to reset.
+
+
+See also: SHOW ZONES
+#~
+\end{verbatim}
+
+\end{document}
+\end
Index: src/Makefile.in
===================================================================
RCS file: /home/circledb/.cvs/circle/src/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- src/Makefile.in	2001/05/08 18:35:49	1.15
+++ src/Makefile.in	2002/04/16 02:22:12	1.16
@@ -28,14 +28,16 @@ OBJFILES = act.comm.o act.informative.o 
 	boards.o castle.o class.o comm.o config.o constants.o db.o fight.o \
 	graph.o handler.o house.o interpreter.o limits.o magic.o mail.o \
 	mobact.o modify.o objsave.o olc.o random.o shop.o spec_assign.o \
-	spec_procs.o spell_parser.o spells.o utils.o weather.o
+	spec_procs.o spell_parser.o spells.o utils.o weather.o \
+	bsd-snprintf.o
 
 CXREF_FILES = act.comm.c act.informative.c act.item.c act.movement.c \
 	act.offensive.c act.other.c act.social.c act.wizard.c alias.c ban.c \
 	boards.c castle.c class.c comm.c config.c constants.c db.c fight.c \
 	graph.c handler.c house.c interpreter.c limits.c magic.c mail.c \
 	mobact.c modify.c objsave.c olc.c random.c shop.c spec_assign.c\
-	spec_procs.c spell_parser.c spells.c utils.c weather.c
+	spec_procs.c spell_parser.c spells.c utils.c weather.c \
+	bsd-snprintf.c
 
 default: all
 
@@ -200,3 +202,5 @@ utils.o: utils.c conf.h sysdep.h structs
 weather.o: weather.c conf.h sysdep.h structs.h utils.h comm.h handler.h \
   interpreter.h db.h
 	$(CC) -c $(CFLAGS) weather.c
+bsd-snprintf.o: bsd-snprintf.c conf.h sysdep.h
+	$(CC) -c $(CFLAGS) bsd-snprintf.c
Index: src/Makefile.lcc
===================================================================
RCS file: /home/circledb/.cvs/circle/src/Makefile.lcc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- src/Makefile.lcc	2001/08/29 15:40:04	1.8
+++ src/Makefile.lcc	2002/01/16 03:11:13	1.9
@@ -12,7 +12,7 @@
 #  thus less clutter on the screen during the make
 
 LCCDIR=c:\lccpub
-DISTDIR=c:\circle30bpl20
+DISTDIR=c:\circle30bpl21
 CFLAGS=-c -I$(LCCDIR)\include -DLCC_WIN32
 CC=lcc
 OBJS=\
Index: src/act.comm.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.comm.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- src/act.comm.c	2001/10/02 00:20:02	1.22
+++ src/act.comm.c	2002/01/28 07:03:44	1.23
@@ -43,17 +43,18 @@ ACMD(do_say)
   skip_spaces(&argument);
 
   if (!*argument)
-    send_to_char("Yes, but WHAT do you want to say?\r\n", ch);
+    send_to_char(ch, "Yes, but WHAT do you want to say?\r\n");
   else {
-    sprintf(buf, "$n says, '%s'", argument);
+    char buf[MAX_INPUT_LENGTH + 12];
+
+    snprintf(buf, sizeof(buf), "$n says, '%s'", argument);
     act(buf, FALSE, ch, 0, 0, TO_ROOM);
 
     if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
+      send_to_char(ch, "%s", OK);
     else {
       delete_doubledollar(argument);
-      sprintf(buf, "You say, '%s'\r\n", argument);
-      send_to_char(buf, ch);
+      send_to_char(ch, "You say, '%s'\r\n", argument);
     }
   }
 }
@@ -67,18 +68,20 @@ ACMD(do_gsay)
   skip_spaces(&argument);
 
   if (!AFF_FLAGGED(ch, AFF_GROUP)) {
-    send_to_char("But you are not the member of a group!\r\n", ch);
+    send_to_char(ch, "But you are not the member of a group!\r\n");
     return;
   }
   if (!*argument)
-    send_to_char("Yes, but WHAT do you want to group-say?\r\n", ch);
+    send_to_char(ch, "Yes, but WHAT do you want to group-say?\r\n");
   else {
+    char buf[MAX_STRING_LENGTH];
+
     if (ch->master)
       k = ch->master;
     else
       k = ch;
 
-    sprintf(buf, "$n tells the group, '%s'", argument);
+    snprintf(buf, sizeof(buf), "$n tells the group, '%s'", argument);
 
     if (AFF_FLAGGED(k, AFF_GROUP) && (k != ch))
       act(buf, FALSE, ch, 0, k, TO_VICT | TO_SLEEP);
@@ -87,29 +90,29 @@ ACMD(do_gsay)
 	act(buf, FALSE, ch, 0, f->follower, TO_VICT | TO_SLEEP);
 
     if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
-    else {
-      sprintf(buf, "You tell the group, '%s'\r\n", argument);
-      send_to_char(buf, ch);
-    }
+      send_to_char(ch, "%s", OK);
+    else
+      send_to_char(ch, "You tell the group, '%s'\r\n", argument);
   }
 }
 
 
 void perform_tell(struct char_data *ch, struct char_data *vict, char *arg)
 {
-  send_to_char(CCRED(vict, C_NRM), vict);
-  sprintf(buf, "$n tells you, '%s'", arg);
+  char buf[MAX_STRING_LENGTH];
+
+  send_to_char(vict, "%s", CCRED(vict, C_NRM));
+  snprintf(buf, sizeof(buf), "$n tells you, '%s'", arg);
   act(buf, FALSE, ch, 0, vict, TO_VICT | TO_SLEEP);
-  send_to_char(CCNRM(vict, C_NRM), vict);
+  send_to_char(vict, "%s", CCNRM(vict, C_NRM));
 
   if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOREPEAT))
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
   else {
-    send_to_char(CCRED(ch, C_CMP), ch);
-    sprintf(buf, "You tell $N, '%s'", arg);
+    send_to_char(ch, "%s", CCRED(ch, C_CMP));
+    snprintf(buf, sizeof(buf), "You tell $N, '%s'", arg);
     act(buf, FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
-    send_to_char(CCNRM(ch, C_CMP), ch);
+    send_to_char(ch, "%s", CCNRM(ch, C_CMP));
   }
 
   if (!IS_NPC(vict) && !IS_NPC(ch))
@@ -119,11 +122,11 @@ void perform_tell(struct char_data *ch, 
 int is_tell_ok(struct char_data *ch, struct char_data *vict)
 {
   if (ch == vict)
-    send_to_char("You try to tell yourself something.\r\n", ch);
+    send_to_char(ch, "You try to tell yourself something.\r\n");
   else if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOTELL))
-    send_to_char("You can't tell other people while you have notell on.\r\n", ch);
+    send_to_char(ch, "You can't tell other people while you have notell on.\r\n");
   else if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_SOUNDPROOF))
-    send_to_char("The walls seem to absorb your words.\r\n", ch);
+    send_to_char(ch, "The walls seem to absorb your words.\r\n");
   else if (!IS_NPC(vict) && !vict->desc)        /* linkless */
     act("$E's linkless at the moment.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
   else if (PLR_FLAGGED(vict, PLR_WRITING))
@@ -143,15 +146,16 @@ int is_tell_ok(struct char_data *ch, str
 ACMD(do_tell)
 {
   struct char_data *vict = NULL;
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
 
   half_chop(argument, buf, buf2);
 
   if (!*buf || !*buf2)
-    send_to_char("Who do you wish to tell what??\r\n", ch);
+    send_to_char(ch, "Who do you wish to tell what??\r\n");
   else if (GET_LEVEL(ch) < LVL_IMMORT && !(vict = get_player_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
   else if (GET_LEVEL(ch) >= LVL_IMMORT && !(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
   else if (is_tell_ok(ch, vict))
     perform_tell(ch, vict, buf2);
 }
@@ -167,9 +171,9 @@ ACMD(do_reply)
   skip_spaces(&argument);
 
   if (GET_LAST_TELL(ch) == NOBODY)
-    send_to_char("You have no-one to reply to!\r\n", ch);
+    send_to_char(ch, "You have nobody to reply to!\r\n");
   else if (!*argument)
-    send_to_char("What is your reply?\r\n", ch);
+    send_to_char(ch, "What is your reply?\r\n");
   else {
     /*
      * Make sure the person you're replying to is still playing by searching
@@ -187,7 +191,7 @@ ACMD(do_reply)
       tch = tch->next;
 
     if (tch == NULL)
-      send_to_char("They are no longer playing.\r\n", ch);
+      send_to_char(ch, "They are no longer playing.\r\n");
     else if (is_tell_ok(ch, tch))
       perform_tell(ch, tch, argument);
   }
@@ -196,6 +200,7 @@ ACMD(do_reply)
 
 ACMD(do_spec_comm)
 {
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
   struct char_data *vict;
   const char *action_sing, *action_plur, *action_others;
 
@@ -221,31 +226,36 @@ ACMD(do_spec_comm)
 
   half_chop(argument, buf, buf2);
 
-  if (!*buf || !*buf2) {
-    sprintf(buf, "Whom do you want to %s.. and what??\r\n", action_sing);
-    send_to_char(buf, ch);
-  } else if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)))
-    send_to_char(NOPERSON, ch);
+  if (!*buf || !*buf2)
+    send_to_char(ch, "Whom do you want to %s.. and what??\r\n", action_sing);
+  else if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)))
+    send_to_char(ch, "%s", NOPERSON);
   else if (vict == ch)
-    send_to_char("You can't get your mouth close enough to your ear...\r\n", ch);
+    send_to_char(ch, "You can't get your mouth close enough to your ear...\r\n");
   else {
-    sprintf(buf, "$n %s you, '%s'", action_plur, buf2);
-    act(buf, FALSE, ch, 0, vict, TO_VICT);
+    char buf1[MAX_STRING_LENGTH];
+
+    snprintf(buf1, sizeof(buf1), "$n %s you, '%s'", action_plur, buf2);
+    act(buf1, FALSE, ch, 0, vict, TO_VICT);
+
     if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
-    else {
-      sprintf(buf, "You %s %s, '%s'\r\n", action_sing, GET_NAME(vict), buf2);
-      send_to_char(buf, ch);
-    }
+      send_to_char(ch, "%s", OK);
+    else
+      send_to_char(ch, "You %s %s, '%s'\r\n", action_sing, GET_NAME(vict), buf2);
     act(action_others, FALSE, ch, 0, vict, TO_NOTVICT);
   }
 }
 
 
+/*
+ * buf1, buf2 = MAX_OBJECT_NAME_LENGTH
+ *	(if it existed)
+ */
 ACMD(do_write)
 {
   struct obj_data *paper, *pen = NULL;
   char *papername, *penname;
+  char buf1[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH];
 
   papername = buf1;
   penname = buf2;
@@ -256,42 +266,37 @@ ACMD(do_write)
     return;
 
   if (!*papername) {		/* nothing was delivered */
-    send_to_char("Write?  With what?  ON what?  What are you trying to do?!?\r\n", ch);
+    send_to_char(ch, "Write?  With what?  ON what?  What are you trying to do?!?\r\n");
     return;
   }
   if (*penname) {		/* there were two arguments */
     if (!(paper = get_obj_in_list_vis(ch, papername, NULL, ch->carrying))) {
-      sprintf(buf, "You have no %s.\r\n", papername);
-      send_to_char(buf, ch);
+      send_to_char(ch, "You have no %s.\r\n", papername);
       return;
     }
     if (!(pen = get_obj_in_list_vis(ch, penname, NULL, ch->carrying))) {
-      sprintf(buf, "You have no %s.\r\n", penname);
-      send_to_char(buf, ch);
+      send_to_char(ch, "You have no %s.\r\n", penname);
       return;
     }
   } else {		/* there was one arg.. let's see what we can find */
     if (!(paper = get_obj_in_list_vis(ch, papername, NULL, ch->carrying))) {
-      sprintf(buf, "There is no %s in your inventory.\r\n", papername);
-      send_to_char(buf, ch);
+      send_to_char(ch, "There is no %s in your inventory.\r\n", papername);
       return;
     }
     if (GET_OBJ_TYPE(paper) == ITEM_PEN) {	/* oops, a pen.. */
       pen = paper;
       paper = NULL;
     } else if (GET_OBJ_TYPE(paper) != ITEM_NOTE) {
-      send_to_char("That thing has nothing to do with writing.\r\n", ch);
+      send_to_char(ch, "That thing has nothing to do with writing.\r\n");
       return;
     }
     /* One object was found.. now for the other one. */
     if (!GET_EQ(ch, WEAR_HOLD)) {
-      sprintf(buf, "You can't write with %s %s alone.\r\n", AN(papername),
-	      papername);
-      send_to_char(buf, ch);
+      send_to_char(ch, "You can't write with %s %s alone.\r\n", AN(papername), papername);
       return;
     }
     if (!CAN_SEE_OBJ(ch, GET_EQ(ch, WEAR_HOLD))) {
-      send_to_char("The stuff in your hand is invisible!  Yeech!!\r\n", ch);
+      send_to_char(ch, "The stuff in your hand is invisible!  Yeech!!\r\n");
       return;
     }
     if (pen)
@@ -307,10 +312,10 @@ ACMD(do_write)
   else if (GET_OBJ_TYPE(paper) != ITEM_NOTE)
     act("You can't write on $p.", FALSE, ch, paper, 0, TO_CHAR);
   else if (paper->action_description)
-    send_to_char("There's something written on it already.\r\n", ch);
+    send_to_char(ch, "There's something written on it already.\r\n");
   else {
     /* we can write - hooray! */
-    send_to_char("Write your note.  End with '@' on a new line.\r\n", ch);
+    send_to_char(ch, "Write your note.  End with '@' on a new line.\r\n");
     act("$n begins to jot down a note.", TRUE, ch, 0, 0, TO_ROOM);
     string_write(ch->desc, &paper->action_description, MAX_NOTE_LENGTH, 0, NULL);
   }
@@ -322,32 +327,35 @@ ACMD(do_page)
 {
   struct descriptor_data *d;
   struct char_data *vict;
+  char buf2[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
 
   half_chop(argument, arg, buf2);
 
   if (IS_NPC(ch))
-    send_to_char("Monsters can't page.. go away.\r\n", ch);
+    send_to_char(ch, "Monsters can't page.. go away.\r\n");
   else if (!*arg)
-    send_to_char("Whom do you wish to page?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to page?\r\n");
   else {
-    sprintf(buf, "\007\007*$n* %s", buf2);
+    char buf[MAX_STRING_LENGTH];
+
+    snprintf(buf, sizeof(buf), "\007\007*$n* %s", buf2);
     if (!str_cmp(arg, "all")) {
       if (GET_LEVEL(ch) > LVL_GOD) {
 	for (d = descriptor_list; d; d = d->next)
 	  if (STATE(d) == CON_PLAYING && d->character)
 	    act(buf, FALSE, ch, 0, d->character, TO_VICT);
       } else
-	send_to_char("You will never be godly enough to do that!\r\n", ch);
+	send_to_char(ch, "You will never be godly enough to do that!\r\n");
       return;
     }
     if ((vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)) != NULL) {
       act(buf, FALSE, ch, 0, vict, TO_VICT);
       if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-	send_to_char(OK, ch);
+	send_to_char(ch, "%s", OK);
       else
 	act(buf, FALSE, ch, 0, vict, TO_CHAR);
     } else
-      send_to_char("There is no such person in the game!\r\n", ch);
+      send_to_char(ch, "There is no such person in the game!\r\n");
   }
 }
 
@@ -360,6 +368,7 @@ ACMD(do_gen_comm)
 {
   struct descriptor_data *i;
   char color_on[24];
+  char buf1[MAX_INPUT_LENGTH];
 
   /* Array of flags which must _not_ be set in order for comm to be heard */
   int channels[] = {
@@ -409,23 +418,21 @@ ACMD(do_gen_comm)
     return;
 
   if (PLR_FLAGGED(ch, PLR_NOSHOUT)) {
-    send_to_char(com_msgs[subcmd][0], ch);
+    send_to_char(ch, "%s", com_msgs[subcmd][0]);
     return;
   }
   if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_SOUNDPROOF)) {
-    send_to_char("The walls seem to absorb your words.\r\n", ch);
+    send_to_char(ch, "The walls seem to absorb your words.\r\n");
     return;
   }
   /* level_can_shout defined in config.c */
   if (GET_LEVEL(ch) < level_can_shout) {
-    sprintf(buf1, "You must be at least level %d before you can %s.\r\n",
-	    level_can_shout, com_msgs[subcmd][1]);
-    send_to_char(buf1, ch);
+    send_to_char(ch, "You must be at least level %d before you can %s.\r\n", level_can_shout, com_msgs[subcmd][1]);
     return;
   }
   /* make sure the char is on the channel */
   if (PRF_FLAGGED(ch, channels[subcmd])) {
-    send_to_char(com_msgs[subcmd][2], ch);
+    send_to_char(ch, "%s", com_msgs[subcmd][2]);
     return;
   }
   /* skip leading spaces */
@@ -433,34 +440,26 @@ ACMD(do_gen_comm)
 
   /* make sure that there is something there to say! */
   if (!*argument) {
-    sprintf(buf1, "Yes, %s, fine, %s we must, but WHAT???\r\n",
-	    com_msgs[subcmd][1], com_msgs[subcmd][1]);
-    send_to_char(buf1, ch);
+    send_to_char(ch, "Yes, %s, fine, %s we must, but WHAT???\r\n", com_msgs[subcmd][1], com_msgs[subcmd][1]);
     return;
   }
   if (subcmd == SCMD_HOLLER) {
     if (GET_MOVE(ch) < holler_move_cost) {
-      send_to_char("You're too exhausted to holler.\r\n", ch);
+      send_to_char(ch, "You're too exhausted to holler.\r\n");
       return;
     } else
       GET_MOVE(ch) -= holler_move_cost;
   }
   /* set up the color on code */
-  strcpy(color_on, com_msgs[subcmd][3]);
+  strlcpy(color_on, com_msgs[subcmd][3], sizeof(color_on));
 
   /* first, set up strings to be given to the communicator */
   if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-    send_to_char(OK, ch);
-  else {
-    if (COLOR_LEV(ch) >= C_CMP)
-      sprintf(buf1, "%sYou %s, '%s'%s", color_on, com_msgs[subcmd][1],
-	      argument, KNRM);
-    else
-      sprintf(buf1, "You %s, '%s'", com_msgs[subcmd][1], argument);
-    act(buf1, FALSE, ch, 0, 0, TO_CHAR | TO_SLEEP);
-  }
+    send_to_char(ch, "%s", OK);
+  else
+    send_to_char(ch, "%sYou %s, '%s'%s", COLOR_LEV(ch) >= C_CMP ? color_on : "", com_msgs[subcmd][1], argument, CCNRM(ch, C_CMP));
 
-  sprintf(buf, "$n %ss, '%s'", com_msgs[subcmd][1], argument);
+  snprintf(buf1, sizeof(buf1), "$n %ss, '%s'", com_msgs[subcmd][1], argument);
 
   /* now send all the strings out */
   for (i = descriptor_list; i; i = i->next) {
@@ -475,10 +474,10 @@ ACMD(do_gen_comm)
 	continue;
 
       if (COLOR_LEV(i->character) >= C_NRM)
-	send_to_char(color_on, i->character);
-      act(buf, FALSE, ch, 0, i->character, TO_VICT | TO_SLEEP);
+	send_to_char(i->character, "%s", color_on);
+      act(buf1, FALSE, ch, 0, i->character, TO_VICT | TO_SLEEP);
       if (COLOR_LEV(i->character) >= C_NRM)
-	send_to_char(KNRM, i->character);
+	send_to_char(i->character, "%s", KNRM);
     }
   }
 }
@@ -486,38 +485,33 @@ ACMD(do_gen_comm)
 
 ACMD(do_qcomm)
 {
-  struct descriptor_data *i;
-
   if (!PRF_FLAGGED(ch, PRF_QUEST)) {
-    send_to_char("You aren't even part of the quest!\r\n", ch);
+    send_to_char(ch, "You aren't even part of the quest!\r\n");
     return;
   }
   skip_spaces(&argument);
 
-  if (!*argument) {
-    sprintf(buf, "%s?  Yes, fine, %s we must, but WHAT??\r\n", CMD_NAME,
-	    CMD_NAME);
-    CAP(buf);
-    send_to_char(buf, ch);
-  } else {
+  if (!*argument)
+    send_to_char(ch, "%c%s?  Yes, fine, %s we must, but WHAT??\r\n", UPPER(*CMD_NAME), CMD_NAME + 1, CMD_NAME);
+  else {
+    char buf[MAX_STRING_LENGTH];
+    struct descriptor_data *i;
+
     if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
-    else {
-      if (subcmd == SCMD_QSAY)
-	sprintf(buf, "You quest-say, '%s'", argument);
-      else
-	strcpy(buf, argument);
+      send_to_char(ch, "%s", OK);
+    else if (subcmd == SCMD_QSAY) {
+      snprintf(buf, sizeof(buf), "You quest-say, '%s'", argument);
       act(buf, FALSE, ch, 0, argument, TO_CHAR);
-    }
+    } else
+      act(argument, FALSE, ch, 0, argument, TO_CHAR);
 
     if (subcmd == SCMD_QSAY)
-      sprintf(buf, "$n quest-says, '%s'", argument);
+      snprintf(buf, sizeof(buf), "$n quest-says, '%s'", argument);
     else
-      strcpy(buf, argument);
+      strlcpy(buf, argument, sizeof(buf));
 
     for (i = descriptor_list; i; i = i->next)
-      if (STATE(i) == CON_PLAYING && i != ch->desc &&
-	  PRF_FLAGGED(i->character, PRF_QUEST))
+      if (STATE(i) == CON_PLAYING && i != ch->desc && PRF_FLAGGED(i->character, PRF_QUEST))
 	act(buf, 0, ch, 0, i->character, TO_VICT | TO_SLEEP);
   }
 }
Index: src/act.informative.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.informative.c,v
retrieving revision 1.48
retrieving revision 1.55
diff -u -p -r1.48 -r1.55
--- src/act.informative.c	2002/01/15 23:58:23	1.48
+++ src/act.informative.c	2002/04/09 14:52:43	1.55
@@ -41,7 +41,7 @@ extern char *class_abbrevs[];
 /* extern functions */
 ACMD(do_action);
 ACMD(do_insult);
-long find_class_bitvector(char arg);
+bitvector_t find_class_bitvector(const char *arg);
 int level_exp(int chclass, int level);
 char *title_male(int chclass, int level);
 char *title_female(int chclass, int level);
@@ -105,11 +105,11 @@ void show_obj_to_char(struct obj_data *o
 
   switch (mode) {
   case SHOW_OBJ_LONG:
-    send_to_char(obj->description, ch);
+    send_to_char(ch, "%s", obj->description);
     break;
 
   case SHOW_OBJ_SHORT:
-    send_to_char(obj->short_description, ch);
+    send_to_char(ch, "%s", obj->short_description);
     break;
 
   case SHOW_OBJ_ACTION:
@@ -117,18 +117,19 @@ void show_obj_to_char(struct obj_data *o
     case ITEM_NOTE:
       if (obj->action_description) {
         char notebuf[MAX_NOTE_LENGTH + 64];
-        sprintf(notebuf, "There is something written on it:\r\n\r\n%.*s", MAX_NOTE_LENGTH, obj->action_description);
+
+        snprintf(notebuf, sizeof(notebuf), "There is something written on it:\r\n\r\n%s", obj->action_description);
         page_string(ch->desc, notebuf, TRUE);
       } else
-        send_to_char("It's blank.\r\n", ch);
+	send_to_char(ch, "It's blank.\r\n");
       return;
 
     case ITEM_DRINKCON:
-      send_to_char("It looks like a drink container.", ch);
+      send_to_char(ch, "It looks like a drink container.");
       break;
 
     default:
-      send_to_char("You see nothing special..", ch);
+      send_to_char(ch, "You see nothing special..");
       break;
     }
     break;
@@ -139,26 +140,26 @@ void show_obj_to_char(struct obj_data *o
   }
 
   show_obj_modifiers(obj, ch);
-  send_to_char("\r\n", ch);
+  send_to_char(ch, "\r\n");
 }
 
 
 void show_obj_modifiers(struct obj_data *obj, struct char_data *ch)
 {
   if (OBJ_FLAGGED(obj, ITEM_INVISIBLE))
-    send_to_char(" (invisible)", ch);
+    send_to_char(ch, " (invisible)");
 
   if (OBJ_FLAGGED(obj, ITEM_BLESS) && AFF_FLAGGED(ch, AFF_DETECT_ALIGN))
-    send_to_char(" ..It glows blue!", ch);
+    send_to_char(ch, " ..It glows blue!");
 
   if (OBJ_FLAGGED(obj, ITEM_MAGIC) && AFF_FLAGGED(ch, AFF_DETECT_MAGIC))
-    send_to_char(" ..It glows yellow!", ch);
+    send_to_char(ch, " ..It glows yellow!");
 
   if (OBJ_FLAGGED(obj, ITEM_GLOW))
-    send_to_char(" ..It has a soft glowing aura!", ch);
+    send_to_char(ch, " ..It has a soft glowing aura!");
 
   if (OBJ_FLAGGED(obj, ITEM_HUM))
-    send_to_char(" ..It emits a faint humming sound!", ch);
+    send_to_char(ch, " ..It emits a faint humming sound!");
 }
 
 
@@ -174,40 +175,38 @@ void list_obj_to_char(struct obj_data *l
     }
   }
   if (!found && show)
-    send_to_char(" Nothing.\r\n", ch);
+    send_to_char(ch, " Nothing.\r\n");
 }
 
 
 void diag_char_to_char(struct char_data *i, struct char_data *ch)
 {
-  int percent;
+  struct {
+    byte percent;
+    const char *text;
+  } diagnosis[] = {
+    { 100, "is in excellent condition."			},
+    {  90, "has a few scratches."			},
+    {  75, "has some small wounds and bruises."		},
+    {  50, "has quite a few wounds."			},
+    {  30, "has some big nasty wounds and scratches."	},
+    {  15, "looks pretty hurt."				},
+    {   0, "is in awful condition."			},
+    {  -1, "is bleeding awfully from big wounds."	},
+  };
+  int percent, ar_index;
+  const char *pers = PERS(i, ch);
 
   if (GET_MAX_HIT(i) > 0)
     percent = (100 * GET_HIT(i)) / GET_MAX_HIT(i);
   else
     percent = -1;		/* How could MAX_HIT be < 1?? */
 
-  strcpy(buf, PERS(i, ch));
-  CAP(buf);
-
-  if (percent >= 100)
-    strcat(buf, " is in excellent condition.\r\n");
-  else if (percent >= 90)
-    strcat(buf, " has a few scratches.\r\n");
-  else if (percent >= 75)
-    strcat(buf, " has some small wounds and bruises.\r\n");
-  else if (percent >= 50)
-    strcat(buf, " has quite a few wounds.\r\n");
-  else if (percent >= 30)
-    strcat(buf, " has some big nasty wounds and scratches.\r\n");
-  else if (percent >= 15)
-    strcat(buf, " looks pretty hurt.\r\n");
-  else if (percent >= 0)
-    strcat(buf, " is in awful condition.\r\n");
-  else
-    strcat(buf, " is bleeding awfully from big wounds.\r\n");
+  for (ar_index = 0; diagnosis[ar_index].percent >= 0; ar_index++)
+    if (percent >= diagnosis[ar_index].percent)
+      break;
 
-  send_to_char(buf, ch);
+  send_to_char(ch, "%c%s %s\r\n", UPPER(*pers), pers + 1, diagnosis[ar_index].text);
 }
 
 
@@ -220,7 +219,7 @@ void look_at_char(struct char_data *i, s
     return;
 
    if (i->player.description)
-    send_to_char(i->player.description, ch);
+    send_to_char(ch, "%s", i->player.description);
   else
     act("You see nothing special about $m.", FALSE, i, 0, ch, TO_VICT);
 
@@ -232,11 +231,11 @@ void look_at_char(struct char_data *i, s
       found = TRUE;
 
   if (found) {
-    send_to_char("\r\n", ch);	/* act() does capitalization. */
+    send_to_char(ch, "\r\n");	/* act() does capitalization. */
     act("$n is using:", FALSE, i, 0, ch, TO_VICT);
     for (j = 0; j < NUM_WEARS; j++)
       if (GET_EQ(i, j) && CAN_SEE_OBJ(ch, GET_EQ(i, j))) {
-	send_to_char(wear_where[j], ch);
+	send_to_char(ch, "%s", wear_where[j]);
 	show_obj_to_char(GET_EQ(i, j), ch, SHOW_OBJ_SHORT);
       }
   }
@@ -244,14 +243,14 @@ void look_at_char(struct char_data *i, s
     found = FALSE;
     act("\r\nYou attempt to peek at $s inventory:", FALSE, i, 0, ch, TO_VICT);
     for (tmp_obj = i->carrying; tmp_obj; tmp_obj = tmp_obj->next_content) {
-      if (CAN_SEE_OBJ(ch, tmp_obj) && (number(0, 20) < GET_LEVEL(ch))) {
+      if (CAN_SEE_OBJ(ch, tmp_obj) && (rand_number(0, 20) < GET_LEVEL(ch))) {
 	show_obj_to_char(tmp_obj, ch, SHOW_OBJ_SHORT);
 	found = TRUE;
       }
     }
 
     if (!found)
-      send_to_char("You can't see anything.\r\n", ch);
+      send_to_char(ch, "You can't see anything.\r\n");
   }
 }
 
@@ -272,18 +271,15 @@ void list_one_char(struct char_data *i, 
 
   if (IS_NPC(i) && i->player.long_descr && GET_POS(i) == GET_DEFAULT_POS(i)) {
     if (AFF_FLAGGED(i, AFF_INVISIBLE))
-      strcpy(buf, "*");
-    else
-      *buf = '\0';
+      send_to_char(ch, "*");
 
     if (AFF_FLAGGED(ch, AFF_DETECT_ALIGN)) {
       if (IS_EVIL(i))
-	strcat(buf, "(Red Aura) ");
+	send_to_char(ch, "(Red Aura) ");
       else if (IS_GOOD(i))
-	strcat(buf, "(Blue Aura) ");
+	send_to_char(ch, "(Blue Aura) ");
     }
-    strcat(buf, i->player.long_descr);
-    send_to_char(buf, ch);
+    send_to_char(ch, "%s", i->player.long_descr);
 
     if (AFF_FLAGGED(i, AFF_SANCTUARY))
       act("...$e glows with a bright light!", FALSE, i, 0, ch, TO_VICT);
@@ -292,47 +288,45 @@ void list_one_char(struct char_data *i, 
 
     return;
   }
-  if (IS_NPC(i)) {
-    strcpy(buf, i->player.short_descr);
-    CAP(buf);
-  } else
-    sprintf(buf, "%s %s", i->player.name, GET_TITLE(i));
 
+  if (IS_NPC(i))
+    send_to_char(ch, "%c%s", UPPER(*i->player.short_descr), i->player.short_descr);
+  else
+    send_to_char(ch, "%s %s", i->player.name, GET_TITLE(i));
+
   if (AFF_FLAGGED(i, AFF_INVISIBLE))
-    strcat(buf, " (invisible)");
+    send_to_char(ch, " (invisible)");
   if (AFF_FLAGGED(i, AFF_HIDE))
-    strcat(buf, " (hidden)");
+    send_to_char(ch, " (hidden)");
   if (!IS_NPC(i) && !i->desc)
-    strcat(buf, " (linkless)");
+    send_to_char(ch, " (linkless)");
   if (!IS_NPC(i) && PLR_FLAGGED(i, PLR_WRITING))
-    strcat(buf, " (writing)");
+    send_to_char(ch, " (writing)");
 
   if (GET_POS(i) != POS_FIGHTING)
-    strcat(buf, positions[(int) GET_POS(i)]);
+    send_to_char(ch, "%s", positions[(int) GET_POS(i)]);
   else {
     if (FIGHTING(i)) {
-      strcat(buf, " is here, fighting ");
+      send_to_char(ch, " is here, fighting ");
       if (FIGHTING(i) == ch)
-	strcat(buf, "YOU!");
+	send_to_char(ch, "YOU!");
       else {
 	if (IN_ROOM(i) == IN_ROOM(FIGHTING(i)))
-	  strcat(buf, PERS(FIGHTING(i), ch));
+	  send_to_char(ch, "%s!", PERS(FIGHTING(i), ch));
 	else
-	  strcat(buf, "someone who has already left");
-	strcat(buf, "!");
+	  send_to_char(ch,  "someone who has already left!");
       }
     } else			/* NIL fighting pointer */
-      strcat(buf, " is here struggling with thin air.");
+      send_to_char(ch, " is here struggling with thin air.");
   }
 
   if (AFF_FLAGGED(ch, AFF_DETECT_ALIGN)) {
     if (IS_EVIL(i))
-      strcat(buf, " (Red Aura)");
+      send_to_char(ch, " (Red Aura)");
     else if (IS_GOOD(i))
-      strcat(buf, " (Blue Aura)");
+      send_to_char(ch, " (Blue Aura)");
   }
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+  send_to_char(ch, "\r\n");
 
   if (AFF_FLAGGED(i, AFF_SANCTUARY))
     act("...$e glows with a bright light!", FALSE, i, 0, ch, TO_VICT);
@@ -350,7 +344,7 @@ void list_char_to_char(struct char_data 
 	list_one_char(i, ch);
       else if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch) &&
 	       AFF_FLAGGED(i, AFF_INFRAVISION))
-	send_to_char("You see a pair of glowing red eyes looking your way.\r\n", ch);
+	send_to_char(ch, "You see a pair of glowing red eyes looking your way.\r\n");
     }
 }
 
@@ -359,54 +353,51 @@ void do_auto_exits(struct char_data *ch)
 {
   int door, slen = 0;
 
-  *buf = '\0';
+  send_to_char(ch, "%s[ Exits: ", CCCYN(ch, C_NRM));
 
-  for (door = 0; door < NUM_OF_DIRS; door++)
-    if (EXIT(ch, door) && EXIT(ch, door)->to_room != NOWHERE &&
-	!EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
-      slen += sprintf(buf + slen, "%c ", LOWER(*dirs[door]));
+  for (door = 0; door < NUM_OF_DIRS; door++) {
+    if (!EXIT(ch, door) || EXIT(ch, door)->to_room == NOWHERE)
+      continue;
+    if (EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
+      continue;
 
-  sprintf(buf2, "%s[ Exits: %s]%s\r\n", CCCYN(ch, C_NRM),
-	  *buf ? buf : "None! ", CCNRM(ch, C_NRM));
+    send_to_char(ch, "%c ", LOWER(*dirs[door]));
+    slen++;
+  }
 
-  send_to_char(buf2, ch);
+  send_to_char(ch, "%s]%s\r\n", slen ? "" : "None!", CCNRM(ch, C_NRM));
 }
 
 
 ACMD(do_exits)
 {
-  int door;
-
-  *buf = '\0';
+  int door, len = 0;
 
   if (AFF_FLAGGED(ch, AFF_BLIND)) {
-    send_to_char("You can't see a damned thing, you're blind!\r\n", ch);
+    send_to_char(ch, "You can't see a damned thing, you're blind!\r\n");
     return;
   }
-  for (door = 0; door < NUM_OF_DIRS; door++)
-    if (EXIT(ch, door) && EXIT(ch, door)->to_room != NOWHERE &&
-	!EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED)) {
-      if (GET_LEVEL(ch) >= LVL_IMMORT)
-	sprintf(buf2, "%-5s - [%5d] %s\r\n", dirs[door],
-		GET_ROOM_VNUM(EXIT(ch, door)->to_room),
+
+  send_to_char(ch, "Obvious exits:\r\n");
+
+  for (door = 0; door < NUM_OF_DIRS; door++) {
+    if (!EXIT(ch, door) || EXIT(ch, door)->to_room == NOWHERE)
+      continue;
+    if (EXIT_FLAGGED(EXIT(ch, door), EX_CLOSED))
+      continue;
+
+    len++;
+
+    if (GET_LEVEL(ch) >= LVL_IMMORT)
+      send_to_char(ch, "%-5s - [%5d] %s\r\n", dirs[door], GET_ROOM_VNUM(EXIT(ch, door)->to_room),
 		world[EXIT(ch, door)->to_room].name);
-      else {
-	sprintf(buf2, "%-5s - ", dirs[door]);
-	if (IS_DARK(EXIT(ch, door)->to_room) && !CAN_SEE_IN_DARK(ch))
-	  strcat(buf2, "Too dark to tell\r\n");
-	else {
-	  strcat(buf2, world[EXIT(ch, door)->to_room].name);
-	  strcat(buf2, "\r\n");
-	}
-      }
-      strcat(buf, CAP(buf2));
-    }
-  send_to_char("Obvious exits:\r\n", ch);
+    else
+      send_to_char(ch, "%-5s - %s\r\n", dirs[door], IS_DARK(EXIT(ch, door)->to_room) &&
+		!CAN_SEE_IN_DARK(ch) ? "Too dark to tell." : world[EXIT(ch, door)->to_room].name);
+  }
 
-  if (*buf)
-    send_to_char(buf, ch);
-  else
-    send_to_char(" None.\r\n", ch);
+  if (!len)
+    send_to_char(ch, " None.\r\n");
 }
 
 
@@ -417,38 +408,37 @@ void look_at_room(struct char_data *ch, 
     return;
 
   if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) {
-    send_to_char("It is pitch black...\r\n", ch);
+    send_to_char(ch, "It is pitch black...\r\n");
     return;
   } else if (AFF_FLAGGED(ch, AFF_BLIND)) {
-    send_to_char("You see nothing but infinite darkness...\r\n", ch);
+    send_to_char(ch, "You see nothing but infinite darkness...\r\n");
     return;
   }
-  send_to_char(CCCYN(ch, C_NRM), ch);
+  send_to_char(ch, "%s", CCCYN(ch, C_NRM));
   if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_ROOMFLAGS)) {
-    sprintbit(ROOM_FLAGS(IN_ROOM(ch)), room_bits, buf);
-    sprintf(buf2, "[%5d] %s [ %s]", GET_ROOM_VNUM(IN_ROOM(ch)),
-	    world[IN_ROOM(ch)].name, buf);
-    send_to_char(buf2, ch);
+    char buf[MAX_STRING_LENGTH];
+
+    sprintbit(ROOM_FLAGS(IN_ROOM(ch)), room_bits, buf, sizeof(buf));
+    send_to_char(ch, "[%5d] %s [ %s]", GET_ROOM_VNUM(IN_ROOM(ch)), world[IN_ROOM(ch)].name, buf);
   } else
-    send_to_char(world[IN_ROOM(ch)].name, ch);
+    send_to_char(ch, world[IN_ROOM(ch)].name);
 
-  send_to_char(CCNRM(ch, C_NRM), ch);
-  send_to_char("\r\n", ch);
+  send_to_char(ch, "%s\r\n", CCNRM(ch, C_NRM));
 
   if ((!IS_NPC(ch) && !PRF_FLAGGED(ch, PRF_BRIEF)) || ignore_brief ||
       ROOM_FLAGGED(IN_ROOM(ch), ROOM_DEATH))
-    send_to_char(world[IN_ROOM(ch)].description, ch);
+    send_to_char(ch, world[IN_ROOM(ch)].description);
 
   /* autoexits */
   if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOEXIT))
     do_auto_exits(ch);
 
   /* now list characters & objects */
-  send_to_char(CCGRN(ch, C_NRM), ch);
+  send_to_char(ch, "%s", CCGRN(ch, C_NRM));
   list_obj_to_char(world[IN_ROOM(ch)].contents, ch, SHOW_OBJ_LONG, FALSE);
-  send_to_char(CCYEL(ch, C_NRM), ch);
+  send_to_char(ch, "%s", CCYEL(ch, C_NRM));
   list_char_to_char(world[IN_ROOM(ch)].people, ch);
-  send_to_char(CCNRM(ch, C_NRM), ch);
+  send_to_char(ch, "%s", CCNRM(ch, C_NRM));
 }
 
 
@@ -457,19 +447,16 @@ void look_in_direction(struct char_data 
 {
   if (EXIT(ch, dir)) {
     if (EXIT(ch, dir)->general_description)
-      send_to_char(EXIT(ch, dir)->general_description, ch);
+      send_to_char(ch, "%s", EXIT(ch, dir)->general_description);
     else
-      send_to_char("You see nothing special.\r\n", ch);
+      send_to_char(ch, "You see nothing special.\r\n");
 
-    if (EXIT_FLAGGED(EXIT(ch, dir), EX_CLOSED) && EXIT(ch, dir)->keyword) {
-      sprintf(buf, "The %s is closed.\r\n", fname(EXIT(ch, dir)->keyword));
-      send_to_char(buf, ch);
-    } else if (EXIT_FLAGGED(EXIT(ch, dir), EX_ISDOOR) && EXIT(ch, dir)->keyword) {
-      sprintf(buf, "The %s is open.\r\n", fname(EXIT(ch, dir)->keyword));
-      send_to_char(buf, ch);
-    }
+    if (EXIT_FLAGGED(EXIT(ch, dir), EX_CLOSED) && EXIT(ch, dir)->keyword)
+      send_to_char(ch, "The %s is closed.\r\n", fname(EXIT(ch, dir)->keyword));
+    else if (EXIT_FLAGGED(EXIT(ch, dir), EX_ISDOOR) && EXIT(ch, dir)->keyword)
+      send_to_char(ch, "The %s is open.\r\n", fname(EXIT(ch, dir)->keyword));
   } else
-    send_to_char("Nothing special there...\r\n", ch);
+    send_to_char(ch, "Nothing special there...\r\n");
 }
 
 
@@ -481,30 +468,29 @@ void look_in_obj(struct char_data *ch, c
   int amt, bits;
 
   if (!*arg)
-    send_to_char("Look in what?\r\n", ch);
+    send_to_char(ch, "Look in what?\r\n");
   else if (!(bits = generic_find(arg, FIND_OBJ_INV | FIND_OBJ_ROOM |
 				 FIND_OBJ_EQUIP, ch, &dummy, &obj))) {
-    sprintf(buf, "There doesn't seem to be %s %s here.\r\n", AN(arg), arg);
-    send_to_char(buf, ch);
+    send_to_char(ch, "There doesn't seem to be %s %s here.\r\n", AN(arg), arg);
   } else if ((GET_OBJ_TYPE(obj) != ITEM_DRINKCON) &&
 	     (GET_OBJ_TYPE(obj) != ITEM_FOUNTAIN) &&
 	     (GET_OBJ_TYPE(obj) != ITEM_CONTAINER))
-    send_to_char("There's nothing inside that!\r\n", ch);
+    send_to_char(ch, "There's nothing inside that!\r\n");
   else {
     if (GET_OBJ_TYPE(obj) == ITEM_CONTAINER) {
       if (OBJVAL_FLAGGED(obj, CONT_CLOSED))
-	send_to_char("It is closed.\r\n", ch);
+	send_to_char(ch, "It is closed.\r\n");
       else {
-	send_to_char(fname(obj->name), ch);
+	send_to_char(ch, "%s", fname(obj->name));
 	switch (bits) {
 	case FIND_OBJ_INV:
-	  send_to_char(" (carried): \r\n", ch);
+	  send_to_char(ch, " (carried): \r\n");
 	  break;
 	case FIND_OBJ_ROOM:
-	  send_to_char(" (here): \r\n", ch);
+	  send_to_char(ch, " (here): \r\n");
 	  break;
 	case FIND_OBJ_EQUIP:
-	  send_to_char(" (used): \r\n", ch);
+	  send_to_char(ch, " (used): \r\n");
 	  break;
 	}
 
@@ -512,16 +498,16 @@ void look_in_obj(struct char_data *ch, c
       }
     } else {		/* item must be a fountain or drink container */
       if (GET_OBJ_VAL(obj, 1) <= 0)
-	send_to_char("It is empty.\r\n", ch);
+	send_to_char(ch, "It is empty.\r\n");
       else {
 	if (GET_OBJ_VAL(obj,0) <= 0 || GET_OBJ_VAL(obj,1)>GET_OBJ_VAL(obj,0)) {
-	  sprintf(buf, "Its contents seem somewhat murky.\r\n"); /* BUG */
+	  send_to_char(ch, "Its contents seem somewhat murky.\r\n"); /* BUG */
 	} else {
+          char buf2[MAX_STRING_LENGTH];
 	  amt = (GET_OBJ_VAL(obj, 1) * 3) / GET_OBJ_VAL(obj, 0);
-	  sprinttype(GET_OBJ_VAL(obj, 2), color_liquid, buf2);
-	  sprintf(buf, "It's %sfull of a %s liquid.\r\n", fullness[amt], buf2);
+	  sprinttype(GET_OBJ_VAL(obj, 2), color_liquid, buf2, sizeof(buf2));
+	  send_to_char(ch, "It's %sfull of a %s liquid.\r\n", fullness[amt], buf2);
 	}
-	send_to_char(buf, ch);
       }
     }
   }
@@ -560,7 +546,7 @@ void look_at_target(struct char_data *ch
     return;
 
   if (!*arg) {
-    send_to_char("Look at what?\r\n", ch);
+    send_to_char(ch, "Look at what?\r\n");
     return;
   }
 
@@ -580,7 +566,7 @@ void look_at_target(struct char_data *ch
 
   /* Strip off "number." from 2.foo and friends. */
   if (!(fnum = get_number(&arg))) {
-    send_to_char("Look at what?\r\n", ch);
+    send_to_char(ch, "Look at what?\r\n");
     return;
   }
 
@@ -594,7 +580,7 @@ void look_at_target(struct char_data *ch
   for (j = 0; j < NUM_WEARS && !found; j++)
     if (GET_EQ(ch, j) && CAN_SEE_OBJ(ch, GET_EQ(ch, j)))
       if ((desc = find_exdesc(arg, GET_EQ(ch, j)->ex_description)) != NULL && ++i == fnum) {
-	send_to_char(desc, ch);
+	send_to_char(ch, "%s", desc);
 	found = TRUE;
       }
 
@@ -602,7 +588,7 @@ void look_at_target(struct char_data *ch
   for (obj = ch->carrying; obj && !found; obj = obj->next_content) {
     if (CAN_SEE_OBJ(ch, obj))
       if ((desc = find_exdesc(arg, obj->ex_description)) != NULL && ++i == fnum) {
-	send_to_char(desc, ch);
+	send_to_char(ch, "%s", desc);
 	found = TRUE;
       }
   }
@@ -611,7 +597,7 @@ void look_at_target(struct char_data *ch
   for (obj = world[IN_ROOM(ch)].contents; obj && !found; obj = obj->next_content)
     if (CAN_SEE_OBJ(ch, obj))
       if ((desc = find_exdesc(arg, obj->ex_description)) != NULL && ++i == fnum) {
-	send_to_char(desc, ch);
+	send_to_char(ch, "%s", desc);
 	found = TRUE;
       }
 
@@ -621,34 +607,35 @@ void look_at_target(struct char_data *ch
       show_obj_to_char(found_obj, ch, SHOW_OBJ_ACTION);
     else {
       show_obj_modifiers(found_obj, ch);
-      send_to_char("\r\n", ch);
+      send_to_char(ch, "\r\n");
     }
   } else if (!found)
-    send_to_char("You do not see that here.\r\n", ch);
+    send_to_char(ch, "You do not see that here.\r\n");
 }
 
 
 ACMD(do_look)
 {
-  char arg2[MAX_INPUT_LENGTH];
   int look_type;
 
   if (!ch->desc)
     return;
 
   if (GET_POS(ch) < POS_SLEEPING)
-    send_to_char("You can't see anything but stars!\r\n", ch);
+    send_to_char(ch, "You can't see anything but stars!\r\n");
   else if (AFF_FLAGGED(ch, AFF_BLIND))
-    send_to_char("You can't see a damned thing, you're blind!\r\n", ch);
+    send_to_char(ch, "You can't see a damned thing, you're blind!\r\n");
   else if (IS_DARK(IN_ROOM(ch)) && !CAN_SEE_IN_DARK(ch)) {
-    send_to_char("It is pitch black...\r\n", ch);
+    send_to_char(ch, "It is pitch black...\r\n");
     list_char_to_char(world[IN_ROOM(ch)].people, ch);	/* glowing red eyes */
   } else {
+    char arg[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
+
     half_chop(argument, arg, arg2);
 
     if (subcmd == SCMD_READ) {
       if (!*arg)
-	send_to_char("Read what?\r\n", ch);
+	send_to_char(ch, "Read what?\r\n");
       else
 	look_at_target(ch, arg);
       return;
@@ -673,17 +660,17 @@ ACMD(do_examine)
 {
   struct char_data *tmp_char;
   struct obj_data *tmp_object;
-  char tempsave[MAX_INPUT_LENGTH];
+  char tempsave[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
 
   one_argument(argument, arg);
 
   if (!*arg) {
-    send_to_char("Examine what?\r\n", ch);
+    send_to_char(ch, "Examine what?\r\n");
     return;
   }
 
   /* look_at_target() eats the number. */
-  look_at_target(ch, strcpy(tempsave, arg));
+  look_at_target(ch, strcpy(tempsave, arg));	/* strcpy: OK */
 
   generic_find(arg, FIND_OBJ_INV | FIND_OBJ_ROOM | FIND_CHAR_ROOM |
 		      FIND_OBJ_EQUIP, ch, &tmp_char, &tmp_object);
@@ -692,7 +679,7 @@ ACMD(do_examine)
     if ((GET_OBJ_TYPE(tmp_object) == ITEM_DRINKCON) ||
 	(GET_OBJ_TYPE(tmp_object) == ITEM_FOUNTAIN) ||
 	(GET_OBJ_TYPE(tmp_object) == ITEM_CONTAINER)) {
-      send_to_char("When you look inside, you see:\r\n", ch);
+      send_to_char(ch, "When you look inside, you see:\r\n");
       look_in_obj(ch, arg);
     }
   }
@@ -703,13 +690,11 @@ ACMD(do_examine)
 ACMD(do_gold)
 {
   if (GET_GOLD(ch) == 0)
-    send_to_char("You're broke!\r\n", ch);
+    send_to_char(ch, "You're broke!\r\n");
   else if (GET_GOLD(ch) == 1)
-    send_to_char("You have one miserable little gold coin.\r\n", ch);
-  else {
-    sprintf(buf, "You have %d gold coins.\r\n", GET_GOLD(ch));
-    send_to_char(buf, ch);
-  }
+    send_to_char(ch, "You have one miserable little gold coin.\r\n");
+  else
+    send_to_char(ch, "You have %d gold coins.\r\n", GET_GOLD(ch));
 }
 
 
@@ -720,117 +705,110 @@ ACMD(do_score)
   if (IS_NPC(ch))
     return;
 
-  sprintf(buf, "You are %d years old.", GET_AGE(ch));
+  send_to_char(ch, "You are %d years old.\r\n", GET_AGE(ch));
 
   if (age(ch)->month == 0 && age(ch)->day == 0)
-    strcat(buf, "  It's your birthday today.\r\n");
+    send_to_char(ch, "  It's your birthday today.\r\n");
   else
-    strcat(buf, "\r\n");
+    send_to_char(ch, "\r\n");
 
-  sprintf(buf + strlen(buf),
-       "You have %d(%d) hit, %d(%d) mana and %d(%d) movement points.\r\n",
+  send_to_char(ch, "You have %d(%d) hit, %d(%d) mana and %d(%d) movement points.\r\n",
 	  GET_HIT(ch), GET_MAX_HIT(ch), GET_MANA(ch), GET_MAX_MANA(ch),
 	  GET_MOVE(ch), GET_MAX_MOVE(ch));
 
-  sprintf(buf + strlen(buf), "Your armor class is %d/10, and your alignment is %d.\r\n",
+  send_to_char(ch, "Your armor class is %d/10, and your alignment is %d.\r\n",
 	  compute_armor_class(ch), GET_ALIGNMENT(ch));
 
-  sprintf(buf + strlen(buf), "You have scored %d exp, and have %d gold coins.\r\n",
+  send_to_char(ch, "You have scored %d exp, and have %d gold coins.\r\n",
 	  GET_EXP(ch), GET_GOLD(ch));
 
   if (GET_LEVEL(ch) < LVL_IMMORT)
-    sprintf(buf + strlen(buf), "You need %d exp to reach your next level.\r\n",
+    send_to_char(ch, "You need %d exp to reach your next level.\r\n",
 	level_exp(GET_CLASS(ch), GET_LEVEL(ch) + 1) - GET_EXP(ch));
 
   playing_time = *real_time_passed((time(0) - ch->player.time.logon) +
 				  ch->player.time.played, 0);
-  sprintf(buf + strlen(buf), "You have been playing for %d day%s and %d hour%s.\r\n",
+  send_to_char(ch, "You have been playing for %d day%s and %d hour%s.\r\n",
      playing_time.day, playing_time.day == 1 ? "" : "s",
      playing_time.hours, playing_time.hours == 1 ? "" : "s");
 
-  sprintf(buf + strlen(buf), "This ranks you as %s %s (level %d).\r\n",
+  send_to_char(ch, "This ranks you as %s %s (level %d).\r\n",
 	  GET_NAME(ch), GET_TITLE(ch), GET_LEVEL(ch));
 
   switch (GET_POS(ch)) {
   case POS_DEAD:
-    strcat(buf, "You are DEAD!\r\n");
+    send_to_char(ch, "You are DEAD!\r\n");
     break;
   case POS_MORTALLYW:
-    strcat(buf, "You are mortally wounded!  You should seek help!\r\n");
+    send_to_char(ch, "You are mortally wounded!  You should seek help!\r\n");
     break;
   case POS_INCAP:
-    strcat(buf, "You are incapacitated, slowly fading away...\r\n");
+    send_to_char(ch, "You are incapacitated, slowly fading away...\r\n");
     break;
   case POS_STUNNED:
-    strcat(buf, "You are stunned!  You can't move!\r\n");
+    send_to_char(ch, "You are stunned!  You can't move!\r\n");
     break;
   case POS_SLEEPING:
-    strcat(buf, "You are sleeping.\r\n");
+    send_to_char(ch, "You are sleeping.\r\n");
     break;
   case POS_RESTING:
-    strcat(buf, "You are resting.\r\n");
+    send_to_char(ch, "You are resting.\r\n");
     break;
   case POS_SITTING:
-    strcat(buf, "You are sitting.\r\n");
+    send_to_char(ch, "You are sitting.\r\n");
     break;
   case POS_FIGHTING:
-    if (FIGHTING(ch))
-      sprintf(buf + strlen(buf), "You are fighting %s.\r\n",
-		PERS(FIGHTING(ch), ch));
-    else
-      strcat(buf, "You are fighting thin air.\r\n");
+    send_to_char(ch, "You are fighting %s.\r\n", FIGHTING(ch) ? PERS(FIGHTING(ch), ch) : "thin air");
     break;
   case POS_STANDING:
-    strcat(buf, "You are standing.\r\n");
+    send_to_char(ch, "You are standing.\r\n");
     break;
   default:
-    strcat(buf, "You are floating.\r\n");
+    send_to_char(ch, "You are floating.\r\n");
     break;
   }
 
   if (GET_COND(ch, DRUNK) > 10)
-    strcat(buf, "You are intoxicated.\r\n");
+    send_to_char(ch, "You are intoxicated.\r\n");
 
   if (GET_COND(ch, FULL) == 0)
-    strcat(buf, "You are hungry.\r\n");
+    send_to_char(ch, "You are hungry.\r\n");
 
   if (GET_COND(ch, THIRST) == 0)
-    strcat(buf, "You are thirsty.\r\n");
+    send_to_char(ch, "You are thirsty.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_BLIND))
-    strcat(buf, "You have been blinded!\r\n");
+    send_to_char(ch, "You have been blinded!\r\n");
 
   if (AFF_FLAGGED(ch, AFF_INVISIBLE))
-    strcat(buf, "You are invisible.\r\n");
+    send_to_char(ch, "You are invisible.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_DETECT_INVIS))
-    strcat(buf, "You are sensitive to the presence of invisible things.\r\n");
+    send_to_char(ch, "You are sensitive to the presence of invisible things.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_SANCTUARY))
-    strcat(buf, "You are protected by Sanctuary.\r\n");
+    send_to_char(ch, "You are protected by Sanctuary.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_POISON))
-    strcat(buf, "You are poisoned!\r\n");
+    send_to_char(ch, "You are poisoned!\r\n");
 
   if (AFF_FLAGGED(ch, AFF_CHARM))
-    strcat(buf, "You have been charmed!\r\n");
+    send_to_char(ch, "You have been charmed!\r\n");
 
   if (affected_by_spell(ch, SPELL_ARMOR))
-    strcat(buf, "You feel protected.\r\n");
+    send_to_char(ch, "You feel protected.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_INFRAVISION))
-    strcat(buf, "Your eyes are glowing red.\r\n");
+    send_to_char(ch, "Your eyes are glowing red.\r\n");
 
   if (PRF_FLAGGED(ch, PRF_SUMMONABLE))
-    strcat(buf, "You are summonable by other players.\r\n");
-
-  send_to_char(buf, ch);
+    send_to_char(ch, "You are summonable by other players.\r\n");
 }
 
 
 ACMD(do_inventory)
 {
-  send_to_char("You are carrying:\r\n", ch);
+  send_to_char(ch, "You are carrying:\r\n");
   list_obj_to_char(ch->carrying, ch, SHOW_OBJ_SHORT, TRUE);
 }
 
@@ -839,23 +817,22 @@ ACMD(do_equipment)
 {
   int i, found = 0;
 
-  send_to_char("You are using:\r\n", ch);
+  send_to_char(ch, "You are using:\r\n");
   for (i = 0; i < NUM_WEARS; i++) {
     if (GET_EQ(ch, i)) {
       if (CAN_SEE_OBJ(ch, GET_EQ(ch, i))) {
-	send_to_char(wear_where[i], ch);
+	send_to_char(ch, "%s", wear_where[i]);
 	show_obj_to_char(GET_EQ(ch, i), ch, SHOW_OBJ_SHORT);
 	found = TRUE;
       } else {
-	send_to_char(wear_where[i], ch);
-	send_to_char("Something.\r\n", ch);
+	send_to_char(ch, "%s", wear_where[i]);
+	send_to_char(ch, "Something.\r\n");
 	found = TRUE;
       }
     }
-  }
-  if (!found) {
-    send_to_char(" Nothing.\r\n", ch);
   }
+  if (!found)
+    send_to_char(ch, " Nothing.\r\n");
 }
 
 
@@ -864,18 +841,15 @@ ACMD(do_time)
   const char *suf;
   int weekday, day;
 
-  sprintf(buf, "It is %d o'clock %s, on ",
-	  ((time_info.hours % 12 == 0) ? 12 : ((time_info.hours) % 12)),
-	  ((time_info.hours >= 12) ? "pm" : "am"));
+  /* day in [1..35] */
+  day = time_info.day + 1;
 
-  day = time_info.day + 1;	/* day in [1..35] */
-
   /* 35 days in a month, 7 days a week */
   weekday = ((35 * time_info.month) + day) % 7;
 
-  strcat(buf, weekdays[weekday]);
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+  send_to_char(ch, "It is %d o'clock %s, on %s.\r\n",
+	  (time_info.hours % 12 == 0) ? 12 : (time_info.hours % 12),
+	  time_info.hours >= 12 ? "pm" : "am", weekdays[weekday]);
 
   /*
    * Peter Ajamian <peter@PAJAMIAN.DHS.ORG> supplied the following as a fix
@@ -901,10 +875,8 @@ ACMD(do_time)
     }
   }
 
-  sprintf(buf, "The %d%s Day of the %s, Year %d.\r\n",
+  send_to_char(ch, "The %d%s Day of the %s, Year %d.\r\n",
 	  day, suf, month_name[time_info.month], time_info.year);
-
-  send_to_char(buf, ch);
 }
 
 
@@ -917,13 +889,12 @@ ACMD(do_weather)
     "lit by flashes of lightning"
   };
 
-  if (OUTSIDE(ch)) {
-    sprintf(buf, "The sky is %s and %s.\r\n", sky_look[weather_info.sky],
-	    (weather_info.change >= 0 ? "you feel a warm wind from south" :
-	     "your foot tells you bad weather is due"));
-    send_to_char(buf, ch);
-  } else
-    send_to_char("You have no feeling about the weather at all.\r\n", ch);
+  if (OUTSIDE(ch))
+    send_to_char(ch, "The sky is %s and %s.\r\n", sky_look[weather_info.sky],
+	    weather_info.change >= 0 ? "you feel a warm wind from south" :
+	     "your foot tells you bad weather is due");
+  else
+    send_to_char(ch, "You have no feeling about the weather at all.\r\n");
 }
 
 
@@ -941,7 +912,7 @@ ACMD(do_help)
     return;
   }
   if (!help_table) {
-    send_to_char("No help available.\r\n", ch);
+    send_to_char(ch, "No help available.\r\n");
     return;
   }
 
@@ -953,7 +924,7 @@ ACMD(do_help)
     mid = (bot + top) / 2;
 
     if (bot > top) {
-      send_to_char("There is no help on that word.\r\n", ch);
+      send_to_char(ch, "There is no help on that word.\r\n");
       return;
     } else if (!(chk = strn_cmp(argument, help_table[mid].keyword, minlen))) {
       /* trace backwards to find first matching entry. Thanks Jeff Fink! */
@@ -976,45 +947,47 @@ ACMD(do_help)
 #define WHO_FORMAT \
 "format: who [minlev[-maxlev]] [-n name] [-c classlist] [-s] [-o] [-q] [-r] [-z]\r\n"
 
+/* FIXME: This whole thing just needs rewritten. */
 ACMD(do_who)
 {
   struct descriptor_data *d;
   struct char_data *tch;
-  char name_search[MAX_INPUT_LENGTH];
+  char name_search[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
   char mode;
-  size_t i;
   int low = 0, high = LVL_IMPL, localwho = 0, questwho = 0;
   int showclass = 0, short_list = 0, outlaws = 0, num_can_see = 0;
   int who_room = 0;
 
   skip_spaces(&argument);
-  strcpy(buf, argument);
+  strcpy(buf, argument);	/* strcpy: OK (sizeof: argument == buf) */
   name_search[0] = '\0';
 
   while (*buf) {
+    char arg[MAX_INPUT_LENGTH], buf1[MAX_INPUT_LENGTH];
+
     half_chop(buf, arg, buf1);
     if (isdigit(*arg)) {
       sscanf(arg, "%d-%d", &low, &high);
-      strcpy(buf, buf1);
+      strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
     } else if (*arg == '-') {
       mode = *(arg + 1);       /* just in case; we destroy arg in the switch */
       switch (mode) {
       case 'o':
       case 'k':
 	outlaws = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'z':
 	localwho = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 's':
 	short_list = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'q':
 	questwho = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'l':
 	half_chop(buf1, arg, buf);
@@ -1025,25 +998,24 @@ ACMD(do_who)
 	break;
       case 'r':
 	who_room = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'c':
 	half_chop(buf1, arg, buf);
-	for (i = 0; i < strlen(arg); i++)
-	  showclass |= find_class_bitvector(arg[i]);
+	showclass = find_class_bitvector(arg);
 	break;
       default:
-	send_to_char(WHO_FORMAT, ch);
+	send_to_char(ch, "%s", WHO_FORMAT);
 	return;
       }				/* end of switch */
 
     } else {			/* endif */
-      send_to_char(WHO_FORMAT, ch);
+      send_to_char(ch, "%s", WHO_FORMAT);
       return;
     }
   }				/* end while (parser) */
 
-  send_to_char("Players\r\n-------\r\n", ch);
+  send_to_char(ch, "Players\r\n-------\r\n");
 
   for (d = descriptor_list; d; d = d->next) {
     if (STATE(d) != CON_PLAYING)
@@ -1071,60 +1043,58 @@ ACMD(do_who)
     if (showclass && !(showclass & (1 << GET_CLASS(tch))))
       continue;
     if (short_list) {
-      sprintf(buf, "%s[%2d %s] %-12.12s%s%s",
+      send_to_char(ch, "%s[%2d %s] %-12.12s%s%s",
 	      (GET_LEVEL(tch) >= LVL_IMMORT ? CCYEL(ch, C_SPR) : ""),
 	      GET_LEVEL(tch), CLASS_ABBR(tch), GET_NAME(tch),
 	      (GET_LEVEL(tch) >= LVL_IMMORT ? CCNRM(ch, C_SPR) : ""),
 	      ((!(++num_can_see % 4)) ? "\r\n" : ""));
-      send_to_char(buf, ch);
     } else {
       num_can_see++;
-      sprintf(buf, "%s[%2d %s] %s %s",
+      send_to_char(ch, "%s[%2d %s] %s %s",
 	      (GET_LEVEL(tch) >= LVL_IMMORT ? CCYEL(ch, C_SPR) : ""),
 	      GET_LEVEL(tch), CLASS_ABBR(tch), GET_NAME(tch),
 	      GET_TITLE(tch));
 
       if (GET_INVIS_LEV(tch))
-	sprintf(buf + strlen(buf), " (i%d)", GET_INVIS_LEV(tch));
+	send_to_char(ch, " (i%d)", GET_INVIS_LEV(tch));
       else if (AFF_FLAGGED(tch, AFF_INVISIBLE))
-	strcat(buf, " (invis)");
+	send_to_char(ch, " (invis)");
 
       if (PLR_FLAGGED(tch, PLR_MAILING))
-	strcat(buf, " (mailing)");
+	send_to_char(ch, " (mailing)");
       else if (PLR_FLAGGED(tch, PLR_WRITING))
-	strcat(buf, " (writing)");
+	send_to_char(ch, " (writing)");
 
       if (PRF_FLAGGED(tch, PRF_DEAF))
-	strcat(buf, " (deaf)");
+	send_to_char(ch, " (deaf)");
       if (PRF_FLAGGED(tch, PRF_NOTELL))
-	strcat(buf, " (notell)");
+	send_to_char(ch, " (notell)");
       if (PRF_FLAGGED(tch, PRF_QUEST))
-	strcat(buf, " (quest)");
+	send_to_char(ch, " (quest)");
       if (PLR_FLAGGED(tch, PLR_THIEF))
-	strcat(buf, " (THIEF)");
+	send_to_char(ch, " (THIEF)");
       if (PLR_FLAGGED(tch, PLR_KILLER))
-	strcat(buf, " (KILLER)");
+	send_to_char(ch, " (KILLER)");
       if (GET_LEVEL(tch) >= LVL_IMMORT)
-	strcat(buf, CCNRM(ch, C_SPR));
-      strcat(buf, "\r\n");
-      send_to_char(buf, ch);
+	send_to_char(ch, CCNRM(ch, C_SPR));
+      send_to_char(ch, "\r\n");
     }				/* endif shortlist */
   }				/* end of for */
   if (short_list && (num_can_see % 4))
-    send_to_char("\r\n", ch);
+    send_to_char(ch, "\r\n");
   if (num_can_see == 0)
-    sprintf(buf, "\r\nNo-one at all!\r\n");
+    send_to_char(ch, "\r\nNobody at all!\r\n");
   else if (num_can_see == 1)
-    sprintf(buf, "\r\nOne lonely character displayed.\r\n");
+    send_to_char(ch, "\r\nOne lonely character displayed.\r\n");
   else
-    sprintf(buf, "\r\n%d characters displayed.\r\n", num_can_see);
-  send_to_char(buf, ch);
+    send_to_char(ch, "\r\n%d characters displayed.\r\n", num_can_see);
 }
 
 
 #define USERS_FORMAT \
 "format: users [-l minlevel[-maxlevel]] [-n name] [-h host] [-c classlist] [-o] [-p]\r\n"
 
+/* BIG OL' FIXME: Rewrite it all. Similar to do_who(). */
 ACMD(do_users)
 {
   char line[200], line2[220], idletime[10], classname[20];
@@ -1132,14 +1102,16 @@ ACMD(do_users)
   char name_search[MAX_INPUT_LENGTH], host_search[MAX_INPUT_LENGTH];
   struct char_data *tch;
   struct descriptor_data *d;
-  size_t i;
   int low = 0, high = LVL_IMPL, num_can_see = 0;
   int showclass = 0, outlaws = 0, playing = 0, deadweight = 0;
+  char buf[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
 
   host_search[0] = name_search[0] = '\0';
 
-  strcpy(buf, argument);
+  strcpy(buf, argument);	/* strcpy: OK (sizeof: argument == buf) */
   while (*buf) {
+    char buf1[MAX_INPUT_LENGTH];
+
     half_chop(buf, arg, buf1);
     if (*arg == '-') {
       mode = *(arg + 1);  /* just in case; we destroy arg in the switch */
@@ -1148,15 +1120,15 @@ ACMD(do_users)
       case 'k':
 	outlaws = 1;
 	playing = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'p':
 	playing = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'd':
 	deadweight = 1;
-	strcpy(buf, buf1);
+	strcpy(buf, buf1);	/* strcpy: OK (sizeof: buf1 == buf) */
 	break;
       case 'l':
 	playing = 1;
@@ -1174,24 +1146,21 @@ ACMD(do_users)
       case 'c':
 	playing = 1;
 	half_chop(buf1, arg, buf);
-	for (i = 0; i < strlen(arg); i++)
-	  showclass |= find_class_bitvector(arg[i]);
+	showclass = find_class_bitvector(arg);
 	break;
       default:
-	send_to_char(USERS_FORMAT, ch);
+	send_to_char(ch, "%s", USERS_FORMAT);
 	return;
       }				/* end of switch */
 
     } else {			/* endif */
-      send_to_char(USERS_FORMAT, ch);
+      send_to_char(ch, "%s", USERS_FORMAT);
       return;
     }
   }				/* end while (parser) */
-  strcpy(line,
-	 "Num Class   Name         State          Idl Login@   Site\r\n");
-  strcat(line,
+  send_to_char(ch,
+	 "Num Class   Name         State          Idl Login@   Site\r\n"
 	 "--- ------- ------------ -------------- --- -------- ------------------------\r\n");
-  send_to_char(line, ch);
 
   one_argument(argument, arg);
 
@@ -1261,13 +1230,12 @@ ACMD(do_users)
     }
     if (STATE(d) != CON_PLAYING ||
 		(STATE(d) == CON_PLAYING && CAN_SEE(ch, d->character))) {
-      send_to_char(line, ch);
+      send_to_char(ch, "%s", line);
       num_can_see++;
     }
   }
 
-  sprintf(line, "\r\n%d visible sockets connected.\r\n", num_can_see);
-  send_to_char(line, ch);
+  send_to_char(ch, "\r\n%d visible sockets connected.\r\n", num_can_see);
 }
 
 
@@ -1303,13 +1271,13 @@ ACMD(do_gen_ps)
     page_string(ch->desc, imotd, 0);
     break;
   case SCMD_CLEAR:
-    send_to_char("\033[H\033[J", ch);
+    send_to_char(ch, "\033[H\033[J");
     break;
   case SCMD_VERSION:
-    send_to_char(strcat(strcpy(buf, circlemud_version), "\r\n"), ch);
+    send_to_char(ch, "%s\r\n", circlemud_version);
     break;
   case SCMD_WHOAMI:
-    send_to_char(strcat(strcpy(buf, GET_NAME(ch)), "\r\n"), ch);
+    send_to_char(ch, "%s\r\n", GET_NAME(ch));
     break;
   default:
     log("SYSERR: Unhandled case in do_gen_ps. (%d)", subcmd);
@@ -1324,7 +1292,7 @@ void perform_mortal_where(struct char_da
   struct descriptor_data *d;
 
   if (!*arg) {
-    send_to_char("Players in your Zone\r\n--------------------\r\n", ch);
+    send_to_char(ch, "Players in your Zone\r\n--------------------\r\n");
     for (d = descriptor_list; d; d = d->next) {
       if (STATE(d) != CON_PLAYING || d->character == ch)
 	continue;
@@ -1334,8 +1302,7 @@ void perform_mortal_where(struct char_da
 	continue;
       if (world[IN_ROOM(ch)].zone != world[IN_ROOM(i)].zone)
 	continue;
-      sprintf(buf, "%-20s - %s\r\n", GET_NAME(i), world[IN_ROOM(i)].name);
-      send_to_char(buf, ch);
+      send_to_char(ch, "%-20s - %s\r\n", GET_NAME(i), world[IN_ROOM(i)].name);
     }
   } else {			/* print only FIRST char, not all. */
     for (i = character_list; i; i = i->next) {
@@ -1345,11 +1312,10 @@ void perform_mortal_where(struct char_da
 	continue;
       if (!isname(arg, i->player.name))
 	continue;
-      sprintf(buf, "%-25s - %s\r\n", GET_NAME(i), world[IN_ROOM(i)].name);
-      send_to_char(buf, ch);
+      send_to_char(ch, "%-25s - %s\r\n", GET_NAME(i), world[IN_ROOM(i)].name);
       return;
     }
-    send_to_char("No-one around by that name.\r\n", ch);
+    send_to_char(ch, "Nobody around by that name.\r\n");
   }
 }
 
@@ -1358,32 +1324,22 @@ void print_object_location(int num, stru
 			        int recur)
 {
   if (num > 0)
-    sprintf(buf, "O%3d. %-25s - ", num, obj->short_description);
+    send_to_char(ch, "O%3d. %-25s - ", num, obj->short_description);
   else
-    sprintf(buf, "%33s", " - ");
+    send_to_char(ch, "%33s", " - ");
 
-  if (IN_ROOM(obj) != NOWHERE) {
-    sprintf(buf + strlen(buf), "[%5d] %s\r\n",
-	    GET_ROOM_VNUM(IN_ROOM(obj)), world[IN_ROOM(obj)].name);
-    send_to_char(buf, ch);
-  } else if (obj->carried_by) {
-    sprintf(buf + strlen(buf), "carried by %s\r\n",
-	    PERS(obj->carried_by, ch));
-    send_to_char(buf, ch);
-  } else if (obj->worn_by) {
-    sprintf(buf + strlen(buf), "worn by %s\r\n",
-	    PERS(obj->worn_by, ch));
-    send_to_char(buf, ch);
-  } else if (obj->in_obj) {
-    sprintf(buf + strlen(buf), "inside %s%s\r\n",
-	    obj->in_obj->short_description, (recur ? ", which is" : " "));
-    send_to_char(buf, ch);
+  if (IN_ROOM(obj) != NOWHERE)
+    send_to_char(ch, "[%5d] %s\r\n", GET_ROOM_VNUM(IN_ROOM(obj)), world[IN_ROOM(obj)].name);
+  else if (obj->carried_by)
+    send_to_char(ch, "carried by %s\r\n", PERS(obj->carried_by, ch));
+  else if (obj->worn_by)
+    send_to_char(ch, "worn by %s\r\n", PERS(obj->worn_by, ch));
+  else if (obj->in_obj) {
+    send_to_char(ch, "inside %s%s\r\n", obj->in_obj->short_description, (recur ? ", which is" : " "));
     if (recur)
       print_object_location(0, obj->in_obj, ch, recur);
-  } else {
-    sprintf(buf + strlen(buf), "in an unknown location\r\n");
-    send_to_char(buf, ch);
-  }
+  } else
+    send_to_char(ch, "in an unknown location\r\n");
 }
 
 
@@ -1396,28 +1352,25 @@ void perform_immort_where(struct char_da
   int num = 0, found = 0;
 
   if (!*arg) {
-    send_to_char("Players\r\n-------\r\n", ch);
+    send_to_char(ch, "Players\r\n-------\r\n");
     for (d = descriptor_list; d; d = d->next)
       if (STATE(d) == CON_PLAYING) {
 	i = (d->original ? d->original : d->character);
 	if (i && CAN_SEE(ch, i) && (IN_ROOM(i) != NOWHERE)) {
 	  if (d->original)
-	    sprintf(buf, "%-20s - [%5d] %s (in %s)\r\n",
-		    GET_NAME(i), GET_ROOM_VNUM(IN_ROOM(d->character)),
-		 world[IN_ROOM(d->character)].name, GET_NAME(d->character));
+	    send_to_char(ch, "%-20s - [%5d] %s (in %s)\r\n",
+		GET_NAME(i), GET_ROOM_VNUM(IN_ROOM(d->character)),
+		world[IN_ROOM(d->character)].name, GET_NAME(d->character));
 	  else
-	    sprintf(buf, "%-20s - [%5d] %s\r\n", GET_NAME(i),
-		    GET_ROOM_VNUM(IN_ROOM(i)), world[IN_ROOM(i)].name);
-	  send_to_char(buf, ch);
+	    send_to_char(ch, "%-20s - [%5d] %s\r\n", GET_NAME(i), GET_ROOM_VNUM(IN_ROOM(i)), world[IN_ROOM(i)].name);
 	}
       }
   } else {
     for (i = character_list; i; i = i->next)
       if (CAN_SEE(ch, i) && IN_ROOM(i) != NOWHERE && isname(arg, i->player.name)) {
 	found = 1;
-	sprintf(buf, "M%3d. %-25s - [%5d] %s\r\n", ++num, GET_NAME(i),
+	send_to_char(ch, "M%3d. %-25s - [%5d] %s\r\n", ++num, GET_NAME(i),
 		GET_ROOM_VNUM(IN_ROOM(i)), world[IN_ROOM(i)].name);
-	send_to_char(buf, ch);
       }
     for (num = 0, k = object_list; k; k = k->next)
       if (CAN_SEE_OBJ(ch, k) && isname(arg, k->name)) {
@@ -1425,7 +1378,7 @@ void perform_immort_where(struct char_da
 	print_object_location(++num, k, ch, TRUE);
       }
     if (!found)
-      send_to_char("Couldn't find any such thing.\r\n", ch);
+      send_to_char(ch, "Couldn't find any such thing.\r\n");
   }
 }
 
@@ -1433,6 +1386,8 @@ void perform_immort_where(struct char_da
 
 ACMD(do_where)
 {
+  char arg[MAX_INPUT_LENGTH];
+
   one_argument(argument, arg);
 
   if (GET_LEVEL(ch) >= LVL_IMMORT)
@@ -1445,102 +1400,111 @@ ACMD(do_where)
 
 ACMD(do_levels)
 {
-  int i;
+  char buf[MAX_STRING_LENGTH];
+  size_t i, len = 0, nlen;
 
   if (IS_NPC(ch)) {
-    send_to_char("You ain't nothin' but a hound-dog.\r\n", ch);
+    send_to_char(ch, "You ain't nothin' but a hound-dog.\r\n");
     return;
   }
-  *buf = '\0';
 
   for (i = 1; i < LVL_IMMORT; i++) {
-    sprintf(buf + strlen(buf), "[%2d] %8d-%-8d : ", i,
-	    level_exp(GET_CLASS(ch), i), level_exp(GET_CLASS(ch), i+1) - 1);
+    nlen = snprintf(buf + len, sizeof(buf) - len, "[%2d] %8d-%-8d : ", i,
+		level_exp(GET_CLASS(ch), i), level_exp(GET_CLASS(ch), i + 1) - 1);
+    if (len + nlen >= sizeof(buf) || nlen < 0)
+      break;
+    len += nlen;
+
     switch (GET_SEX(ch)) {
     case SEX_MALE:
     case SEX_NEUTRAL:
-      strcat(buf, title_male(GET_CLASS(ch), i));
+      nlen = snprintf(buf + len, sizeof(buf) - len, "%s\r\n", title_male(GET_CLASS(ch), i));
       break;
     case SEX_FEMALE:
-      strcat(buf, title_female(GET_CLASS(ch), i));
+      nlen = snprintf(buf + len, sizeof(buf) - len, "%s\r\n", title_female(GET_CLASS(ch), i));
       break;
     default:
-      send_to_char("Oh dear.  You seem to be sexless.\r\n", ch);
+      nlen = snprintf(buf + len, sizeof(buf) - len, "Oh dear.  You seem to be sexless.\r\n");
       break;
     }
-    strcat(buf, "\r\n");
+    if (len + nlen >= sizeof(buf) || nlen < 0)
+      break;
+    len += nlen;
   }
-  sprintf(buf + strlen(buf), "[%2d] %8d          : Immortality\r\n",
-	  LVL_IMMORT, level_exp(GET_CLASS(ch), LVL_IMMORT));
-  page_string(ch->desc, buf, 1);
+
+  if (len < sizeof(buf))
+    snprintf(buf + len, sizeof(buf) - len, "[%2d] %8d          : Immortality\r\n",
+		LVL_IMMORT, level_exp(GET_CLASS(ch), LVL_IMMORT));
+  page_string(ch->desc, buf, TRUE);
 }
 
 
 
 ACMD(do_consider)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *victim;
   int diff;
 
   one_argument(argument, buf);
 
   if (!(victim = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM))) {
-    send_to_char("Consider killing who?\r\n", ch);
+    send_to_char(ch, "Consider killing who?\r\n");
     return;
   }
   if (victim == ch) {
-    send_to_char("Easy!  Very easy indeed!\r\n", ch);
+    send_to_char(ch, "Easy!  Very easy indeed!\r\n");
     return;
   }
   if (!IS_NPC(victim)) {
-    send_to_char("Would you like to borrow a cross and a shovel?\r\n", ch);
+    send_to_char(ch, "Would you like to borrow a cross and a shovel?\r\n");
     return;
   }
   diff = (GET_LEVEL(victim) - GET_LEVEL(ch));
 
   if (diff <= -10)
-    send_to_char("Now where did that chicken go?\r\n", ch);
+    send_to_char(ch, "Now where did that chicken go?\r\n");
   else if (diff <= -5)
-    send_to_char("You could do it with a needle!\r\n", ch);
+    send_to_char(ch, "You could do it with a needle!\r\n");
   else if (diff <= -2)
-    send_to_char("Easy.\r\n", ch);
+    send_to_char(ch, "Easy.\r\n");
   else if (diff <= -1)
-    send_to_char("Fairly easy.\r\n", ch);
+    send_to_char(ch, "Fairly easy.\r\n");
   else if (diff == 0)
-    send_to_char("The perfect match!\r\n", ch);
+    send_to_char(ch, "The perfect match!\r\n");
   else if (diff <= 1)
-    send_to_char("You would need some luck!\r\n", ch);
+    send_to_char(ch, "You would need some luck!\r\n");
   else if (diff <= 2)
-    send_to_char("You would need a lot of luck!\r\n", ch);
+    send_to_char(ch, "You would need a lot of luck!\r\n");
   else if (diff <= 3)
-    send_to_char("You would need a lot of luck and great equipment!\r\n", ch);
+    send_to_char(ch, "You would need a lot of luck and great equipment!\r\n");
   else if (diff <= 5)
-    send_to_char("Do you feel lucky, punk?\r\n", ch);
+    send_to_char(ch, "Do you feel lucky, punk?\r\n");
   else if (diff <= 10)
-    send_to_char("Are you mad!?\r\n", ch);
+    send_to_char(ch, "Are you mad!?\r\n");
   else if (diff <= 100)
-    send_to_char("You ARE mad!\r\n", ch);
-
+    send_to_char(ch, "You ARE mad!\r\n");
 }
 
 
 
 ACMD(do_diagnose)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *vict;
 
   one_argument(argument, buf);
 
   if (*buf) {
     if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)))
-      send_to_char(NOPERSON, ch);
+      send_to_char(ch, "%s", NOPERSON);
     else
       diag_char_to_char(vict, ch);
   } else {
     if (FIGHTING(ch))
       diag_char_to_char(FIGHTING(ch), ch);
     else
-      send_to_char("Diagnose who?\r\n", ch);
+      send_to_char(ch, "Diagnose who?\r\n");
   }
 }
 
@@ -1551,6 +1515,7 @@ const char *ctypes[] = {
 
 ACMD(do_color)
 {
+  char arg[MAX_INPUT_LENGTH];
   int tp;
 
   if (IS_NPC(ch))
@@ -1559,34 +1524,34 @@ ACMD(do_color)
   one_argument(argument, arg);
 
   if (!*arg) {
-    sprintf(buf, "Your current color level is %s.\r\n", ctypes[COLOR_LEV(ch)]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "Your current color level is %s.\r\n", ctypes[COLOR_LEV(ch)]);
     return;
   }
   if (((tp = search_block(arg, ctypes, FALSE)) == -1)) {
-    send_to_char("Usage: color { Off | Sparse | Normal | Complete }\r\n", ch);
+    send_to_char(ch, "Usage: color { Off | Sparse | Normal | Complete }\r\n");
     return;
   }
   REMOVE_BIT(PRF_FLAGS(ch), PRF_COLOR_1 | PRF_COLOR_2);
   SET_BIT(PRF_FLAGS(ch), (PRF_COLOR_1 * (tp & 1)) | (PRF_COLOR_2 * (tp & 2) >> 1));
 
-  sprintf(buf, "Your %scolor%s is now %s.\r\n", CCRED(ch, C_SPR),
-	  CCNRM(ch, C_OFF), ctypes[tp]);
-  send_to_char(buf, ch);
+  send_to_char(ch, "Your %scolor%s is now %s.\r\n", CCRED(ch, C_SPR), CCNRM(ch, C_OFF), ctypes[tp]);
 }
 
 
 ACMD(do_toggle)
 {
+  char buf2[4];
+
   if (IS_NPC(ch))
     return;
+
   if (GET_WIMP_LEV(ch) == 0)
-    strcpy(buf2, "OFF");
+    strcpy(buf2, "OFF");	/* strcpy: OK */
   else
-    sprintf(buf2, "%-3d", GET_WIMP_LEV(ch));
+    sprintf(buf2, "%-3.3d", GET_WIMP_LEV(ch));	/* sprintf: OK */
 
   if (GET_LEVEL(ch) >= LVL_IMMORT) {
-    sprintf(buf,
+    send_to_char(ch,
 	  "      No Hassle: %-3s    "
 	  "      Holylight: %-3s    "
 	  "     Room Flags: %-3s\r\n",
@@ -1594,10 +1559,9 @@ ACMD(do_toggle)
 	ONOFF(PRF_FLAGGED(ch, PRF_HOLYLIGHT)),
 	ONOFF(PRF_FLAGGED(ch, PRF_ROOMFLAGS))
     );
-    send_to_char(buf, ch);
   }
 
-  sprintf(buf,
+  send_to_char(ch,
 	  "Hit Pnt Display: %-3s    "
 	  "     Brief Mode: %-3s    "
 	  " Summon Protect: %-3s\r\n"
@@ -1641,8 +1605,6 @@ ACMD(do_toggle)
 	  ONOFF(!PRF_FLAGGED(ch, PRF_NOGRATZ)),
 
 	  ctypes[COLOR_LEV(ch)]);
-
-  send_to_char(buf, ch);
 }
 
 
@@ -1675,16 +1637,17 @@ ACMD(do_commands)
   int no, i, cmd_num;
   int wizhelp = 0, socials = 0;
   struct char_data *vict;
+  char arg[MAX_INPUT_LENGTH];
 
   one_argument(argument, arg);
 
   if (*arg) {
     if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)) || IS_NPC(vict)) {
-      send_to_char("Who is that?\r\n", ch);
+      send_to_char(ch, "Who is that?\r\n");
       return;
     }
     if (GET_LEVEL(ch) < GET_LEVEL(vict)) {
-      send_to_char("You can't see the commands of people above your level.\r\n", ch);
+      send_to_char(ch, "You can't see the commands of people above your level.\r\n");
       return;
     }
   } else
@@ -1695,7 +1658,7 @@ ACMD(do_commands)
   else if (subcmd == SCMD_WIZHELP)
     wizhelp = 1;
 
-  sprintf(buf, "The following %s%s are available to %s:\r\n",
+  send_to_char(ch, "The following %s%s are available to %s:\r\n",
 	  wizhelp ? "privileged " : "",
 	  socials ? "socials" : "commands",
 	  vict == ch ? "you" : GET_NAME(vict));
@@ -1713,10 +1676,9 @@ ACMD(do_commands)
     if (!wizhelp && socials != (cmd_info[i].command_pointer == do_action || cmd_info[i].command_pointer == do_insult))
       continue;
 
-    sprintf(buf + strlen(buf), "%-11s%s", cmd_info[i].command, no++ % 7 == 0 ? "\r\n" : "");
+    send_to_char(ch, "%-11s%s", cmd_info[i].command, no++ % 7 == 0 ? "\r\n" : "");
   }
 
   if (no % 7 != 1)
-    strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+    send_to_char(ch, "\r\n");
 }
Index: src/act.item.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.item.c,v
retrieving revision 1.45
retrieving revision 1.51
diff -u -p -r1.45 -r1.51
--- src/act.item.c	2001/12/04 12:22:54	1.45
+++ src/act.item.c	2002/04/09 14:12:15	1.51
@@ -103,8 +103,7 @@ ACMD(do_put)
   int obj_dotmode, cont_dotmode, found = 0, howmany = 1;
   char *theobj, *thecont;
 
-  argument = two_arguments(argument, arg1, arg2);
-  one_argument(argument, arg3);
+  one_argument(two_arguments(argument, arg1, arg2), arg3);	/* three_arguments */
 
   if (*arg3 && is_number(arg1)) {
     howmany = atoi(arg1);
@@ -118,33 +117,32 @@ ACMD(do_put)
   cont_dotmode = find_all_dots(thecont);
 
   if (!*theobj)
-    send_to_char("Put what in what?\r\n", ch);
+    send_to_char(ch, "Put what in what?\r\n");
   else if (cont_dotmode != FIND_INDIV)
-    send_to_char("You can only put things into one container at a time.\r\n", ch);
+    send_to_char(ch, "You can only put things into one container at a time.\r\n");
   else if (!*thecont) {
-    sprintf(buf, "What do you want to put %s in?\r\n",
-	    ((obj_dotmode == FIND_INDIV) ? "it" : "them"));
-    send_to_char(buf, ch);
+    send_to_char(ch, "What do you want to put %s in?\r\n", obj_dotmode == FIND_INDIV ? "it" : "them");
   } else {
     generic_find(thecont, FIND_OBJ_INV | FIND_OBJ_ROOM, ch, &tmp_char, &cont);
-    if (!cont) {
-      sprintf(buf, "You don't see %s %s here.\r\n", AN(thecont), thecont);
-      send_to_char(buf, ch);
-    } else if (GET_OBJ_TYPE(cont) != ITEM_CONTAINER)
+    if (!cont)
+      send_to_char(ch, "You don't see %s %s here.\r\n", AN(thecont), thecont);
+    else if (GET_OBJ_TYPE(cont) != ITEM_CONTAINER)
       act("$p is not a container.", FALSE, ch, cont, 0, TO_CHAR);
     else if (OBJVAL_FLAGGED(cont, CONT_CLOSED))
-      send_to_char("You'd better open it first!\r\n", ch);
+      send_to_char(ch, "You'd better open it first!\r\n");
     else {
       if (obj_dotmode == FIND_INDIV) {	/* put <obj> <container> */
-	if (!(obj = get_obj_in_list_vis(ch, theobj, NULL, ch->carrying))) {
-	  sprintf(buf, "You aren't carrying %s %s.\r\n", AN(theobj), theobj);
-	  send_to_char(buf, ch);
-	} else if (obj == cont)
-	  send_to_char("You attempt to fold it into itself, but fail.\r\n", ch);
+	if (!(obj = get_obj_in_list_vis(ch, theobj, NULL, ch->carrying)))
+	  send_to_char(ch, "You aren't carrying %s %s.\r\n", AN(theobj), theobj);
+	else if (obj == cont && howmany == 1)
+	  send_to_char(ch, "You attempt to fold it into itself, but fail.\r\n");
 	else {
-	  while(obj && howmany--) {
+	  while (obj && howmany) {
 	    next_obj = obj->next_content;
-	    perform_put(ch, obj, cont);
+            if (obj != cont) {
+              howmany--;
+	      perform_put(ch, obj, cont);
+            }
 	    obj = get_obj_in_list_vis(ch, theobj, NULL, next_obj);
 	  }
 	}
@@ -159,11 +157,9 @@ ACMD(do_put)
 	}
 	if (!found) {
 	  if (obj_dotmode == FIND_ALL)
-	    send_to_char("You don't seem to have anything to put in it.\r\n", ch);
-	  else {
-	    sprintf(buf, "You don't seem to have any %ss.\r\n", theobj);
-	    send_to_char(buf, ch);
-	  }
+	    send_to_char(ch, "You don't seem to have anything to put in it.\r\n");
+	  else
+	    send_to_char(ch, "You don't seem to have any %ss.\r\n", theobj);
 	}
       }
     }
@@ -200,11 +196,9 @@ void get_check_money(struct char_data *c
   GET_GOLD(ch) += value;
 
   if (value == 1)
-    send_to_char("There was 1 coin.\r\n", ch);
-  else {
-    sprintf(buf, "There were %d coins.\r\n", value);
-    send_to_char(buf, ch);
-  }
+    send_to_char(ch, "There was 1 coin.\r\n");
+  else
+    send_to_char(ch, "There were %d coins.\r\n", value);
 }
 
 
@@ -237,7 +231,9 @@ void get_from_container(struct char_data
     act("$p is closed.", FALSE, ch, cont, 0, TO_CHAR);
   else if (obj_dotmode == FIND_INDIV) {
     if (!(obj = get_obj_in_list_vis(ch, arg, NULL, cont->contains))) {
-      sprintf(buf, "There doesn't seem to be %s %s in $p.", AN(arg), arg);
+      char buf[MAX_STRING_LENGTH];
+
+      snprintf(buf, sizeof(buf), "There doesn't seem to be %s %s in $p.", AN(arg), arg);
       act(buf, FALSE, ch, cont, 0, TO_CHAR);
     } else {
       struct obj_data *obj_next;
@@ -249,7 +245,7 @@ void get_from_container(struct char_data
     }
   } else {
     if (obj_dotmode == FIND_ALLDOT && !*arg) {
-      send_to_char("Get all of what?\r\n", ch);
+      send_to_char(ch, "Get all of what?\r\n");
       return;
     }
     for (obj = cont->contains; obj; obj = next_obj) {
@@ -264,7 +260,9 @@ void get_from_container(struct char_data
       if (obj_dotmode == FIND_ALL)
 	act("$p seems to be empty.", FALSE, ch, cont, 0, TO_CHAR);
       else {
-	sprintf(buf, "You can't seem to find any %ss in $p.", arg);
+        char buf[MAX_STRING_LENGTH];
+
+	snprintf(buf, sizeof(buf), "You can't seem to find any %ss in $p.", arg);
 	act(buf, FALSE, ch, cont, 0, TO_CHAR);
       }
     }
@@ -294,10 +292,9 @@ void get_from_room(struct char_data *ch,
   dotmode = find_all_dots(arg);
 
   if (dotmode == FIND_INDIV) {
-    if (!(obj = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents))) {
-      sprintf(buf, "You don't see %s %s here.\r\n", AN(arg), arg);
-      send_to_char(buf, ch);
-    } else {
+    if (!(obj = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents)))
+      send_to_char(ch, "You don't see %s %s here.\r\n", AN(arg), arg);
+    else {
       struct obj_data *obj_next;
       while(obj && howmany--) {
 	obj_next = obj->next_content;
@@ -307,7 +304,7 @@ void get_from_room(struct char_data *ch,
     }
   } else {
     if (dotmode == FIND_ALLDOT && !*arg) {
-      send_to_char("Get all of what?\r\n", ch);
+      send_to_char(ch, "Get all of what?\r\n");
       return;
     }
     for (obj = world[IN_ROOM(ch)].contents; obj; obj = next_obj) {
@@ -320,11 +317,9 @@ void get_from_room(struct char_data *ch,
     }
     if (!found) {
       if (dotmode == FIND_ALL)
-	send_to_char("There doesn't seem to be anything here.\r\n", ch);
-      else {
-	sprintf(buf, "You don't see any %ss here.\r\n", arg);
-	send_to_char(buf, ch);
-      }
+	send_to_char(ch, "There doesn't seem to be anything here.\r\n");
+      else
+	send_to_char(ch, "You don't see any %ss here.\r\n", arg);
     }
   }
 }
@@ -341,11 +336,10 @@ ACMD(do_get)
   struct obj_data *cont;
   struct char_data *tmp_char;
 
-  argument = two_arguments(argument, arg1, arg2);
-  one_argument(argument, arg3);
+  one_argument(two_arguments(argument, arg1, arg2), arg3);	/* three_arguments */
 
   if (!*arg1)
-    send_to_char("Get what?\r\n", ch);
+    send_to_char(ch, "Get what?\r\n");
   else if (!*arg2)
     get_from_room(ch, arg1, 1);
   else if (is_number(arg1) && !*arg3)
@@ -354,22 +348,21 @@ ACMD(do_get)
     int amount = 1;
     if (is_number(arg1)) {
       amount = atoi(arg1);
-      strcpy(arg1, arg2);
-      strcpy(arg2, arg3);
+      strcpy(arg1, arg2);	/* strcpy: OK (sizeof: arg1 == arg2) */
+      strcpy(arg2, arg3);	/* strcpy: OK (sizeof: arg2 == arg3) */
     }
     cont_dotmode = find_all_dots(arg2);
     if (cont_dotmode == FIND_INDIV) {
       mode = generic_find(arg2, FIND_OBJ_INV | FIND_OBJ_ROOM, ch, &tmp_char, &cont);
-      if (!cont) {
-	sprintf(buf, "You don't have %s %s.\r\n", AN(arg2), arg2);
-	send_to_char(buf, ch);
-      } else if (GET_OBJ_TYPE(cont) != ITEM_CONTAINER)
+      if (!cont)
+	send_to_char(ch, "You don't have %s %s.\r\n", AN(arg2), arg2);
+      else if (GET_OBJ_TYPE(cont) != ITEM_CONTAINER)
 	act("$p is not a container.", FALSE, ch, cont, 0, TO_CHAR);
       else
 	get_from_container(ch, cont, arg1, mode, amount);
     } else {
       if (cont_dotmode == FIND_ALLDOT && !*arg2) {
-	send_to_char("Get from all of what?\r\n", ch);
+	send_to_char(ch, "Get from all of what?\r\n");
 	return;
       }
       for (cont = ch->carrying; cont; cont = cont->next_content)
@@ -396,11 +389,9 @@ ACMD(do_get)
 	}
       if (!found) {
 	if (cont_dotmode == FIND_ALL)
-	  send_to_char("You can't seem to find any containers.\r\n", ch);
-	else {
-	  sprintf(buf, "You can't seem to find any %ss here.\r\n", arg2);
-	  send_to_char(buf, ch);
-	}
+	  send_to_char(ch, "You can't seem to find any containers.\r\n");
+	else
+	  send_to_char(ch, "You can't seem to find any %ss here.\r\n", arg2);
       }
     }
   }
@@ -413,30 +404,35 @@ void perform_drop_gold(struct char_data 
   struct obj_data *obj;
 
   if (amount <= 0)
-    send_to_char("Heh heh heh.. we are jolly funny today, eh?\r\n", ch);
+    send_to_char(ch, "Heh heh heh.. we are jolly funny today, eh?\r\n");
   else if (GET_GOLD(ch) < amount)
-    send_to_char("You don't have that many coins!\r\n", ch);
+    send_to_char(ch, "You don't have that many coins!\r\n");
   else {
     if (mode != SCMD_JUNK) {
       WAIT_STATE(ch, PULSE_VIOLENCE);	/* to prevent coin-bombing */
       obj = create_money(amount);
       if (mode == SCMD_DONATE) {
-	send_to_char("You throw some gold into the air where it disappears in a puff of smoke!\r\n", ch);
+	send_to_char(ch, "You throw some gold into the air where it disappears in a puff of smoke!\r\n");
 	act("$n throws some gold into the air where it disappears in a puff of smoke!",
 	    FALSE, ch, 0, 0, TO_ROOM);
 	obj_to_room(obj, RDR);
 	act("$p suddenly appears in a puff of orange smoke!", 0, 0, obj, 0, TO_ROOM);
       } else {
-	send_to_char("You drop some gold.\r\n", ch);
-	sprintf(buf, "$n drops %s.", money_desc(amount));
+        char buf[MAX_STRING_LENGTH];
+
+	snprintf(buf, sizeof(buf), "$n drops %s.", money_desc(amount));
 	act(buf, TRUE, ch, 0, 0, TO_ROOM);
+
+	send_to_char(ch, "You drop some gold.\r\n");
 	obj_to_room(obj, IN_ROOM(ch));
       }
     } else {
-      sprintf(buf, "$n drops %s which disappears in a puff of smoke!",
-	      money_desc(amount));
+      char buf[MAX_STRING_LENGTH];
+
+      snprintf(buf, sizeof(buf), "$n drops %s which disappears in a puff of smoke!", money_desc(amount));
       act(buf, FALSE, ch, 0, 0, TO_ROOM);
-      send_to_char("You drop some gold which disappears in a puff of smoke!\r\n", ch);
+
+      send_to_char(ch, "You drop some gold which disappears in a puff of smoke!\r\n");
     }
     GET_GOLD(ch) -= amount;
   }
@@ -449,17 +445,21 @@ void perform_drop_gold(struct char_data 
 int perform_drop(struct char_data *ch, struct obj_data *obj,
 		     byte mode, const char *sname, room_rnum RDR)
 {
+  char buf[MAX_STRING_LENGTH];
   int value;
 
   if (OBJ_FLAGGED(obj, ITEM_NODROP)) {
-    sprintf(buf, "You can't %s $p, it must be CURSED!", sname);
+    snprintf(buf, sizeof(buf), "You can't %s $p, it must be CURSED!", sname);
     act(buf, FALSE, ch, obj, 0, TO_CHAR);
     return (0);
   }
-  sprintf(buf, "You %s $p.%s", sname, VANISH(mode));
+
+  snprintf(buf, sizeof(buf), "You %s $p.%s", sname, VANISH(mode));
   act(buf, FALSE, ch, obj, 0, TO_CHAR);
-  sprintf(buf, "$n %ss $p.%s", sname, VANISH(mode));
+
+  snprintf(buf, sizeof(buf), "$n %ss $p.%s", sname, VANISH(mode));
   act(buf, TRUE, ch, obj, 0, TO_ROOM);
+
   obj_from_char(obj);
 
   if ((mode == SCMD_DONATE) && OBJ_FLAGGED(obj, ITEM_NODONATE))
@@ -489,6 +489,7 @@ int perform_drop(struct char_data *ch, s
 
 ACMD(do_drop)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct obj_data *obj, *next_obj;
   room_rnum RDR = 0;
   byte mode = SCMD_DROP;
@@ -503,7 +504,7 @@ ACMD(do_drop)
   case SCMD_DONATE:
     sname = "donate";
     mode = SCMD_DONATE;
-    switch (number(0, 2)) {
+    switch (rand_number(0, 2)) {
     case 0:
       mode = SCMD_JUNK;
       break;
@@ -516,7 +517,7 @@ ACMD(do_drop)
 */
     }
     if (RDR == NOWHERE) {
-      send_to_char("Sorry, you can't donate anything right now.\r\n", ch);
+      send_to_char(ch, "Sorry, you can't donate anything right now.\r\n");
       return;
     }
     break;
@@ -528,8 +529,7 @@ ACMD(do_drop)
   argument = one_argument(argument, arg);
 
   if (!*arg) {
-    sprintf(buf, "What do you want to %s?\r\n", sname);
-    send_to_char(buf, ch);
+    send_to_char(ch, "What do you want to %s?\r\n", sname);
     return;
   } else if (is_number(arg)) {
     multi = atoi(arg);
@@ -537,14 +537,12 @@ ACMD(do_drop)
     if (!str_cmp("coins", arg) || !str_cmp("coin", arg))
       perform_drop_gold(ch, multi, mode, RDR);
     else if (multi <= 0)
-      send_to_char("Yeah, that makes sense.\r\n", ch);
-    else if (!*arg) {
-      sprintf(buf, "What do you want to %s %d of?\r\n", sname, multi);
-      send_to_char(buf, ch);
-    } else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-      sprintf(buf, "You don't seem to have any %ss.\r\n", arg);
-      send_to_char(buf, ch);
-    } else {
+      send_to_char(ch, "Yeah, that makes sense.\r\n");
+    else if (!*arg)
+      send_to_char(ch, "What do you want to %s %d of?\r\n", sname, multi);
+    else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+      send_to_char(ch, "You don't seem to have any %ss.\r\n", arg);
+    else {
       do {
         next_obj = get_obj_in_list_vis(ch, arg, NULL, obj->next_content);
         amount += perform_drop(ch, obj, mode, sname, RDR);
@@ -557,14 +555,14 @@ ACMD(do_drop)
     /* Can't junk or donate all */
     if ((dotmode == FIND_ALL) && (subcmd == SCMD_JUNK || subcmd == SCMD_DONATE)) {
       if (subcmd == SCMD_JUNK)
-	send_to_char("Go to the dump if you want to junk EVERYTHING!\r\n", ch);
+	send_to_char(ch, "Go to the dump if you want to junk EVERYTHING!\r\n");
       else
-	send_to_char("Go do the donation room if you want to donate EVERYTHING!\r\n", ch);
+	send_to_char(ch, "Go do the donation room if you want to donate EVERYTHING!\r\n");
       return;
     }
     if (dotmode == FIND_ALL) {
       if (!ch->carrying)
-	send_to_char("You don't seem to be carrying anything.\r\n", ch);
+	send_to_char(ch, "You don't seem to be carrying anything.\r\n");
       else
 	for (obj = ch->carrying; obj; obj = next_obj) {
 	  next_obj = obj->next_content;
@@ -572,30 +570,27 @@ ACMD(do_drop)
 	}
     } else if (dotmode == FIND_ALLDOT) {
       if (!*arg) {
-	sprintf(buf, "What do you want to %s all of?\r\n", sname);
-	send_to_char(buf, ch);
+	send_to_char(ch, "What do you want to %s all of?\r\n", sname);
 	return;
       }
-      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-	sprintf(buf, "You don't seem to have any %ss.\r\n", arg);
-	send_to_char(buf, ch);
-      }
+      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+	send_to_char(ch, "You don't seem to have any %ss.\r\n", arg);
+
       while (obj) {
 	next_obj = get_obj_in_list_vis(ch, arg, NULL, obj->next_content);
 	amount += perform_drop(ch, obj, mode, sname, RDR);
 	obj = next_obj;
       }
     } else {
-      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-	sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-	send_to_char(buf, ch);
-      } else
+      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+	send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
+      else
 	amount += perform_drop(ch, obj, mode, sname, RDR);
     }
   }
 
   if (amount && (subcmd == SCMD_JUNK)) {
-    send_to_char("You have been rewarded by the gods!\r\n", ch);
+    send_to_char(ch, "You have been rewarded by the gods!\r\n");
     act("$n has been rewarded by the gods!", TRUE, ch, 0, 0, TO_ROOM);
     GET_GOLD(ch) += amount;
   }
@@ -629,36 +624,41 @@ struct char_data *give_find_vict(struct 
 {
   struct char_data *vict;
 
-  if (!*arg) {
-    send_to_char("To who?\r\n", ch);
-    return (NULL);
-  } else if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) {
-    send_to_char(NOPERSON, ch);
-    return (NULL);
-  } else if (vict == ch) {
-    send_to_char("What's the point of that?\r\n", ch);
-    return (NULL);
-  } else
+  skip_spaces(&arg);
+  if (!*arg)
+    send_to_char(ch, "To who?\r\n");
+  else if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)))
+    send_to_char(ch, "%s", NOPERSON);
+  else if (vict == ch)
+    send_to_char(ch, "What's the point of that?\r\n");
+  else
     return (vict);
+
+  return (NULL);
 }
 
 
 void perform_give_gold(struct char_data *ch, struct char_data *vict,
 		            int amount)
 {
+  char buf[MAX_STRING_LENGTH];
+
   if (amount <= 0) {
-    send_to_char("Heh heh heh ... we are jolly funny today, eh?\r\n", ch);
+    send_to_char(ch, "Heh heh heh ... we are jolly funny today, eh?\r\n");
     return;
   }
   if ((GET_GOLD(ch) < amount) && (IS_NPC(ch) || (GET_LEVEL(ch) < LVL_GOD))) {
-    send_to_char("You don't have that many coins!\r\n", ch);
+    send_to_char(ch, "You don't have that many coins!\r\n");
     return;
   }
-  send_to_char(OK, ch);
-  sprintf(buf, "$n gives you %d gold coin%s.", amount, amount == 1 ? "" : "s");
+  send_to_char(ch, "%s", OK);
+
+  snprintf(buf, sizeof(buf), "$n gives you %d gold coin%s.", amount, amount == 1 ? "" : "s");
   act(buf, FALSE, ch, 0, vict, TO_VICT);
-  sprintf(buf, "$n gives %s to $N.", money_desc(amount));
+
+  snprintf(buf, sizeof(buf), "$n gives %s to $N.", money_desc(amount));
   act(buf, TRUE, ch, 0, vict, TO_NOTVICT);
+
   if (IS_NPC(ch) || (GET_LEVEL(ch) < LVL_GOD))
     GET_GOLD(ch) -= amount;
   GET_GOLD(vict) += amount;
@@ -667,6 +667,7 @@ void perform_give_gold(struct char_data 
 
 ACMD(do_give)
 {
+  char arg[MAX_STRING_LENGTH];
   int amount, dotmode;
   struct char_data *vict;
   struct obj_data *obj, *next_obj;
@@ -674,7 +675,7 @@ ACMD(do_give)
   argument = one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Give what to who?\r\n", ch);
+    send_to_char(ch, "Give what to who?\r\n");
   else if (is_number(arg)) {
     amount = atoi(arg);
     argument = one_argument(argument, arg);
@@ -683,15 +684,13 @@ ACMD(do_give)
       if ((vict = give_find_vict(ch, arg)) != NULL)
 	perform_give_gold(ch, vict, amount);
       return;
-    } else if (!*arg) {	/* Give multiple code. */
-      sprintf(buf, "What do you want to give %d of?\r\n", amount);
-      send_to_char(buf, ch);
-    } else if (!(vict = give_find_vict(ch, argument))) {
-      return;
-    } else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-      sprintf(buf, "You don't seem to have any %ss.\r\n", arg);
-      send_to_char(buf, ch);
-    } else {
+    } else if (!*arg)	/* Give multiple code. */
+      send_to_char(ch, "What do you want to give %d of?\r\n", amount);
+    else if (!(vict = give_find_vict(ch, argument)))
+      return;
+    else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) 
+      send_to_char(ch, "You don't seem to have any %ss.\r\n", arg);
+    else {
       while (obj && amount--) {
 	next_obj = get_obj_in_list_vis(ch, arg, NULL, obj->next_content);
 	perform_give(ch, vict, obj);
@@ -699,23 +698,24 @@ ACMD(do_give)
       }
     }
   } else {
+    char buf1[MAX_INPUT_LENGTH];
+
     one_argument(argument, buf1);
     if (!(vict = give_find_vict(ch, buf1)))
       return;
     dotmode = find_all_dots(arg);
     if (dotmode == FIND_INDIV) {
-      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-	sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-	send_to_char(buf, ch);
-      } else
+      if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+	send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
+      else
 	perform_give(ch, vict, obj);
     } else {
       if (dotmode == FIND_ALLDOT && !*arg) {
-	send_to_char("All of what?\r\n", ch);
+	send_to_char(ch, "All of what?\r\n");
 	return;
       }
       if (!ch->carrying)
-	send_to_char("You don't seem to be holding anything.\r\n", ch);
+	send_to_char(ch, "You don't seem to be holding anything.\r\n");
       else
 	for (obj = ch->carrying; obj; obj = next_obj) {
 	  next_obj = obj->next_content;
@@ -782,8 +782,8 @@ void name_from_drinkcon(struct obj_data 
       continue;
 
     if (*new_name)
-      strcat(new_name, " ");
-    strncat(new_name, cur_name, cpylen);
+      strcat(new_name, " ");	/* strcat: OK (size precalculated) */
+    strncat(new_name, cur_name, cpylen);	/* strncat: OK (size precalculated) */
   }
 
   if (GET_OBJ_RNUM(obj) == NOTHING || obj->name != obj_proto[GET_OBJ_RNUM(obj)].name)
@@ -801,10 +801,11 @@ void name_to_drinkcon(struct obj_data *o
     return;
 
   CREATE(new_name, char, strlen(obj->name) + strlen(drinknames[type]) + 2);
-  sprintf(new_name, "%s %s", obj->name, drinknames[type]);
+  sprintf(new_name, "%s %s", obj->name, drinknames[type]);	/* sprintf: OK */
 
   if (GET_OBJ_RNUM(obj) == NOTHING || obj->name != obj_proto[GET_OBJ_RNUM(obj)].name)
     free(obj->name);
+
   obj->name = new_name;
 }
 
@@ -812,6 +813,7 @@ void name_to_drinkcon(struct obj_data *o
 
 ACMD(do_drink)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct obj_data *temp;
   struct affected_type af;
   int amount, weight;
@@ -823,55 +825,55 @@ ACMD(do_drink)
     return;
 
   if (!*arg) {
-    send_to_char("Drink from what?\r\n", ch);
+    send_to_char(ch, "Drink from what?\r\n");
     return;
   }
   if (!(temp = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
     if (!(temp = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents))) {
-      send_to_char("You can't find it!\r\n", ch);
+      send_to_char(ch, "You can't find it!\r\n");
       return;
     } else
       on_ground = 1;
   }
   if ((GET_OBJ_TYPE(temp) != ITEM_DRINKCON) &&
       (GET_OBJ_TYPE(temp) != ITEM_FOUNTAIN)) {
-    send_to_char("You can't drink from that!\r\n", ch);
+    send_to_char(ch, "You can't drink from that!\r\n");
     return;
   }
   if (on_ground && (GET_OBJ_TYPE(temp) == ITEM_DRINKCON)) {
-    send_to_char("You have to be holding that to drink from it.\r\n", ch);
+    send_to_char(ch, "You have to be holding that to drink from it.\r\n");
     return;
   }
   if ((GET_COND(ch, DRUNK) > 10) && (GET_COND(ch, THIRST) > 0)) {
     /* The pig is drunk */
-    send_to_char("You can't seem to get close enough to your mouth.\r\n", ch);
+    send_to_char(ch, "You can't seem to get close enough to your mouth.\r\n");
     act("$n tries to drink but misses $s mouth!", TRUE, ch, 0, 0, TO_ROOM);
     return;
   }
   if ((GET_COND(ch, FULL) > 20) && (GET_COND(ch, THIRST) > 0)) {
-    send_to_char("Your stomach can't contain anymore!\r\n", ch);
+    send_to_char(ch, "Your stomach can't contain anymore!\r\n");
     return;
   }
   if (!GET_OBJ_VAL(temp, 1)) {
-    send_to_char("It's empty.\r\n", ch);
+    send_to_char(ch, "It's empty.\r\n");
     return;
   }
   if (subcmd == SCMD_DRINK) {
-    sprintf(buf, "$n drinks %s from $p.", drinks[GET_OBJ_VAL(temp, 2)]);
+    char buf[MAX_STRING_LENGTH];
+
+    snprintf(buf, sizeof(buf), "$n drinks %s from $p.", drinks[GET_OBJ_VAL(temp, 2)]);
     act(buf, TRUE, ch, temp, 0, TO_ROOM);
 
-    sprintf(buf, "You drink the %s.\r\n", drinks[GET_OBJ_VAL(temp, 2)]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You drink the %s.\r\n", drinks[GET_OBJ_VAL(temp, 2)]);
 
     if (drink_aff[GET_OBJ_VAL(temp, 2)][DRUNK] > 0)
       amount = (25 - GET_COND(ch, THIRST)) / drink_aff[GET_OBJ_VAL(temp, 2)][DRUNK];
     else
-      amount = number(3, 10);
+      amount = rand_number(3, 10);
 
   } else {
     act("$n sips from $p.", TRUE, ch, temp, 0, TO_ROOM);
-    sprintf(buf, "It tastes like %s.\r\n", drinks[GET_OBJ_VAL(temp, 2)]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "It tastes like %s.\r\n", drinks[GET_OBJ_VAL(temp, 2)]);
     amount = 1;
   }
 
@@ -887,16 +889,16 @@ ACMD(do_drink)
   gain_condition(ch, THIRST, drink_aff[GET_OBJ_VAL(temp, 2)][THIRST] * amount / 4);
 
   if (GET_COND(ch, DRUNK) > 10)
-    send_to_char("You feel drunk.\r\n", ch);
+    send_to_char(ch, "You feel drunk.\r\n");
 
   if (GET_COND(ch, THIRST) > 20)
-    send_to_char("You don't feel thirsty any more.\r\n", ch);
+    send_to_char(ch, "You don't feel thirsty any more.\r\n");
 
   if (GET_COND(ch, FULL) > 20)
-    send_to_char("You are full.\r\n", ch);
+    send_to_char(ch, "You are full.\r\n");
 
   if (GET_OBJ_VAL(temp, 3)) {	/* The crap was poisoned ! */
-    send_to_char("Oops, it tasted rather strange!\r\n", ch);
+    send_to_char(ch, "Oops, it tasted rather strange!\r\n");
     act("$n chokes and utters some strange sounds.", TRUE, ch, 0, 0, TO_ROOM);
 
     af.type = SPELL_POISON;
@@ -920,6 +922,7 @@ ACMD(do_drink)
 
 ACMD(do_eat)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct obj_data *food;
   struct affected_type af;
   int amount;
@@ -930,12 +933,11 @@ ACMD(do_eat)
     return;
 
   if (!*arg) {
-    send_to_char("Eat what?\r\n", ch);
+    send_to_char(ch, "Eat what?\r\n");
     return;
   }
   if (!(food = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-    sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
     return;
   }
   if (subcmd == SCMD_TASTE && ((GET_OBJ_TYPE(food) == ITEM_DRINKCON) ||
@@ -944,11 +946,11 @@ ACMD(do_eat)
     return;
   }
   if ((GET_OBJ_TYPE(food) != ITEM_FOOD) && (GET_LEVEL(ch) < LVL_GOD)) {
-    send_to_char("You can't eat THAT!\r\n", ch);
+    send_to_char(ch, "You can't eat THAT!\r\n");
     return;
   }
   if (GET_COND(ch, FULL) > 20) {/* Stomach full */
-    send_to_char("You are too full to eat more!\r\n", ch);
+    send_to_char(ch, "You are too full to eat more!\r\n");
     return;
   }
   if (subcmd == SCMD_EAT) {
@@ -964,11 +966,11 @@ ACMD(do_eat)
   gain_condition(ch, FULL, amount);
 
   if (GET_COND(ch, FULL) > 20)
-    send_to_char("You are full.\r\n", ch);
+    send_to_char(ch, "You are full.\r\n");
 
   if (GET_OBJ_VAL(food, 3) && (GET_LEVEL(ch) < LVL_IMMORT)) {
     /* The crap was poisoned ! */
-    send_to_char("Oops, that tasted rather strange!\r\n", ch);
+    send_to_char(ch, "Oops, that tasted rather strange!\r\n");
     act("$n coughs and utters some strange sounds.", FALSE, ch, 0, 0, TO_ROOM);
 
     af.type = SPELL_POISON;
@@ -982,7 +984,7 @@ ACMD(do_eat)
     extract_obj(food);
   else {
     if (!(--GET_OBJ_VAL(food, 0))) {
-      send_to_char("There's nothing left now.\r\n", ch);
+      send_to_char(ch, "There's nothing left now.\r\n");
       extract_obj(food);
     }
   }
@@ -991,8 +993,7 @@ ACMD(do_eat)
 
 ACMD(do_pour)
 {
-  char arg1[MAX_INPUT_LENGTH];
-  char arg2[MAX_INPUT_LENGTH];
+  char arg1[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH];
   struct obj_data *from_obj = NULL, *to_obj = NULL;
   int amount;
 
@@ -1000,25 +1001,25 @@ ACMD(do_pour)
 
   if (subcmd == SCMD_POUR) {
     if (!*arg1) {		/* No arguments */
-      send_to_char("From what do you want to pour?\r\n", ch);
+      send_to_char(ch, "From what do you want to pour?\r\n");
       return;
     }
     if (!(from_obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying))) {
-      send_to_char("You can't find it!\r\n", ch);
+      send_to_char(ch, "You can't find it!\r\n");
       return;
     }
     if (GET_OBJ_TYPE(from_obj) != ITEM_DRINKCON) {
-      send_to_char("You can't pour from that!\r\n", ch);
+      send_to_char(ch, "You can't pour from that!\r\n");
       return;
     }
   }
   if (subcmd == SCMD_FILL) {
     if (!*arg1) {		/* no arguments */
-      send_to_char("What do you want to fill?  And what are you filling it from?\r\n", ch);
+      send_to_char(ch, "What do you want to fill?  And what are you filling it from?\r\n");
       return;
     }
     if (!(to_obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying))) {
-      send_to_char("You can't find it!\r\n", ch);
+      send_to_char(ch, "You can't find it!\r\n");
       return;
     }
     if (GET_OBJ_TYPE(to_obj) != ITEM_DRINKCON) {
@@ -1030,8 +1031,7 @@ ACMD(do_pour)
       return;
     }
     if (!(from_obj = get_obj_in_list_vis(ch, arg2, NULL, world[IN_ROOM(ch)].contents))) {
-      sprintf(buf, "There doesn't seem to be %s %s here.\r\n", AN(arg2), arg2);
-      send_to_char(buf, ch);
+      send_to_char(ch, "There doesn't seem to be %s %s here.\r\n", AN(arg2), arg2);
       return;
     }
     if (GET_OBJ_TYPE(from_obj) != ITEM_FOUNTAIN) {
@@ -1045,7 +1045,7 @@ ACMD(do_pour)
   }
   if (subcmd == SCMD_POUR) {	/* pour */
     if (!*arg2) {
-      send_to_char("Where do you want it?  Out or in what?\r\n", ch);
+      send_to_char(ch, "Where do you want it?  Out or in what?\r\n");
       return;
     }
     if (!str_cmp(arg2, "out")) {
@@ -1062,33 +1062,31 @@ ACMD(do_pour)
       return;
     }
     if (!(to_obj = get_obj_in_list_vis(ch, arg2, NULL, ch->carrying))) {
-      send_to_char("You can't find it!\r\n", ch);
+      send_to_char(ch, "You can't find it!\r\n");
       return;
     }
     if ((GET_OBJ_TYPE(to_obj) != ITEM_DRINKCON) &&
 	(GET_OBJ_TYPE(to_obj) != ITEM_FOUNTAIN)) {
-      send_to_char("You can't pour anything into that.\r\n", ch);
+      send_to_char(ch, "You can't pour anything into that.\r\n");
       return;
     }
   }
   if (to_obj == from_obj) {
-    send_to_char("A most unproductive effort.\r\n", ch);
+    send_to_char(ch, "A most unproductive effort.\r\n");
     return;
   }
   if ((GET_OBJ_VAL(to_obj, 1) != 0) &&
       (GET_OBJ_VAL(to_obj, 2) != GET_OBJ_VAL(from_obj, 2))) {
-    send_to_char("There is already another liquid in it!\r\n", ch);
+    send_to_char(ch, "There is already another liquid in it!\r\n");
     return;
   }
   if (!(GET_OBJ_VAL(to_obj, 1) < GET_OBJ_VAL(to_obj, 0))) {
-    send_to_char("There is no room for more.\r\n", ch);
+    send_to_char(ch, "There is no room for more.\r\n");
     return;
   }
-  if (subcmd == SCMD_POUR) {
-    sprintf(buf, "You pour the %s into the %s.",
-	    drinks[GET_OBJ_VAL(from_obj, 2)], arg2);
-    send_to_char(buf, ch);
-  }
+  if (subcmd == SCMD_POUR)
+    send_to_char(ch, "You pour the %s into the %s.", drinks[GET_OBJ_VAL(from_obj, 2)], arg2);
+
   if (subcmd == SCMD_FILL) {
     act("You gently fill $p from $P.", FALSE, ch, to_obj, from_obj, TO_CHAR);
     act("$n gently fills $p from $P.", TRUE, ch, to_obj, from_obj, TO_ROOM);
@@ -1237,7 +1235,7 @@ void perform_wear(struct char_data *ch, 
       where++;
 
   if (GET_EQ(ch, where)) {
-    send_to_char(already_wearing[where], ch);
+    send_to_char(ch, "%s", already_wearing[where]);
     return;
   }
   wear_message(ch, obj, where);
@@ -1286,12 +1284,8 @@ int find_eq_pos(struct char_data *ch, st
     if (CAN_WEAR(obj, ITEM_WEAR_ABOUT))       where = WEAR_ABOUT;
     if (CAN_WEAR(obj, ITEM_WEAR_WAIST))       where = WEAR_WAIST;
     if (CAN_WEAR(obj, ITEM_WEAR_WRIST))       where = WEAR_WRIST_R;
-  } else {
-    if ((where = search_block(arg, keywords, FALSE)) < 0) {
-      sprintf(buf, "'%s'?  What part of your body is THAT?\r\n", arg);
-      send_to_char(buf, ch);
-    }
-  }
+  } else if ((where = search_block(arg, keywords, FALSE)) < 0)
+    send_to_char(ch, "'%s'?  What part of your body is THAT?\r\n", arg);
 
   return (where);
 }
@@ -1308,13 +1302,13 @@ ACMD(do_wear)
   two_arguments(argument, arg1, arg2);
 
   if (!*arg1) {
-    send_to_char("Wear what?\r\n", ch);
+    send_to_char(ch, "Wear what?\r\n");
     return;
   }
   dotmode = find_all_dots(arg1);
 
   if (*arg2 && (dotmode != FIND_INDIV)) {
-    send_to_char("You can't specify the same body location for more than one item!\r\n", ch);
+    send_to_char(ch, "You can't specify the same body location for more than one item!\r\n");
     return;
   }
   if (dotmode == FIND_ALL) {
@@ -1326,16 +1320,15 @@ ACMD(do_wear)
       }
     }
     if (!items_worn)
-      send_to_char("You don't seem to have anything wearable.\r\n", ch);
+      send_to_char(ch, "You don't seem to have anything wearable.\r\n");
   } else if (dotmode == FIND_ALLDOT) {
     if (!*arg1) {
-      send_to_char("Wear all of what?\r\n", ch);
+      send_to_char(ch, "Wear all of what?\r\n");
       return;
     }
-    if (!(obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying))) {
-      sprintf(buf, "You don't seem to have any %ss.\r\n", arg1);
-      send_to_char(buf, ch);
-    } else
+    if (!(obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying)))
+      send_to_char(ch, "You don't seem to have any %ss.\r\n", arg1);
+    else
       while (obj) {
 	next_obj = get_obj_in_list_vis(ch, arg1, NULL, obj->next_content);
 	if ((where = find_eq_pos(ch, obj, 0)) >= 0)
@@ -1345,10 +1338,9 @@ ACMD(do_wear)
 	obj = next_obj;
       }
   } else {
-    if (!(obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying))) {
-      sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg1), arg1);
-      send_to_char(buf, ch);
-    } else {
+    if (!(obj = get_obj_in_list_vis(ch, arg1, NULL, ch->carrying)))
+      send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg1), arg1);
+    else {
       if ((where = find_eq_pos(ch, obj, arg2)) >= 0)
 	perform_wear(ch, obj, where);
       else if (!*arg2)
@@ -1361,20 +1353,20 @@ ACMD(do_wear)
 
 ACMD(do_wield)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct obj_data *obj;
 
   one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Wield what?\r\n", ch);
-  else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-    sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-    send_to_char(buf, ch);
-  } else {
+    send_to_char(ch, "Wield what?\r\n");
+  else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+    send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
+  else {
     if (!CAN_WEAR(obj, ITEM_WEAR_WIELD))
-      send_to_char("You can't wield that.\r\n", ch);
+      send_to_char(ch, "You can't wield that.\r\n");
     else if (GET_OBJ_WEIGHT(obj) > str_app[STRENGTH_APPLY_INDEX(ch)].wield_w)
-      send_to_char("It's too heavy for you to use.\r\n", ch);
+      send_to_char(ch, "It's too heavy for you to use.\r\n");
     else
       perform_wear(ch, obj, WEAR_WIELD);
   }
@@ -1384,23 +1376,23 @@ ACMD(do_wield)
 
 ACMD(do_grab)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct obj_data *obj;
 
   one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Hold what?\r\n", ch);
-  else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-    sprintf(buf, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-    send_to_char(buf, ch);
-  } else {
+    send_to_char(ch, "Hold what?\r\n");
+  else if (!(obj = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))
+    send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
+  else {
     if (GET_OBJ_TYPE(obj) == ITEM_LIGHT)
       perform_wear(ch, obj, WEAR_LIGHT);
     else {
       if (!CAN_WEAR(obj, ITEM_WEAR_HOLD) && GET_OBJ_TYPE(obj) != ITEM_WAND &&
       GET_OBJ_TYPE(obj) != ITEM_STAFF && GET_OBJ_TYPE(obj) != ITEM_SCROLL &&
 	  GET_OBJ_TYPE(obj) != ITEM_POTION)
-	send_to_char("You can't hold that.\r\n", ch);
+	send_to_char(ch, "You can't hold that.\r\n");
       else
 	perform_wear(ch, obj, WEAR_HOLD);
     }
@@ -1430,12 +1422,13 @@ void perform_remove(struct char_data *ch
 
 ACMD(do_remove)
 {
+  char arg[MAX_INPUT_LENGTH];
   int i, dotmode, found;
 
   one_argument(argument, arg);
 
   if (!*arg) {
-    send_to_char("Remove what?\r\n", ch);
+    send_to_char(ch, "Remove what?\r\n");
     return;
   }
   dotmode = find_all_dots(arg);
@@ -1448,10 +1441,10 @@ ACMD(do_remove)
 	found = 1;
       }
     if (!found)
-      send_to_char("You're not using anything.\r\n", ch);
+      send_to_char(ch, "You're not using anything.\r\n");
   } else if (dotmode == FIND_ALLDOT) {
     if (!*arg)
-      send_to_char("Remove all of what?\r\n", ch);
+      send_to_char(ch, "Remove all of what?\r\n");
     else {
       found = 0;
       for (i = 0; i < NUM_WEARS; i++)
@@ -1460,16 +1453,13 @@ ACMD(do_remove)
 	  perform_remove(ch, i);
 	  found = 1;
 	}
-      if (!found) {
-	sprintf(buf, "You don't seem to be using any %ss.\r\n", arg);
-	send_to_char(buf, ch);
-      }
+      if (!found)
+	send_to_char(ch, "You don't seem to be using any %ss.\r\n", arg);
     }
   } else {
-    if ((i = get_obj_pos_in_equip_vis(ch, arg, NULL, ch->equipment)) < 0) {
-      sprintf(buf, "You don't seem to be using %s %s.\r\n", AN(arg), arg);
-      send_to_char(buf, ch);
-    } else
+    if ((i = get_obj_pos_in_equip_vis(ch, arg, NULL, ch->equipment)) < 0)
+      send_to_char(ch, "You don't seem to be using %s %s.\r\n", AN(arg), arg);
+    else
       perform_remove(ch, i);
   }
 }
Index: src/act.movement.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.movement.c,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- src/act.movement.c	2001/12/21 03:34:46	1.30
+++ src/act.movement.c	2002/02/15 22:31:31	1.35
@@ -27,7 +27,6 @@
 extern int tunnel_size;
 
 /* external functions */
-void add_follower(struct char_data *ch, struct char_data *leader);
 int special(struct char_data *ch, int cmd, char *arg);
 void death_cry(struct char_data *ch);
 int find_eq_pos(struct char_data *ch, struct obj_data *obj, char *arg);
@@ -104,7 +103,7 @@ int do_simple_move(struct char_data *ch,
 
   /* charmed? */
   if (AFF_FLAGGED(ch, AFF_CHARM) && ch->master && IN_ROOM(ch) == IN_ROOM(ch->master)) {
-    send_to_char("The thought of leaving your master makes you weep.\r\n", ch);
+    send_to_char(ch, "The thought of leaving your master makes you weep.\r\n");
     act("$n bursts into tears.", FALSE, ch, 0, 0, TO_ROOM);
     return (0);
   }
@@ -113,7 +112,7 @@ int do_simple_move(struct char_data *ch,
   if ((SECT(IN_ROOM(ch)) == SECT_WATER_NOSWIM) ||
       (SECT(EXIT(ch, dir)->to_room) == SECT_WATER_NOSWIM)) {
     if (!has_boat(ch)) {
-      send_to_char("You need a boat to go there.\r\n", ch);
+      send_to_char(ch, "You need a boat to go there.\r\n");
       return (0);
     }
   }
@@ -124,30 +123,30 @@ int do_simple_move(struct char_data *ch,
 
   if (GET_MOVE(ch) < need_movement && !IS_NPC(ch)) {
     if (need_specials_check && ch->master)
-      send_to_char("You are too exhausted to follow.\r\n", ch);
+      send_to_char(ch, "You are too exhausted to follow.\r\n");
     else
-      send_to_char("You are too exhausted.\r\n", ch);
+      send_to_char(ch, "You are too exhausted.\r\n");
 
     return (0);
   }
   if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_ATRIUM)) {
     if (!House_can_enter(ch, GET_ROOM_VNUM(EXIT(ch, dir)->to_room))) {
-      send_to_char("That's private property -- no trespassing!\r\n", ch);
+      send_to_char(ch, "That's private property -- no trespassing!\r\n");
       return (0);
     }
   }
   if (ROOM_FLAGGED(EXIT(ch, dir)->to_room, ROOM_TUNNEL) &&
       num_pc_in_room(&(world[EXIT(ch, dir)->to_room])) >= tunnel_size) {
     if (tunnel_size > 1)
-      send_to_char("There isn't enough room for you to go there!\r\n", ch);
+      send_to_char(ch, "There isn't enough room for you to go there!\r\n");
     else
-      send_to_char("There isn't enough room there for more than one person!\r\n", ch);
+      send_to_char(ch, "There isn't enough room there for more than one person!\r\n");
     return (0);
   }
   /* Mortals and low level gods cannot enter greater god rooms. */
   if (ROOM_FLAGGED(EXIT(ch, dir)->to_room, ROOM_GODROOM) &&
 	GET_LEVEL(ch) < LVL_GRGOD) {
-    send_to_char("You aren't godly enough to use that room!\r\n", ch);
+    send_to_char(ch, "You aren't godly enough to use that room!\r\n");
     return (0);
   }
 
@@ -156,7 +155,9 @@ int do_simple_move(struct char_data *ch,
     GET_MOVE(ch) -= need_movement;
 
   if (!AFF_FLAGGED(ch, AFF_SNEAK)) {
-    sprintf(buf2, "$n leaves %s.", dirs[dir]);
+    char buf2[MAX_STRING_LENGTH];
+
+    snprintf(buf2, sizeof(buf2), "$n leaves %s.", dirs[dir]);
     act(buf2, TRUE, ch, 0, 0, TO_ROOM);
   }
   was_in = IN_ROOM(ch);
@@ -187,13 +188,12 @@ int perform_move(struct char_data *ch, i
   if (ch == NULL || dir < 0 || dir >= NUM_OF_DIRS || FIGHTING(ch))
     return (0);
   else if (!EXIT(ch, dir) || EXIT(ch, dir)->to_room == NOWHERE)
-    send_to_char("Alas, you cannot go that way...\r\n", ch);
+    send_to_char(ch, "Alas, you cannot go that way...\r\n");
   else if (EXIT_FLAGGED(EXIT(ch, dir), EX_CLOSED)) {
-    if (EXIT(ch, dir)->keyword) {
-      sprintf(buf2, "The %s seems to be closed.\r\n", fname(EXIT(ch, dir)->keyword));
-      send_to_char(buf2, ch);
-    } else
-      send_to_char("It seems to be closed.\r\n", ch);
+    if (EXIT(ch, dir)->keyword)
+      send_to_char(ch, "The %s seems to be closed.\r\n", fname(EXIT(ch, dir)->keyword));
+    else
+      send_to_char(ch, "It seems to be closed.\r\n");
   } else {
     if (!ch->followers)
       return (do_simple_move(ch, dir, need_specials_check));
@@ -233,7 +233,7 @@ int find_door(struct char_data *ch, cons
 
   if (*dir) {			/* a direction was specified */
     if ((door = search_block(dir, dirs, FALSE)) == -1) {	/* Partial Match */
-      send_to_char("That's not a direction.\r\n", ch);
+      send_to_char(ch, "That's not a direction.\r\n");
       return (-1);
     }
     if (EXIT(ch, door)) {	/* Braces added according to indent. -gg */
@@ -241,21 +241,18 @@ int find_door(struct char_data *ch, cons
 	if (isname(type, EXIT(ch, door)->keyword))
 	  return (door);
 	else {
-	  sprintf(buf2, "I see no %s there.\r\n", type);
-	  send_to_char(buf2, ch);
+	  send_to_char(ch, "I see no %s there.\r\n", type);
 	  return (-1);
         }
       } else
 	return (door);
     } else {
-      sprintf(buf2, "I really don't see how you can %s anything there.\r\n", cmdname);
-      send_to_char(buf2, ch);
+      send_to_char(ch, "I really don't see how you can %s anything there.\r\n", cmdname);
       return (-1);
     }
   } else {			/* try to locate the keyword */
     if (!*type) {
-      sprintf(buf2, "What is it you want to %s?\r\n", cmdname);
-      send_to_char(buf2, ch);
+      send_to_char(ch, "What is it you want to %s?\r\n", cmdname);
       return (-1);
     }
     for (door = 0; door < NUM_OF_DIRS; door++)
@@ -264,8 +261,7 @@ int find_door(struct char_data *ch, cons
 	  if (isname(type, EXIT(ch, door)->keyword))
 	    return (door);
 
-    sprintf(buf2, "There doesn't seem to be %s %s here.\r\n", AN(type), type);
-    send_to_char(buf2, ch);
+    send_to_char(ch, "There doesn't seem to be %s %s here.\r\n", AN(type), type);
     return (-1);
   }
 }
@@ -325,13 +321,18 @@ const int flags_door[] =
 #define UNLOCK_DOOR(room, obj, door)	((obj) ?\
 		(REMOVE_BIT(GET_OBJ_VAL(obj, 1), CONT_LOCKED)) :\
 		(REMOVE_BIT(EXITN(room, door)->exit_info, EX_LOCKED)))
+#define TOGGLE_LOCK(room, obj, door)	((obj) ?\
+		(TOGGLE_BIT(GET_OBJ_VAL(obj, 1), CONT_LOCKED)) :\
+		(TOGGLE_BIT(EXITN(room, door)->exit_info, EX_LOCKED)))
 
 void do_doorcmd(struct char_data *ch, struct obj_data *obj, int door, int scmd)
 {
+  char buf[MAX_STRING_LENGTH];
+  size_t len;
   room_rnum other_room = NOWHERE;
   struct room_direction_data *back = NULL;
 
-  sprintf(buf, "$n %ss ", cmd_door[scmd]);
+  len = snprintf(buf, sizeof(buf), "$n %ss ", cmd_door[scmd]);
   if (!obj && ((other_room = EXIT(ch, door)->to_room) != NOWHERE))
     if ((back = world[other_room].dir_option[rev_dir[door]]) != NULL)
       if (back->to_room != IN_ROOM(ch))
@@ -342,55 +343,51 @@ void do_doorcmd(struct char_data *ch, st
     OPEN_DOOR(IN_ROOM(ch), obj, door);
     if (back)
       OPEN_DOOR(other_room, obj, rev_dir[door]);
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
     break;
 
   case SCMD_CLOSE:
     CLOSE_DOOR(IN_ROOM(ch), obj, door);
     if (back)
       CLOSE_DOOR(other_room, obj, rev_dir[door]);
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
     break;
 
   case SCMD_LOCK:
     LOCK_DOOR(IN_ROOM(ch), obj, door);
     if (back)
       LOCK_DOOR(other_room, obj, rev_dir[door]);
-    send_to_char("*Click*\r\n", ch);
+    send_to_char(ch, "*Click*\r\n");
     break;
 
   case SCMD_UNLOCK:
     UNLOCK_DOOR(IN_ROOM(ch), obj, door);
     if (back)
       UNLOCK_DOOR(other_room, obj, rev_dir[door]);
-    send_to_char("*Click*\r\n", ch);
+    send_to_char(ch, "*Click*\r\n");
     break;
 
   case SCMD_PICK:
-    LOCK_DOOR(IN_ROOM(ch), obj, door);
+    TOGGLE_LOCK(IN_ROOM(ch), obj, door);
     if (back)
-      LOCK_DOOR(other_room, obj, rev_dir[door]);
-    send_to_char("The lock quickly yields to your skills.\r\n", ch);
-    strcpy(buf, "$n skillfully picks the lock on ");
+      TOGGLE_LOCK(other_room, obj, rev_dir[door]);
+    send_to_char(ch, "The lock quickly yields to your skills.\r\n");
+    len = strlcpy(buf, "$n skillfully picks the lock on ", sizeof(buf));
     break;
   }
 
-  /* Notify the room */
-  sprintf(buf + strlen(buf), "%s%s.", obj ? "" : "the ", obj ? "$p" :
-	  EXIT(ch, door)->keyword ? "$F" : "door");
+  /* Notify the room. */
+  if (len < sizeof(buf))
+    snprintf(buf + len, sizeof(buf) - len, "%s%s.",
+	obj ? "" : "the ", obj ? "$p" : EXIT(ch, door)->keyword ? "$F" : "door");
   if (!obj || IN_ROOM(obj) != NOWHERE)
     act(buf, FALSE, ch, obj, obj ? 0 : EXIT(ch, door)->keyword, TO_ROOM);
 
   /* Notify the other room */
-  if (back && (scmd == SCMD_OPEN || scmd == SCMD_CLOSE)) {
-    sprintf(buf, "The %s is %s%s from the other side.",
+  if (back && (scmd == SCMD_OPEN || scmd == SCMD_CLOSE))
+      send_to_room(EXIT(ch, door)->to_room, "The %s is %s%s from the other side.",
 		back->keyword ? fname(back->keyword) : "door", cmd_door[scmd],
 		scmd == SCMD_CLOSE ? "d" : "ed");
-    if (world[EXIT(ch, door)->to_room].people) {
-      act(buf, FALSE, world[EXIT(ch, door)->to_room].people, 0, 0, TO_ROOM);
-      act(buf, FALSE, world[EXIT(ch, door)->to_room].people, 0, 0, TO_CHAR);
-    }
-  }
 }
 
 
@@ -398,15 +395,15 @@ int ok_pick(struct char_data *ch, obj_vn
 {
   int percent;
 
-  percent = number(1, 101);
+  percent = rand_number(1, 101);
 
   if (scmd == SCMD_PICK) {
     if (keynum == NOTHING)
-      send_to_char("Odd - you can't seem to find a keyhole.\r\n", ch);
+      send_to_char(ch, "Odd - you can't seem to find a keyhole.\r\n");
     else if (pickproof)
-      send_to_char("It resists your attempts to pick it.\r\n", ch);
+      send_to_char(ch, "It resists your attempts to pick it.\r\n");
     else if (percent > GET_SKILL(ch, SKILL_PICK_LOCK))
-      send_to_char("You failed to pick the lock.\r\n", ch);
+      send_to_char(ch, "You failed to pick the lock.\r\n");
     else
       return (1);
     return (0);
@@ -433,8 +430,6 @@ int ok_pick(struct char_data *ch, obj_vn
 #define DOOR_IS_LOCKED(ch, obj, door)	(!(DOOR_IS_UNLOCKED(ch, obj, door)))
 #define DOOR_KEY(ch, obj, door)		((obj) ? (GET_OBJ_VAL(obj, 2)) : \
 					(EXIT(ch, door)->key))
-#define DOOR_LOCK(ch, obj, door)	((obj) ? (GET_OBJ_VAL(obj, 1)) : \
-					(EXIT(ch, door)->exit_info))
 
 ACMD(do_gen_door)
 {
@@ -446,8 +441,7 @@ ACMD(do_gen_door)
 
   skip_spaces(&argument);
   if (!*argument) {
-    sprintf(buf, "%s what?\r\n", cmd_door[subcmd]);
-    send_to_char(CAP(buf), ch);
+    send_to_char(ch, "%c%s what?\r\n", UPPER(*cmd_door[subcmd]), cmd_door[subcmd] + 1);
     return;
   }
   two_arguments(argument, type, dir);
@@ -460,19 +454,19 @@ ACMD(do_gen_door)
       act("You can't $F that!", FALSE, ch, 0, cmd_door[subcmd], TO_CHAR);
     else if (!DOOR_IS_OPEN(ch, obj, door) &&
 	     IS_SET(flags_door[subcmd], NEED_OPEN))
-      send_to_char("But it's already closed!\r\n", ch);
+      send_to_char(ch, "But it's already closed!\r\n");
     else if (!DOOR_IS_CLOSED(ch, obj, door) &&
 	     IS_SET(flags_door[subcmd], NEED_CLOSED))
-      send_to_char("But it's currently open!\r\n", ch);
+      send_to_char(ch, "But it's currently open!\r\n");
     else if (!(DOOR_IS_LOCKED(ch, obj, door)) &&
 	     IS_SET(flags_door[subcmd], NEED_LOCKED))
-      send_to_char("Oh.. it wasn't locked, after all..\r\n", ch);
+      send_to_char(ch, "Oh.. it wasn't locked, after all..\r\n");
     else if (!(DOOR_IS_UNLOCKED(ch, obj, door)) &&
 	     IS_SET(flags_door[subcmd], NEED_UNLOCKED))
-      send_to_char("It seems to be locked.\r\n", ch);
+      send_to_char(ch, "It seems to be locked.\r\n");
     else if (!has_key(ch, keynum) && (GET_LEVEL(ch) < LVL_GOD) &&
 	     ((subcmd == SCMD_LOCK) || (subcmd == SCMD_UNLOCK)))
-      send_to_char("You don't seem to have the proper key.\r\n", ch);
+      send_to_char(ch, "You don't seem to have the proper key.\r\n");
     else if (ok_pick(ch, keynum, DOOR_IS_PICKPROOF(ch, obj, door), subcmd))
       do_doorcmd(ch, obj, door, subcmd);
   }
@@ -483,6 +477,7 @@ ACMD(do_gen_door)
 
 ACMD(do_enter)
 {
+  char buf[MAX_INPUT_LENGTH];
   int door;
 
   one_argument(argument, buf);
@@ -496,10 +491,9 @@ ACMD(do_enter)
 	    perform_move(ch, door, 1);
 	    return;
 	  }
-    sprintf(buf2, "There is no %s here.\r\n", buf);
-    send_to_char(buf2, ch);
+    send_to_char(ch, "There is no %s here.\r\n", buf);
   } else if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_INDOORS))
-    send_to_char("You are already indoors.\r\n", ch);
+    send_to_char(ch, "You are already indoors.\r\n");
   else {
     /* try to locate an entrance */
     for (door = 0; door < NUM_OF_DIRS; door++)
@@ -510,7 +504,7 @@ ACMD(do_enter)
 	    perform_move(ch, door, 1);
 	    return;
 	  }
-    send_to_char("You can't seem to find anything to enter.\r\n", ch);
+    send_to_char(ch, "You can't seem to find anything to enter.\r\n");
   }
 }
 
@@ -520,7 +514,7 @@ ACMD(do_leave)
   int door;
 
   if (OUTSIDE(ch))
-    send_to_char("You are outside.. where do you want to go?\r\n", ch);
+    send_to_char(ch, "You are outside.. where do you want to go?\r\n");
   else {
     for (door = 0; door < NUM_OF_DIRS; door++)
       if (EXIT(ch, door))
@@ -530,7 +524,7 @@ ACMD(do_leave)
 	    perform_move(ch, door, 1);
 	    return;
 	  }
-    send_to_char("I see no obvious exits to the outside.\r\n", ch);
+    send_to_char(ch, "I see no obvious exits to the outside.\r\n");
   }
 }
 
@@ -539,27 +533,27 @@ ACMD(do_stand)
 {
   switch (GET_POS(ch)) {
   case POS_STANDING:
-    send_to_char("You are already standing.\r\n", ch);
+    send_to_char(ch, "You are already standing.\r\n");
     break;
   case POS_SITTING:
-    send_to_char("You stand up.\r\n", ch);
+    send_to_char(ch, "You stand up.\r\n");
     act("$n clambers to $s feet.", TRUE, ch, 0, 0, TO_ROOM);
     /* Will be sitting after a successful bash and may still be fighting. */
     GET_POS(ch) = FIGHTING(ch) ? POS_FIGHTING : POS_STANDING;
     break;
   case POS_RESTING:
-    send_to_char("You stop resting, and stand up.\r\n", ch);
+    send_to_char(ch, "You stop resting, and stand up.\r\n");
     act("$n stops resting, and clambers on $s feet.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_STANDING;
     break;
   case POS_SLEEPING:
-    send_to_char("You have to wake up first!\r\n", ch);
+    send_to_char(ch, "You have to wake up first!\r\n");
     break;
   case POS_FIGHTING:
-    send_to_char("Do you not consider fighting as standing?\r\n", ch);
+    send_to_char(ch, "Do you not consider fighting as standing?\r\n");
     break;
   default:
-    send_to_char("You stop floating around, and put your feet on the ground.\r\n", ch);
+    send_to_char(ch, "You stop floating around, and put your feet on the ground.\r\n");
     act("$n stops floating around, and puts $s feet on the ground.",
 	TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_STANDING;
@@ -572,26 +566,26 @@ ACMD(do_sit)
 {
   switch (GET_POS(ch)) {
   case POS_STANDING:
-    send_to_char("You sit down.\r\n", ch);
+    send_to_char(ch, "You sit down.\r\n");
     act("$n sits down.", FALSE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SITTING;
     break;
   case POS_SITTING:
-    send_to_char("You're sitting already.\r\n", ch);
+    send_to_char(ch, "You're sitting already.\r\n");
     break;
   case POS_RESTING:
-    send_to_char("You stop resting, and sit up.\r\n", ch);
+    send_to_char(ch, "You stop resting, and sit up.\r\n");
     act("$n stops resting.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SITTING;
     break;
   case POS_SLEEPING:
-    send_to_char("You have to wake up first.\r\n", ch);
+    send_to_char(ch, "You have to wake up first.\r\n");
     break;
   case POS_FIGHTING:
-    send_to_char("Sit down while fighting? Are you MAD?\r\n", ch);
+    send_to_char(ch, "Sit down while fighting? Are you MAD?\r\n");
     break;
   default:
-    send_to_char("You stop floating around, and sit down.\r\n", ch);
+    send_to_char(ch, "You stop floating around, and sit down.\r\n");
     act("$n stops floating around, and sits down.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SITTING;
     break;
@@ -603,26 +597,26 @@ ACMD(do_rest)
 {
   switch (GET_POS(ch)) {
   case POS_STANDING:
-    send_to_char("You sit down and rest your tired bones.\r\n", ch);
+    send_to_char(ch, "You sit down and rest your tired bones.\r\n");
     act("$n sits down and rests.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_RESTING;
     break;
   case POS_SITTING:
-    send_to_char("You rest your tired bones.\r\n", ch);
+    send_to_char(ch, "You rest your tired bones.\r\n");
     act("$n rests.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_RESTING;
     break;
   case POS_RESTING:
-    send_to_char("You are already resting.\r\n", ch);
+    send_to_char(ch, "You are already resting.\r\n");
     break;
   case POS_SLEEPING:
-    send_to_char("You have to wake up first.\r\n", ch);
+    send_to_char(ch, "You have to wake up first.\r\n");
     break;
   case POS_FIGHTING:
-    send_to_char("Rest while fighting?  Are you MAD?\r\n", ch);
+    send_to_char(ch, "Rest while fighting?  Are you MAD?\r\n");
     break;
   default:
-    send_to_char("You stop floating around, and stop to rest your tired bones.\r\n", ch);
+    send_to_char(ch, "You stop floating around, and stop to rest your tired bones.\r\n");
     act("$n stops floating around, and rests.", FALSE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SITTING;
     break;
@@ -636,18 +630,18 @@ ACMD(do_sleep)
   case POS_STANDING:
   case POS_SITTING:
   case POS_RESTING:
-    send_to_char("You go to sleep.\r\n", ch);
+    send_to_char(ch, "You go to sleep.\r\n");
     act("$n lies down and falls asleep.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SLEEPING;
     break;
   case POS_SLEEPING:
-    send_to_char("You are already sound asleep.\r\n", ch);
+    send_to_char(ch, "You are already sound asleep.\r\n");
     break;
   case POS_FIGHTING:
-    send_to_char("Sleep while fighting?  Are you MAD?\r\n", ch);
+    send_to_char(ch, "Sleep while fighting?  Are you MAD?\r\n");
     break;
   default:
-    send_to_char("You stop floating around, and lie down to sleep.\r\n", ch);
+    send_to_char(ch, "You stop floating around, and lie down to sleep.\r\n");
     act("$n stops floating around, and lie down to sleep.",
 	TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SLEEPING;
@@ -658,15 +652,16 @@ ACMD(do_sleep)
 
 ACMD(do_wake)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int self = 0;
 
   one_argument(argument, arg);
   if (*arg) {
     if (GET_POS(ch) == POS_SLEEPING)
-      send_to_char("Maybe you should wake yourself up first.\r\n", ch);
+      send_to_char(ch, "Maybe you should wake yourself up first.\r\n");
     else if ((vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)) == NULL)
-      send_to_char(NOPERSON, ch);
+      send_to_char(ch, "%s", NOPERSON);
     else if (vict == ch)
       self = 1;
     else if (AWAKE(vict))
@@ -684,11 +679,11 @@ ACMD(do_wake)
       return;
   }
   if (AFF_FLAGGED(ch, AFF_SLEEP))
-    send_to_char("You can't wake up!\r\n", ch);
+    send_to_char(ch, "You can't wake up!\r\n");
   else if (GET_POS(ch) > POS_SLEEPING)
-    send_to_char("You are already awake...\r\n", ch);
+    send_to_char(ch, "You are already awake...\r\n");
   else {
-    send_to_char("You awaken, and sit up.\r\n", ch);
+    send_to_char(ch, "You awaken, and sit up.\r\n");
     act("$n awakens.", TRUE, ch, 0, 0, TO_ROOM);
     GET_POS(ch) = POS_SITTING;
   }
@@ -697,17 +692,18 @@ ACMD(do_wake)
 
 ACMD(do_follow)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *leader;
 
   one_argument(argument, buf);
 
   if (*buf) {
     if (!(leader = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM))) {
-      send_to_char(NOPERSON, ch);
+      send_to_char(ch, "%s", NOPERSON);
       return;
     }
   } else {
-    send_to_char("Whom do you wish to follow?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to follow?\r\n");
     return;
   }
 
@@ -720,13 +716,13 @@ ACMD(do_follow)
   } else {			/* Not Charmed follow person */
     if (leader == ch) {
       if (!ch->master) {
-	send_to_char("You are already following yourself.\r\n", ch);
+	send_to_char(ch, "You are already following yourself.\r\n");
 	return;
       }
       stop_follower(ch);
     } else {
       if (circle_follow(ch, leader)) {
-	send_to_char("Sorry, but following in loops is not allowed.\r\n", ch);
+	send_to_char(ch, "Sorry, but following in loops is not allowed.\r\n");
 	return;
       }
       if (ch->master)
Index: src/act.offensive.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.offensive.c,v
retrieving revision 1.28
retrieving revision 1.30
diff -u -p -r1.28 -r1.30
--- src/act.offensive.c	2001/10/02 00:20:02	1.28
+++ src/act.offensive.c	2002/02/01 02:04:17	1.30
@@ -42,20 +42,21 @@ ACMD(do_kick);
 
 ACMD(do_assist)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *helpee, *opponent;
 
   if (FIGHTING(ch)) {
-    send_to_char("You're already fighting!  How can you assist someone else?\r\n", ch);
+    send_to_char(ch, "You're already fighting!  How can you assist someone else?\r\n");
     return;
   }
   one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Whom do you wish to assist?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to assist?\r\n");
   else if (!(helpee = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)))
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
   else if (helpee == ch)
-    send_to_char("You can't help yourself any more than this!\r\n", ch);
+    send_to_char(ch, "You can't help yourself any more than this!\r\n");
   else {
     /*
      * Hit the same enemy the person you're helping is.
@@ -76,7 +77,7 @@ ACMD(do_assist)
       act("Use 'murder' if you really want to attack $N.", FALSE,
 	  ch, 0, opponent, TO_CHAR);
     else {
-      send_to_char("You join the fight!\r\n", ch);
+      send_to_char(ch, "You join the fight!\r\n");
       act("$N assists you!", 0, helpee, 0, ch, TO_CHAR);
       act("$n assists $N.", FALSE, ch, 0, helpee, TO_NOTVICT);
       hit(ch, opponent, TYPE_UNDEFINED);
@@ -87,16 +88,17 @@ ACMD(do_assist)
 
 ACMD(do_hit)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
 
   one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Hit who?\r\n", ch);
+    send_to_char(ch, "Hit who?\r\n");
   else if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)))
-    send_to_char("They don't seem to be here.\r\n", ch);
+    send_to_char(ch, "They don't seem to be here.\r\n");
   else if (vict == ch) {
-    send_to_char("You hit yourself...OUCH!.\r\n", ch);
+    send_to_char(ch, "You hit yourself...OUCH!.\r\n");
     act("$n hits $mself, and says OUCH!", FALSE, ch, 0, vict, TO_ROOM);
   } else if (AFF_FLAGGED(ch, AFF_CHARM) && (ch->master == vict))
     act("$N is just such a good friend, you simply can't hit $M.", FALSE, ch, 0, vict, TO_CHAR);
@@ -104,7 +106,7 @@ ACMD(do_hit)
     if (!pk_allowed) {
       if (!IS_NPC(vict) && !IS_NPC(ch)) {
 	if (subcmd != SCMD_MURDER) {
-	  send_to_char("Use 'murder' to hit another player.\r\n", ch);
+	  send_to_char(ch, "Use 'murder' to hit another player.\r\n");
 	  return;
 	} else {
 	  check_killer(ch, vict);
@@ -118,7 +120,7 @@ ACMD(do_hit)
       hit(ch, vict, TYPE_UNDEFINED);
       WAIT_STATE(ch, PULSE_VIOLENCE + 2);
     } else
-      send_to_char("You do the best you can!\r\n", ch);
+      send_to_char(ch, "You do the best you can!\r\n");
   }
 }
 
@@ -126,21 +128,22 @@ ACMD(do_hit)
 
 ACMD(do_kill)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
 
-  if ((GET_LEVEL(ch) < LVL_IMPL) || IS_NPC(ch)) {
+  if (GET_LEVEL(ch) < LVL_IMPL || IS_NPC(ch)) {
     do_hit(ch, argument, cmd, subcmd);
     return;
   }
   one_argument(argument, arg);
 
   if (!*arg) {
-    send_to_char("Kill who?\r\n", ch);
+    send_to_char(ch, "Kill who?\r\n");
   } else {
     if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)))
-      send_to_char("They aren't here.\r\n", ch);
+      send_to_char(ch, "They aren't here.\r\n");
     else if (ch == vict)
-      send_to_char("Your mother would be so sad.. :(\r\n", ch);
+      send_to_char(ch, "Your mother would be so sad.. :(\r\n");
     else {
       act("You chop $M to pieces!  Ah!  The blood!", FALSE, ch, 0, vict, TO_CHAR);
       act("$N chops you to pieces!", FALSE, vict, 0, ch, TO_CHAR);
@@ -154,34 +157,35 @@ ACMD(do_kill)
 
 ACMD(do_backstab)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int percent, prob;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_BACKSTAB)) {
-    send_to_char("You have no idea how to do that.\r\n", ch);
+    send_to_char(ch, "You have no idea how to do that.\r\n");
     return;
   }
 
   one_argument(argument, buf);
 
   if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM))) {
-    send_to_char("Backstab who?\r\n", ch);
+    send_to_char(ch, "Backstab who?\r\n");
     return;
   }
   if (vict == ch) {
-    send_to_char("How can you sneak up on yourself?\r\n", ch);
+    send_to_char(ch, "How can you sneak up on yourself?\r\n");
     return;
   }
   if (!GET_EQ(ch, WEAR_WIELD)) {
-    send_to_char("You need to wield a weapon to make it a success.\r\n", ch);
+    send_to_char(ch, "You need to wield a weapon to make it a success.\r\n");
     return;
   }
   if (GET_OBJ_VAL(GET_EQ(ch, WEAR_WIELD), 3) != TYPE_PIERCE - TYPE_HIT) {
-    send_to_char("Only piercing weapons can be used for backstabbing.\r\n", ch);
+    send_to_char(ch, "Only piercing weapons can be used for backstabbing.\r\n");
     return;
   }
   if (FIGHTING(vict)) {
-    send_to_char("You can't backstab a fighting person -- they're too alert!\r\n", ch);
+    send_to_char(ch, "You can't backstab a fighting person -- they're too alert!\r\n");
     return;
   }
 
@@ -193,7 +197,7 @@ ACMD(do_backstab)
     return;
   }
 
-  percent = number(1, 101);	/* 101% is a complete failure */
+  percent = rand_number(1, 101);	/* 101% is a complete failure */
   prob = GET_SKILL(ch, SKILL_BACKSTAB);
 
   if (AWAKE(vict) && (percent > prob))
@@ -215,29 +219,33 @@ ACMD(do_order)
   half_chop(argument, name, message);
 
   if (!*name || !*message)
-    send_to_char("Order who to do what?\r\n", ch);
+    send_to_char(ch, "Order who to do what?\r\n");
   else if (!(vict = get_char_vis(ch, name, NULL, FIND_CHAR_ROOM)) && !is_abbrev(name, "followers"))
-    send_to_char("That person isn't here.\r\n", ch);
+    send_to_char(ch, "That person isn't here.\r\n");
   else if (ch == vict)
-    send_to_char("You obviously suffer from skitzofrenia.\r\n", ch);
+    send_to_char(ch, "You obviously suffer from skitzofrenia.\r\n");
   else {
     if (AFF_FLAGGED(ch, AFF_CHARM)) {
-      send_to_char("Your superior would not aprove of you giving orders.\r\n", ch);
+      send_to_char(ch, "Your superior would not aprove of you giving orders.\r\n");
       return;
     }
     if (vict) {
-      sprintf(buf, "$N orders you to '%s'", message);
+      char buf[MAX_STRING_LENGTH];
+
+      snprintf(buf, sizeof(buf), "$N orders you to '%s'", message);
       act(buf, FALSE, vict, 0, ch, TO_CHAR);
       act("$n gives $N an order.", FALSE, ch, 0, vict, TO_ROOM);
 
       if ((vict->master != ch) || !AFF_FLAGGED(vict, AFF_CHARM))
 	act("$n has an indifferent look.", FALSE, vict, 0, 0, TO_ROOM);
       else {
-	send_to_char(OK, ch);
+	send_to_char(ch, "%s", OK);
 	command_interpreter(vict, message);
       }
     } else {			/* This is order "followers" */
-      sprintf(buf, "$n issues the order '%s'.", message);
+      char buf[MAX_STRING_LENGTH];
+
+      snprintf(buf, sizeof(buf), "$n issues the order '%s'.", message);
       act(buf, FALSE, ch, 0, 0, TO_ROOM);
 
       for (k = ch->followers; k; k = k->next) {
@@ -248,9 +256,9 @@ ACMD(do_order)
 	  }
       }
       if (found)
-	send_to_char(OK, ch);
+	send_to_char(ch, "%s", OK);
       else
-	send_to_char("Nobody here is a loyal subject of yours!\r\n", ch);
+	send_to_char(ch, "Nobody here is a loyal subject of yours!\r\n");
     }
   }
 }
@@ -263,18 +271,18 @@ ACMD(do_flee)
   struct char_data *was_fighting;
 
   if (GET_POS(ch) < POS_FIGHTING) {
-    send_to_char("You are in pretty bad shape, unable to flee!\r\n", ch);
+    send_to_char(ch, "You are in pretty bad shape, unable to flee!\r\n");
     return;
   }
 
   for (i = 0; i < 6; i++) {
-    attempt = number(0, NUM_OF_DIRS - 1);	/* Select a random direction */
+    attempt = rand_number(0, NUM_OF_DIRS - 1);	/* Select a random direction */
     if (CAN_GO(ch, attempt) &&
 	!ROOM_FLAGGED(EXIT(ch, attempt)->to_room, ROOM_DEATH)) {
       act("$n panics, and attempts to flee!", TRUE, ch, 0, 0, TO_ROOM);
       was_fighting = FIGHTING(ch);
       if (do_simple_move(ch, attempt, TRUE)) {
-	send_to_char("You flee head over heels.\r\n", ch);
+	send_to_char(ch, "You flee head over heels.\r\n");
 	if (was_fighting && !IS_NPC(ch)) {
 	  loss = GET_MAX_HIT(was_fighting) - GET_HIT(was_fighting);
 	  loss *= GET_LEVEL(was_fighting);
@@ -286,42 +294,43 @@ ACMD(do_flee)
       return;
     }
   }
-  send_to_char("PANIC!  You couldn't escape!\r\n", ch);
+  send_to_char(ch, "PANIC!  You couldn't escape!\r\n");
 }
 
 
 ACMD(do_bash)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int percent, prob;
 
   one_argument(argument, arg);
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_BASH)) {
-    send_to_char("You have no idea how.\r\n", ch);
+    send_to_char(ch, "You have no idea how.\r\n");
     return;
   }
   if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_PEACEFUL)) {
-    send_to_char("This room just has such a peaceful, easy feeling...\r\n", ch);
+    send_to_char(ch, "This room just has such a peaceful, easy feeling...\r\n");
     return;
   }
   if (!GET_EQ(ch, WEAR_WIELD)) {
-    send_to_char("You need to wield a weapon to make it a success.\r\n", ch);
+    send_to_char(ch, "You need to wield a weapon to make it a success.\r\n");
     return;
   }
   if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) {
     if (FIGHTING(ch) && IN_ROOM(ch) == IN_ROOM(FIGHTING(ch))) {
       vict = FIGHTING(ch);
     } else {
-      send_to_char("Bash who?\r\n", ch);
+      send_to_char(ch, "Bash who?\r\n");
       return;
     }
   }
   if (vict == ch) {
-    send_to_char("Aren't we funny today...\r\n", ch);
+    send_to_char(ch, "Aren't we funny today...\r\n");
     return;
   }
-  percent = number(1, 101);	/* 101% is a complete failure */
+  percent = rand_number(1, 101);	/* 101% is a complete failure */
   prob = GET_SKILL(ch, SKILL_BASH);
 
   if (MOB_FLAGGED(vict, MOB_NOBASH))
@@ -349,26 +358,27 @@ ACMD(do_bash)
 
 ACMD(do_rescue)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict, *tmp_ch;
   int percent, prob;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_RESCUE)) {
-    send_to_char("You have no idea how to do that.\r\n", ch);
+    send_to_char(ch, "You have no idea how to do that.\r\n");
     return;
   }
 
   one_argument(argument, arg);
 
   if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM))) {
-    send_to_char("Whom do you want to rescue?\r\n", ch);
+    send_to_char(ch, "Whom do you want to rescue?\r\n");
     return;
   }
   if (vict == ch) {
-    send_to_char("What about fleeing instead?\r\n", ch);
+    send_to_char(ch, "What about fleeing instead?\r\n");
     return;
   }
   if (FIGHTING(ch) == vict) {
-    send_to_char("How can you rescue someone you are trying to kill?\r\n", ch);
+    send_to_char(ch, "How can you rescue someone you are trying to kill?\r\n");
     return;
   }
   for (tmp_ch = world[IN_ROOM(ch)].people; tmp_ch &&
@@ -378,14 +388,14 @@ ACMD(do_rescue)
     act("But nobody is fighting $M!", FALSE, ch, 0, vict, TO_CHAR);
     return;
   }
-  percent = number(1, 101);	/* 101% is a complete failure */
+  percent = rand_number(1, 101);	/* 101% is a complete failure */
   prob = GET_SKILL(ch, SKILL_RESCUE);
 
   if (percent > prob) {
-    send_to_char("You fail the rescue!\r\n", ch);
+    send_to_char(ch, "You fail the rescue!\r\n");
     return;
   }
-  send_to_char("Banzai!  To the rescue...\r\n", ch);
+  send_to_char(ch, "Banzai!  To the rescue...\r\n");
   act("You are rescued by $N, you are confused!", FALSE, vict, 0, ch, TO_CHAR);
   act("$n heroically rescues $N!", FALSE, ch, 0, vict, TO_NOTVICT);
 
@@ -406,11 +416,12 @@ ACMD(do_rescue)
 
 ACMD(do_kick)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int percent, prob;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_KICK)) {
-    send_to_char("You have no idea how.\r\n", ch);
+    send_to_char(ch, "You have no idea how.\r\n");
     return;
   }
   one_argument(argument, arg);
@@ -419,16 +430,16 @@ ACMD(do_kick)
     if (FIGHTING(ch) && IN_ROOM(ch) == IN_ROOM(FIGHTING(ch))) {
       vict = FIGHTING(ch);
     } else {
-      send_to_char("Kick who?\r\n", ch);
+      send_to_char(ch, "Kick who?\r\n");
       return;
     }
   }
   if (vict == ch) {
-    send_to_char("Aren't we funny today...\r\n", ch);
+    send_to_char(ch, "Aren't we funny today...\r\n");
     return;
   }
   /* 101% is a complete failure */
-  percent = ((10 - (compute_armor_class(vict) / 10)) * 2) + number(1, 101);
+  percent = ((10 - (compute_armor_class(vict) / 10)) * 2) + rand_number(1, 101);
   prob = GET_SKILL(ch, SKILL_KICK);
 
   if (percent > prob) {
Index: src/act.other.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.other.c,v
retrieving revision 1.38
retrieving revision 1.42
diff -u -p -r1.38 -r1.42
--- src/act.other.c	2002/01/13 21:46:14	1.38
+++ src/act.other.c	2002/02/01 02:04:17	1.42
@@ -73,17 +73,16 @@ ACMD(do_quit)
     return;
 
   if (subcmd != SCMD_QUIT && GET_LEVEL(ch) < LVL_IMMORT)
-    send_to_char("You have to type quit--no less, to quit!\r\n", ch);
+    send_to_char(ch, "You have to type quit--no less, to quit!\r\n");
   else if (GET_POS(ch) == POS_FIGHTING)
-    send_to_char("No way!  You're fighting for your life!\r\n", ch);
+    send_to_char(ch, "No way!  You're fighting for your life!\r\n");
   else if (GET_POS(ch) < POS_STUNNED) {
-    send_to_char("You die before your time...\r\n", ch);
+    send_to_char(ch, "You die before your time...\r\n");
     die(ch);
   } else {
     act("$n has left the game.", TRUE, ch, 0, 0, TO_ROOM);
-    sprintf(buf, "%s has quit the game.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
-    send_to_char("Goodbye, friend.. Come back soon!\r\n", ch);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s has quit the game.", GET_NAME(ch));
+    send_to_char(ch, "Goodbye, friend.. Come back soon!\r\n");
 
     /*  We used to check here for duping attempts, but we may as well
      *  do it right in extract_char(), since there is no check if a
@@ -119,12 +118,11 @@ ACMD(do_save)
      * immortal advances from mortality, you may want < instead of <=.
      */
     if (auto_save && GET_LEVEL(ch) <= LVL_IMMORT) {
-      send_to_char("Saving aliases.\r\n", ch);
+      send_to_char(ch, "Saving aliases.\r\n");
       write_aliases(ch);
       return;
     }
-    sprintf(buf, "Saving %s and aliases.\r\n", GET_NAME(ch));
-    send_to_char(buf, ch);
+    send_to_char(ch, "Saving %s and aliases.\r\n", GET_NAME(ch));
   }
 
   write_aliases(ch);
@@ -139,7 +137,7 @@ ACMD(do_save)
    special procedures - i.e., shop commands, mail commands, etc. */
 ACMD(do_not_here)
 {
-  send_to_char("Sorry, but you cannot do that here!\r\n", ch);
+  send_to_char(ch, "Sorry, but you cannot do that here!\r\n");
 }
 
 
@@ -150,14 +148,14 @@ ACMD(do_sneak)
   byte percent;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_SNEAK)) {
-    send_to_char("You have no idea how to do that.\r\n", ch);
+    send_to_char(ch, "You have no idea how to do that.\r\n");
     return;
   }
-  send_to_char("Okay, you'll try to move silently for a while.\r\n", ch);
+  send_to_char(ch, "Okay, you'll try to move silently for a while.\r\n");
   if (AFF_FLAGGED(ch, AFF_SNEAK))
     affect_from_char(ch, SKILL_SNEAK);
 
-  percent = number(1, 101);	/* 101% is a complete failure */
+  percent = rand_number(1, 101);	/* 101% is a complete failure */
 
   if (percent > GET_SKILL(ch, SKILL_SNEAK) + dex_app_skill[GET_DEX(ch)].sneak)
     return;
@@ -177,16 +175,16 @@ ACMD(do_hide)
   byte percent;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_HIDE)) {
-    send_to_char("You have no idea how to do that.\r\n", ch);
+    send_to_char(ch, "You have no idea how to do that.\r\n");
     return;
   }
 
-  send_to_char("You attempt to hide yourself.\r\n", ch);
+  send_to_char(ch, "You attempt to hide yourself.\r\n");
 
   if (AFF_FLAGGED(ch, AFF_HIDE))
     REMOVE_BIT(AFF_FLAGS(ch), AFF_HIDE);
 
-  percent = number(1, 101);	/* 101% is a complete failure */
+  percent = rand_number(1, 101);	/* 101% is a complete failure */
 
   if (percent > GET_SKILL(ch, SKILL_HIDE) + dex_app_skill[GET_DEX(ch)].hide)
     return;
@@ -205,26 +203,26 @@ ACMD(do_steal)
   int percent, gold, eq_pos, pcsteal = 0, ohoh = 0;
 
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_STEAL)) {
-    send_to_char("You have no idea how to do that.\r\n", ch);
+    send_to_char(ch, "You have no idea how to do that.\r\n");
     return;
   }
   if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_PEACEFUL)) {
-    send_to_char("This room just has such a peaceful, easy feeling...\r\n", ch);
+    send_to_char(ch, "This room just has such a peaceful, easy feeling...\r\n");
     return;
   }
 
   two_arguments(argument, obj_name, vict_name);
 
   if (!(vict = get_char_vis(ch, vict_name, NULL, FIND_CHAR_ROOM))) {
-    send_to_char("Steal what from who?\r\n", ch);
+    send_to_char(ch, "Steal what from who?\r\n");
     return;
   } else if (vict == ch) {
-    send_to_char("Come on now, that's rather stupid!\r\n", ch);
+    send_to_char(ch, "Come on now, that's rather stupid!\r\n");
     return;
   }
 
   /* 101% is a complete failure */
-  percent = number(1, 101) - dex_app_skill[GET_DEX(ch)].p_pocket;
+  percent = rand_number(1, 101) - dex_app_skill[GET_DEX(ch)].p_pocket;
 
   if (GET_POS(vict) < POS_SLEEPING)
     percent = -1;		/* ALWAYS SUCCESS, unless heavy object. */
@@ -256,7 +254,7 @@ ACMD(do_steal)
 	return;
       } else {			/* It is equipment */
 	if ((GET_POS(vict) > POS_STUNNED)) {
-	  send_to_char("Steal the equipment now?  Impossible!\r\n", ch);
+	  send_to_char(ch, "Steal the equipment now?  Impossible!\r\n");
 	  return;
 	} else {
 	  act("You unequip $p and steal it.", FALSE, ch, obj, 0, TO_CHAR);
@@ -270,7 +268,7 @@ ACMD(do_steal)
 
       if (percent > GET_SKILL(ch, SKILL_STEAL)) {
 	ohoh = TRUE;
-	send_to_char("Oops..\r\n", ch);
+	send_to_char(ch, "Oops..\r\n");
 	act("$n tried to steal something from you!", FALSE, ch, 0, vict, TO_VICT);
 	act("$n tries to steal something from $N.", TRUE, ch, 0, vict, TO_NOTVICT);
       } else {			/* Steal the item */
@@ -278,33 +276,31 @@ ACMD(do_steal)
 	  if (IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj) < CAN_CARRY_W(ch)) {
 	    obj_from_char(obj);
 	    obj_to_char(obj, ch);
-	    send_to_char("Got it!\r\n", ch);
+	    send_to_char(ch, "Got it!\r\n");
 	  }
 	} else
-	  send_to_char("You cannot carry that much.\r\n", ch);
+	  send_to_char(ch, "You cannot carry that much.\r\n");
       }
     }
   } else {			/* Steal some coins */
     if (AWAKE(vict) && (percent > GET_SKILL(ch, SKILL_STEAL))) {
       ohoh = TRUE;
-      send_to_char("Oops..\r\n", ch);
+      send_to_char(ch, "Oops..\r\n");
       act("You discover that $n has $s hands in your wallet.", FALSE, ch, 0, vict, TO_VICT);
       act("$n tries to steal gold from $N.", TRUE, ch, 0, vict, TO_NOTVICT);
     } else {
       /* Steal some gold coins */
-      gold = (GET_GOLD(vict) * number(1, 10)) / 100;
+      gold = (GET_GOLD(vict) * rand_number(1, 10)) / 100;
       gold = MIN(1782, gold);
       if (gold > 0) {
 	GET_GOLD(ch) += gold;
 	GET_GOLD(vict) -= gold;
-        if (gold > 1) {
-	  sprintf(buf, "Bingo!  You got %d gold coins.\r\n", gold);
-	  send_to_char(buf, ch);
-	} else {
-	  send_to_char("You manage to swipe a solitary gold coin.\r\n", ch);
-	}
+        if (gold > 1)
+	  send_to_char(ch, "Bingo!  You got %d gold coins.\r\n", gold);
+	else
+	  send_to_char(ch, "You manage to swipe a solitary gold coin.\r\n");
       } else {
-	send_to_char("You couldn't get any gold...\r\n", ch);
+	send_to_char(ch, "You couldn't get any gold...\r\n");
       }
     }
   }
@@ -317,13 +313,15 @@ ACMD(do_steal)
 
 ACMD(do_practice)
 {
+  char arg[MAX_INPUT_LENGTH];
+
   if (IS_NPC(ch))
     return;
 
   one_argument(argument, arg);
 
   if (*arg)
-    send_to_char("You can only practice skills in your guild.\r\n", ch);
+    send_to_char(ch, "You can only practice skills in your guild.\r\n");
   else
     list_skills(ch);
 }
@@ -339,9 +337,9 @@ ACMD(do_visible)
 
   if AFF_FLAGGED(ch, AFF_INVISIBLE) {
     appear(ch);
-    send_to_char("You break the spell of invisibility.\r\n", ch);
+    send_to_char(ch, "You break the spell of invisibility.\r\n");
   } else
-    send_to_char("You are already visible.\r\n", ch);
+    send_to_char(ch, "You are already visible.\r\n");
 }
 
 
@@ -352,19 +350,16 @@ ACMD(do_title)
   delete_doubledollar(argument);
 
   if (IS_NPC(ch))
-    send_to_char("Your title is fine... go away.\r\n", ch);
+    send_to_char(ch, "Your title is fine... go away.\r\n");
   else if (PLR_FLAGGED(ch, PLR_NOTITLE))
-    send_to_char("You can't title yourself -- you shouldn't have abused it!\r\n", ch);
+    send_to_char(ch, "You can't title yourself -- you shouldn't have abused it!\r\n");
   else if (strstr(argument, "(") || strstr(argument, ")"))
-    send_to_char("Titles can't contain the ( or ) characters.\r\n", ch);
-  else if (strlen(argument) > MAX_TITLE_LENGTH) {
-    sprintf(buf, "Sorry, titles can't be longer than %d characters.\r\n",
-	    MAX_TITLE_LENGTH);
-    send_to_char(buf, ch);
-  } else {
+    send_to_char(ch, "Titles can't contain the ( or ) characters.\r\n");
+  else if (strlen(argument) > MAX_TITLE_LENGTH)
+    send_to_char(ch, "Sorry, titles can't be longer than %d characters.\r\n", MAX_TITLE_LENGTH);
+  else {
     set_title(ch, argument);
-    sprintf(buf, "Okay, you're now %s %s.\r\n", GET_NAME(ch), GET_TITLE(ch));
-    send_to_char(buf, ch);
+    send_to_char(ch, "Okay, you're now %s %s.\r\n", GET_NAME(ch), GET_TITLE(ch));
   }
 }
 
@@ -389,14 +384,16 @@ void print_group(struct char_data *ch)
   struct follow_type *f;
 
   if (!AFF_FLAGGED(ch, AFF_GROUP))
-    send_to_char("But you are not the member of a group!\r\n", ch);
+    send_to_char(ch, "But you are not the member of a group!\r\n");
   else {
-    send_to_char("Your group consists of:\r\n", ch);
+    char buf[MAX_STRING_LENGTH];
+
+    send_to_char(ch, "Your group consists of:\r\n");
 
     k = (ch->master ? ch->master : ch);
 
     if (AFF_FLAGGED(k, AFF_GROUP)) {
-      sprintf(buf, "     [%3dH %3dM %3dV] [%2d %s] $N (Head of group)",
+      snprintf(buf, sizeof(buf), "     [%3dH %3dM %3dV] [%2d %s] $N (Head of group)",
 	      GET_HIT(k), GET_MANA(k), GET_MOVE(k), GET_LEVEL(k), CLASS_ABBR(k));
       act(buf, FALSE, ch, 0, k, TO_CHAR);
     }
@@ -405,7 +402,7 @@ void print_group(struct char_data *ch)
       if (!AFF_FLAGGED(f->follower, AFF_GROUP))
 	continue;
 
-      sprintf(buf, "     [%3dH %3dM %3dV] [%2d %s] $N", GET_HIT(f->follower),
+      snprintf(buf, sizeof(buf), "     [%3dH %3dM %3dV] [%2d %s] $N", GET_HIT(f->follower),
 	      GET_MANA(f->follower), GET_MOVE(f->follower),
 	      GET_LEVEL(f->follower), CLASS_ABBR(f->follower));
       act(buf, FALSE, ch, 0, f->follower, TO_CHAR);
@@ -417,6 +414,7 @@ void print_group(struct char_data *ch)
 
 ACMD(do_group)
 {
+  char buf[MAX_STRING_LENGTH];
   struct char_data *vict;
   struct follow_type *f;
   int found;
@@ -439,12 +437,12 @@ ACMD(do_group)
     for (found = 0, f = ch->followers; f; f = f->next)
       found += perform_group(ch, f->follower);
     if (!found)
-      send_to_char("Everyone following you is already in your group.\r\n", ch);
+      send_to_char(ch, "Everyone following you is already in your group.\r\n");
     return;
   }
 
   if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)))
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
   else if ((vict->master != ch) && (vict != ch))
     act("$N must follow you to enter your group.", FALSE, ch, 0, vict, TO_CHAR);
   else {
@@ -464,6 +462,7 @@ ACMD(do_group)
 
 ACMD(do_ungroup)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct follow_type *f, *next_fol;
   struct char_data *tch;
 
@@ -471,35 +470,35 @@ ACMD(do_ungroup)
 
   if (!*buf) {
     if (ch->master || !(AFF_FLAGGED(ch, AFF_GROUP))) {
-      send_to_char("But you lead no group!\r\n", ch);
+      send_to_char(ch, "But you lead no group!\r\n");
       return;
     }
-    sprintf(buf2, "%s has disbanded the group.\r\n", GET_NAME(ch));
+
     for (f = ch->followers; f; f = next_fol) {
       next_fol = f->next;
       if (AFF_FLAGGED(f->follower, AFF_GROUP)) {
 	REMOVE_BIT(AFF_FLAGS(f->follower), AFF_GROUP);
-	send_to_char(buf2, f->follower);
+        act("$N has disbanded the group.", TRUE, f->follower, NULL, ch, TO_CHAR);
         if (!AFF_FLAGGED(f->follower, AFF_CHARM))
 	  stop_follower(f->follower);
       }
     }
 
     REMOVE_BIT(AFF_FLAGS(ch), AFF_GROUP);
-    send_to_char("You disband the group.\r\n", ch);
+    send_to_char(ch, "You disband the group.\r\n");
     return;
   }
   if (!(tch = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM))) {
-    send_to_char("There is no such person!\r\n", ch);
+    send_to_char(ch, "There is no such person!\r\n");
     return;
   }
   if (tch->master != ch) {
-    send_to_char("That person is not following you!\r\n", ch);
+    send_to_char(ch, "That person is not following you!\r\n");
     return;
   }
 
   if (!AFF_FLAGGED(tch, AFF_GROUP)) {
-    send_to_char("That person isn't in your group.\r\n", ch);
+    send_to_char(ch, "That person isn't in your group.\r\n");
     return;
   }
 
@@ -518,35 +517,39 @@ ACMD(do_ungroup)
 
 ACMD(do_report)
 {
+  char buf[MAX_STRING_LENGTH];
   struct char_data *k;
   struct follow_type *f;
 
   if (!AFF_FLAGGED(ch, AFF_GROUP)) {
-    send_to_char("But you are not a member of any group!\r\n", ch);
+    send_to_char(ch, "But you are not a member of any group!\r\n");
     return;
   }
-  sprintf(buf, "%s reports: %d/%dH, %d/%dM, %d/%dV\r\n",
-	  GET_NAME(ch), GET_HIT(ch), GET_MAX_HIT(ch),
+
+  snprintf(buf, sizeof(buf), "$n reports: %d/%dH, %d/%dM, %d/%dV\r\n",
+	  GET_HIT(ch), GET_MAX_HIT(ch),
 	  GET_MANA(ch), GET_MAX_MANA(ch),
 	  GET_MOVE(ch), GET_MAX_MOVE(ch));
 
-  CAP(buf);
-
   k = (ch->master ? ch->master : ch);
 
   for (f = k->followers; f; f = f->next)
     if (AFF_FLAGGED(f->follower, AFF_GROUP) && f->follower != ch)
-      send_to_char(buf, f->follower);
+      act(buf, TRUE, ch, NULL, f->follower, TO_VICT);
+
   if (k != ch)
-    send_to_char(buf, k);
-  send_to_char("You report to the group.\r\n", ch);
+    act(buf, TRUE, ch, NULL, k, TO_VICT);
+
+  send_to_char(ch, "You report to the group.\r\n");
 }
 
 
 
 ACMD(do_split)
 {
+  char buf[MAX_INPUT_LENGTH];
   int amount, num, share, rest;
+  size_t len;
   struct char_data *k;
   struct follow_type *f;
 
@@ -558,11 +561,11 @@ ACMD(do_split)
   if (is_number(buf)) {
     amount = atoi(buf);
     if (amount <= 0) {
-      send_to_char("Sorry, you can't do that.\r\n", ch);
+      send_to_char(ch, "Sorry, you can't do that.\r\n");
       return;
     }
     if (amount > GET_GOLD(ch)) {
-      send_to_char("You don't seem to have that much gold to split.\r\n", ch);
+      send_to_char(ch, "You don't seem to have that much gold to split.\r\n");
       return;
     }
     k = (ch->master ? ch->master : ch);
@@ -582,47 +585,46 @@ ACMD(do_split)
       share = amount / num;
       rest = amount % num;
     } else {
-      send_to_char("With whom do you wish to share your gold?\r\n", ch);
+      send_to_char(ch, "With whom do you wish to share your gold?\r\n");
       return;
     }
 
     GET_GOLD(ch) -= share * (num - 1);
 
-    sprintf(buf, "%s splits %d coins; you receive %d.\r\n", GET_NAME(ch),
-            amount, share);
-    if (rest) {
-      sprintf(buf + strlen(buf), "%d coin%s %s not splitable, so %s "
-              "keeps the money.\r\n", rest,
-              (rest == 1) ? "" : "s",
-              (rest == 1) ? "was" : "were",
-              GET_NAME(ch));
+    /* Abusing signed/unsigned to make sizeof work. */
+    len = snprintf(buf, sizeof(buf), "%s splits %d coins; you receive %d.\r\n",
+		GET_NAME(ch), amount, share);
+    if (rest && len < sizeof(buf)) {
+      snprintf(buf + len, sizeof(buf) - len,
+		"%d coin%s %s not splitable, so %s keeps the money.\r\n", rest,
+		(rest == 1) ? "" : "s", (rest == 1) ? "was" : "were", GET_NAME(ch));
     }
-    if (AFF_FLAGGED(k, AFF_GROUP) && (IN_ROOM(k) == IN_ROOM(ch))
-	&& !(IS_NPC(k)) && k != ch) {
+    if (AFF_FLAGGED(k, AFF_GROUP) && IN_ROOM(k) == IN_ROOM(ch) &&
+		!IS_NPC(k) && k != ch) {
       GET_GOLD(k) += share;
-      send_to_char(buf, k);
+      send_to_char(k, "%s", buf);
     }
+
     for (f = k->followers; f; f = f->next) {
       if (AFF_FLAGGED(f->follower, AFF_GROUP) &&
 	  (!IS_NPC(f->follower)) &&
 	  (IN_ROOM(f->follower) == IN_ROOM(ch)) &&
 	  f->follower != ch) {
+
 	GET_GOLD(f->follower) += share;
-	send_to_char(buf, f->follower);
+	send_to_char(f->follower, "%s", buf);
       }
     }
-    sprintf(buf, "You split %d coins among %d members -- %d coins each.\r\n",
+    send_to_char(ch, "You split %d coins among %d members -- %d coins each.\r\n",
 	    amount, num, share);
+
     if (rest) {
-      sprintf(buf + strlen(buf), "%d coin%s %s not splitable, so you keep "
-                                 "the money.\r\n", rest,
-                                 (rest == 1) ? "" : "s",
-                                 (rest == 1) ? "was" : "were");
+      send_to_char(ch, "%d coin%s %s not splitable, so you keep the money.\r\n",
+		rest, (rest == 1) ? "" : "s", (rest == 1) ? "was" : "were");
       GET_GOLD(ch) += rest;
     }
-    send_to_char(buf, ch);
   } else {
-    send_to_char("How many coins do you wish to split with your group?\r\n", ch);
+    send_to_char(ch, "How many coins do you wish to split with your group?\r\n");
     return;
   }
 }
@@ -631,12 +633,12 @@ ACMD(do_split)
 
 ACMD(do_use)
 {
+  char buf[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
   struct obj_data *mag_item;
 
   half_chop(argument, arg, buf);
   if (!*arg) {
-    sprintf(buf2, "What do you want to %s?\r\n", CMD_NAME);
-    send_to_char(buf2, ch);
+    send_to_char(ch, "What do you want to %s?\r\n", CMD_NAME);
     return;
   }
   mag_item = GET_EQ(ch, WEAR_HOLD);
@@ -646,14 +648,12 @@ ACMD(do_use)
     case SCMD_RECITE:
     case SCMD_QUAFF:
       if (!(mag_item = get_obj_in_list_vis(ch, arg, NULL, ch->carrying))) {
-	sprintf(buf2, "You don't seem to have %s %s.\r\n", AN(arg), arg);
-	send_to_char(buf2, ch);
+	send_to_char(ch, "You don't seem to have %s %s.\r\n", AN(arg), arg);
 	return;
       }
       break;
     case SCMD_USE:
-      sprintf(buf2, "You don't seem to be holding %s %s.\r\n", AN(arg), arg);
-      send_to_char(buf2, ch);
+      send_to_char(ch, "You don't seem to be holding %s %s.\r\n", AN(arg), arg);
       return;
     default:
       log("SYSERR: Unknown subcmd %d passed to do_use.", subcmd);
@@ -663,20 +663,20 @@ ACMD(do_use)
   switch (subcmd) {
   case SCMD_QUAFF:
     if (GET_OBJ_TYPE(mag_item) != ITEM_POTION) {
-      send_to_char("You can only quaff potions.\r\n", ch);
+      send_to_char(ch, "You can only quaff potions.\r\n");
       return;
     }
     break;
   case SCMD_RECITE:
     if (GET_OBJ_TYPE(mag_item) != ITEM_SCROLL) {
-      send_to_char("You can only recite scrolls.\r\n", ch);
+      send_to_char(ch, "You can only recite scrolls.\r\n");
       return;
     }
     break;
   case SCMD_USE:
     if ((GET_OBJ_TYPE(mag_item) != ITEM_WAND) &&
 	(GET_OBJ_TYPE(mag_item) != ITEM_STAFF)) {
-      send_to_char("You can't seem to figure out how to use it.\r\n", ch);
+      send_to_char(ch, "You can't seem to figure out how to use it.\r\n");
       return;
     }
     break;
@@ -689,6 +689,7 @@ ACMD(do_use)
 
 ACMD(do_wimpy)
 {
+  char arg[MAX_INPUT_LENGTH];
   int wimp_lev;
 
   /* 'wimp_level' is a player_special. -gg 2/25/98 */
@@ -699,35 +700,31 @@ ACMD(do_wimpy)
 
   if (!*arg) {
     if (GET_WIMP_LEV(ch)) {
-      sprintf(buf, "Your current wimp level is %d hit points.\r\n",
-	      GET_WIMP_LEV(ch));
-      send_to_char(buf, ch);
+      send_to_char(ch, "Your current wimp level is %d hit points.\r\n", GET_WIMP_LEV(ch));
       return;
     } else {
-      send_to_char("At the moment, you're not a wimp.  (sure, sure...)\r\n", ch);
+      send_to_char(ch, "At the moment, you're not a wimp.  (sure, sure...)\r\n");
       return;
     }
   }
   if (isdigit(*arg)) {
     if ((wimp_lev = atoi(arg)) != 0) {
       if (wimp_lev < 0)
-	send_to_char("Heh, heh, heh.. we are jolly funny today, eh?\r\n", ch);
+	send_to_char(ch, "Heh, heh, heh.. we are jolly funny today, eh?\r\n");
       else if (wimp_lev > GET_MAX_HIT(ch))
-	send_to_char("That doesn't make much sense, now does it?\r\n", ch);
+	send_to_char(ch, "That doesn't make much sense, now does it?\r\n");
       else if (wimp_lev > (GET_MAX_HIT(ch) / 2))
-	send_to_char("You can't set your wimp level above half your hit points.\r\n", ch);
+	send_to_char(ch, "You can't set your wimp level above half your hit points.\r\n");
       else {
-	sprintf(buf, "Okay, you'll wimp out if you drop below %d hit points.\r\n",
-		wimp_lev);
-	send_to_char(buf, ch);
+	send_to_char(ch, "Okay, you'll wimp out if you drop below %d hit points.\r\n", wimp_lev);
 	GET_WIMP_LEV(ch) = wimp_lev;
       }
     } else {
-      send_to_char("Okay, you'll now tough out fights to the bitter end.\r\n", ch);
+      send_to_char(ch, "Okay, you'll now tough out fights to the bitter end.\r\n");
       GET_WIMP_LEV(ch) = 0;
     }
   } else
-    send_to_char("Specify at how many hit points you want to wimp out at.  (0 to disable)\r\n", ch);
+    send_to_char(ch, "Specify at how many hit points you want to wimp out at.  (0 to disable)\r\n");
 }
 
 
@@ -736,13 +733,13 @@ ACMD(do_display)
   size_t i;
 
   if (IS_NPC(ch)) {
-    send_to_char("Mosters don't need displays.  Go away.\r\n", ch);
+    send_to_char(ch, "Mosters don't need displays.  Go away.\r\n");
     return;
   }
   skip_spaces(&argument);
 
   if (!*argument) {
-    send_to_char("Usage: prompt { { H | M | V } | all | none }\r\n", ch);
+    send_to_char(ch, "Usage: prompt { { H | M | V } | all | none }\r\n");
     return;
   }
   if (!str_cmp(argument, "on") || !str_cmp(argument, "all"))
@@ -764,13 +761,13 @@ ACMD(do_display)
 	SET_BIT(PRF_FLAGS(ch), PRF_DISPMOVE);
 	break;
       default:
-	send_to_char("Usage: prompt { { H | M | V } | all | none }\r\n", ch);
+	send_to_char(ch, "Usage: prompt { { H | M | V } | all | none }\r\n");
 	return;
       }
     }
   }
 
-  send_to_char(OK, ch);
+  send_to_char(ch, "%s", OK);
 }
 
 
@@ -778,7 +775,7 @@ ACMD(do_display)
 ACMD(do_gen_write)
 {
   FILE *fl;
-  char *tmp, buf[MAX_STRING_LENGTH];
+  char *tmp;
   const char *filename;
   struct stat fbuf;
   time_t ct;
@@ -801,7 +798,7 @@ ACMD(do_gen_write)
   tmp = asctime(localtime(&ct));
 
   if (IS_NPC(ch)) {
-    send_to_char("Monsters can't have ideas - Go away.\r\n", ch);
+    send_to_char(ch, "Monsters can't have ideas - Go away.\r\n");
     return;
   }
 
@@ -809,29 +806,28 @@ ACMD(do_gen_write)
   delete_doubledollar(argument);
 
   if (!*argument) {
-    send_to_char("That must be a mistake...\r\n", ch);
+    send_to_char(ch, "That must be a mistake...\r\n");
     return;
   }
-  sprintf(buf, "%s %s: %s", GET_NAME(ch), CMD_NAME, argument);
-  mudlog(buf, CMP, LVL_IMMORT, FALSE);
+  mudlog(CMP, LVL_IMMORT, FALSE, "%s %s: %s", GET_NAME(ch), CMD_NAME, argument);
 
   if (stat(filename, &fbuf) < 0) {
     perror("SYSERR: Can't stat() file");
     return;
   }
   if (fbuf.st_size >= max_filesize) {
-    send_to_char("Sorry, the file is full right now.. try again later.\r\n", ch);
+    send_to_char(ch, "Sorry, the file is full right now.. try again later.\r\n");
     return;
   }
   if (!(fl = fopen(filename, "a"))) {
     perror("SYSERR: do_gen_write");
-    send_to_char("Could not open the file.  Sorry.\r\n", ch);
+    send_to_char(ch, "Could not open the file.  Sorry.\r\n");
     return;
   }
   fprintf(fl, "%-8s (%6.6s) [%5d] %s\n", GET_NAME(ch), (tmp + 4),
 	  GET_ROOM_VNUM(IN_ROOM(ch)), argument);
   fclose(fl);
-  send_to_char("Okay.  Thanks!\r\n", ch);
+  send_to_char(ch, "Okay.  Thanks!\r\n");
 }
 
 
@@ -944,9 +940,9 @@ ACMD(do_gen_tog)
   }
 
   if (result)
-    send_to_char(tog_messages[subcmd][TOG_ON], ch);
+    send_to_char(ch, "%s", tog_messages[subcmd][TOG_ON]);
   else
-    send_to_char(tog_messages[subcmd][TOG_OFF], ch);
+    send_to_char(ch, "%s", tog_messages[subcmd][TOG_OFF]);
 
   return;
 }
Index: src/act.social.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.social.c,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- src/act.social.c	2002/01/10 17:24:47	1.20
+++ src/act.social.c	2002/02/01 02:04:17	1.23
@@ -85,12 +85,13 @@ int find_action(int cmd)
 
 ACMD(do_action)
 {
+  char buf[MAX_INPUT_LENGTH];
   int act_nr;
   struct social_messg *action;
   struct char_data *vict;
 
   if ((act_nr = find_action(cmd)) < 0) {
-    send_to_char("That action is not supported.\r\n", ch);
+    send_to_char(ch, "That action is not supported.\r\n");
     return;
   }
   action = &soc_mess_list[act_nr];
@@ -101,22 +102,18 @@ ACMD(do_action)
     *buf = '\0';
 
   if (!*buf) {
-    send_to_char(action->char_no_arg, ch);
-    send_to_char("\r\n", ch);
+    send_to_char(ch, "%s\r\n", action->char_no_arg);
     act(action->others_no_arg, action->hide, ch, 0, 0, TO_ROOM);
     return;
   }
-  if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM))) {
-    send_to_char(action->not_found, ch);
-    send_to_char("\r\n", ch);
-  } else if (vict == ch) {
-    send_to_char(action->char_auto, ch);
-    send_to_char("\r\n", ch);
+  if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)))
+    send_to_char(ch, "%s\r\n", action->not_found);
+  else if (vict == ch) {
+    send_to_char(ch, "%s\r\n", action->char_auto);
     act(action->others_auto, action->hide, ch, 0, 0, TO_ROOM);
   } else {
     if (GET_POS(vict) < action->min_victim_position)
-      act("$N is not in a proper position for that.",
-	  FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
+      act("$N is not in a proper position for that.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP);
     else {
       act(action->char_found, 0, ch, 0, vict, TO_CHAR | TO_SLEEP);
       act(action->others_found, action->hide, ch, 0, vict, TO_NOTVICT);
@@ -129,19 +126,19 @@ ACMD(do_action)
 
 ACMD(do_insult)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *victim;
 
   one_argument(argument, arg);
 
   if (*arg) {
     if (!(victim = get_char_vis(ch, arg, NULL, FIND_CHAR_ROOM)))
-      send_to_char("Can't hear you!\r\n", ch);
+      send_to_char(ch, "Can't hear you!\r\n");
     else {
       if (victim != ch) {
-	sprintf(buf, "You insult %s.\r\n", GET_NAME(victim));
-	send_to_char(buf, ch);
+	send_to_char(ch, "You insult %s.\r\n", GET_NAME(victim));
 
-	switch (number(0, 2)) {
+	switch (rand_number(0, 2)) {
 	case 0:
 	  if (GET_SEX(ch) == SEX_MALE) {
 	    if (GET_SEX(victim) == SEX_MALE)
@@ -167,11 +164,11 @@ ACMD(do_insult)
 
 	act("$n insults $N.", TRUE, ch, 0, victim, TO_NOTVICT);
       } else {			/* ch == victim */
-	send_to_char("You feel insulted.\r\n", ch);
+	send_to_char(ch, "You feel insulted.\r\n");
       }
     }
   } else
-    send_to_char("I'm sure you don't want to insult *everybody*...\r\n", ch);
+    send_to_char(ch, "I'm sure you don't want to insult *everybody*...\r\n");
 }
 
 
@@ -188,7 +185,7 @@ char *fread_action(FILE *fl, int nr)
     return (NULL);
 
   buf[strlen(buf) - 1] = '\0';
-  return (str_dup(buf));
+  return (strdup(buf));
 }
 
 
Index: src/act.wizard.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/act.wizard.c,v
retrieving revision 1.65
retrieving revision 1.74
diff -u -p -r1.65 -r1.74
--- src/act.wizard.c	2002/01/15 23:42:16	1.65
+++ src/act.wizard.c	2002/04/09 14:12:15	1.74
@@ -27,13 +27,10 @@ extern FILE *player_fl;
 extern struct attack_hit_type attack_hit_text[];
 extern char *class_abbrevs[];
 extern time_t boot_time;
-extern zone_rnum top_of_zone_table;
 extern int circle_shutdown, circle_reboot;
 extern int circle_restrict;
 extern int load_into_inventory;
 extern int buf_switches, buf_largecount, buf_overflows;
-extern mob_rnum top_of_mobt;
-extern obj_rnum top_of_objt;
 extern int top_of_p_table;
 
 /* for chars */
@@ -48,6 +45,7 @@ void appear(struct char_data *ch);
 void reset_zone(zone_rnum zone);
 void roll_real_abils(struct char_data *ch);
 int parse_class(char arg);
+void run_autowiz(void);
 
 /* local functions */
 int perform_set(struct char_data *ch, struct char_data *vict, int mode, char *val_arg);
@@ -87,7 +85,7 @@ ACMD(do_force);
 ACMD(do_wiznet);
 ACMD(do_zreset);
 ACMD(do_wizutil);
-void print_zone_to_buf(char *bufptr, zone_rnum zone);
+size_t print_zone_to_buf(char *bufptr, size_t left, zone_rnum zone);
 ACMD(do_show);
 ACMD(do_set);
 void snoop_check(struct char_data *ch);
@@ -98,15 +96,19 @@ ACMD(do_echo)
   skip_spaces(&argument);
 
   if (!*argument)
-    send_to_char("Yes.. but what?\r\n", ch);
+    send_to_char(ch, "Yes.. but what?\r\n");
   else {
+    char buf[MAX_INPUT_LENGTH + 4];
+
     if (subcmd == SCMD_EMOTE)
-      sprintf(buf, "$n %s", argument);
+      snprintf(buf, sizeof(buf), "$n %s", argument);
     else
-      strcpy(buf, argument);
+      strlcpy(buf, argument, sizeof(buf));
+
     act(buf, FALSE, ch, 0, 0, TO_ROOM);
+
     if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
+      send_to_char(ch, "%s", OK);
     else
       act(buf, FALSE, ch, 0, 0, TO_CHAR);
   }
@@ -115,26 +117,24 @@ ACMD(do_echo)
 
 ACMD(do_send)
 {
+  char arg[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
   struct char_data *vict;
 
   half_chop(argument, arg, buf);
 
   if (!*arg) {
-    send_to_char("Send what to who?\r\n", ch);
+    send_to_char(ch, "Send what to who?\r\n");
     return;
   }
   if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD))) {
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
     return;
   }
-  send_to_char(buf, vict);
-  send_to_char("\r\n", vict);
+  send_to_char(vict, "%s\r\n", buf);
   if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-    send_to_char("Sent.\r\n", ch);
-  else {
-    sprintf(buf2, "You send '%s' to %s.\r\n", buf, GET_NAME(vict));
-    send_to_char(buf2, ch);
-  }
+    send_to_char(ch, "Sent.\r\n");
+  else
+    send_to_char(ch, "You send '%s' to %s.\r\n", buf, GET_NAME(vict));
 }
 
 
@@ -148,13 +148,13 @@ room_rnum find_target_room(struct char_d
   one_argument(rawroomstr, roomstr);
 
   if (!*roomstr) {
-    send_to_char("You must supply a room number or name.\r\n", ch);
+    send_to_char(ch, "You must supply a room number or name.\r\n");
     return (NOWHERE);
   }
 
   if (isdigit(*roomstr) && !strchr(roomstr, '.')) {
     if ((location = real_room((room_vnum)atoi(roomstr))) == NOWHERE) {
-      send_to_char("No room exists with that number.\r\n", ch);
+      send_to_char(ch, "No room exists with that number.\r\n");
       return (NOWHERE);
     }
   } else {
@@ -166,7 +166,7 @@ room_rnum find_target_room(struct char_d
     num = get_number(&mobobjstr);
     if ((target_mob = get_char_vis(ch, mobobjstr, &num, FIND_CHAR_WORLD)) != NULL) {
       if ((location = IN_ROOM(target_mob)) == NOWHERE) {
-        send_to_char("That character is currently lost.\r\n", ch);
+        send_to_char(ch, "That character is currently lost.\r\n");
         return (NOWHERE);
       }
     } else if ((target_obj = get_obj_vis(ch, mobobjstr, &num)) != NULL) {
@@ -178,13 +178,13 @@ room_rnum find_target_room(struct char_d
         location = IN_ROOM(target_obj->worn_by);
 
       if (location == NOWHERE) {
-        send_to_char("That object is currently not in a room.\r\n", ch);
+        send_to_char(ch, "That object is currently not in a room.\r\n");
         return (NOWHERE);
       }
     }
 
     if (location == NOWHERE) {
-      send_to_char("Nothing exists by that name.\r\n", ch);
+      send_to_char(ch, "Nothing exists by that name.\r\n");
       return (NOWHERE);
     }
   }
@@ -194,11 +194,11 @@ room_rnum find_target_room(struct char_d
     return (location);
 
   if (ROOM_FLAGGED(location, ROOM_GODROOM))
-    send_to_char("You are not godly enough to use that room!\r\n", ch);
+    send_to_char(ch, "You are not godly enough to use that room!\r\n");
   else if (ROOM_FLAGGED(location, ROOM_PRIVATE) && world[location].people && world[location].people->next_in_room)
-    send_to_char("There's a private conversation going on in that room.\r\n", ch);
+    send_to_char(ch, "There's a private conversation going on in that room.\r\n");
   else if (ROOM_FLAGGED(location, ROOM_HOUSE) && !House_can_enter(ch, GET_ROOM_VNUM(location)))
-    send_to_char("That's private property -- no trespassing!\r\n", ch);
+    send_to_char(ch, "That's private property -- no trespassing!\r\n");
   else
     return (location);
 
@@ -209,17 +209,17 @@ room_rnum find_target_room(struct char_d
 
 ACMD(do_at)
 {
-  char command[MAX_INPUT_LENGTH];
+  char command[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
   room_rnum location, original_loc;
 
   half_chop(argument, buf, command);
   if (!*buf) {
-    send_to_char("You must supply a room number or a name.\r\n", ch);
+    send_to_char(ch, "You must supply a room number or a name.\r\n");
     return;
   }
 
   if (!*command) {
-    send_to_char("What do you want to do there?\r\n", ch);
+    send_to_char(ch, "What do you want to do there?\r\n");
     return;
   }
 
@@ -242,26 +242,21 @@ ACMD(do_at)
 
 ACMD(do_goto)
 {
+  char buf[MAX_STRING_LENGTH];
   room_rnum location;
 
   if ((location = find_target_room(ch, argument)) == NOWHERE)
     return;
-
-  if (POOFOUT(ch))
-    sprintf(buf, "$n %s", POOFOUT(ch));
-  else
-    strcpy(buf, "$n disappears in a puff of smoke.");
 
+  snprintf(buf, sizeof(buf), "$n %s", POOFOUT(ch) ? POOFOUT(ch) : "disappears in a puff of smoke.");
   act(buf, TRUE, ch, 0, 0, TO_ROOM);
+
   char_from_room(ch);
   char_to_room(ch, location);
-
-  if (POOFIN(ch))
-    sprintf(buf, "$n %s", POOFIN(ch));
-  else
-    strcpy(buf, "$n appears with an ear-splitting bang.");
 
+  snprintf(buf, sizeof(buf), "$n %s", POOFIN(ch) ? POOFIN(ch) : "appears with an ear-splitting bang.");
   act(buf, TRUE, ch, 0, 0, TO_ROOM);
+
   look_at_room(ch, 0);
 }
 
@@ -269,20 +264,21 @@ ACMD(do_goto)
 
 ACMD(do_trans)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct descriptor_data *i;
   struct char_data *victim;
 
   one_argument(argument, buf);
   if (!*buf)
-    send_to_char("Whom do you wish to transfer?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to transfer?\r\n");
   else if (str_cmp("all", buf)) {
     if (!(victim = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
-      send_to_char(NOPERSON, ch);
+      send_to_char(ch, "%s", NOPERSON);
     else if (victim == ch)
-      send_to_char("That doesn't make much sense, does it?\r\n", ch);
+      send_to_char(ch, "That doesn't make much sense, does it?\r\n");
     else {
       if ((GET_LEVEL(ch) < GET_LEVEL(victim)) && !IS_NPC(victim)) {
-	send_to_char("Go transfer someone your own size.\r\n", ch);
+	send_to_char(ch, "Go transfer someone your own size.\r\n");
 	return;
       }
       act("$n disappears in a mushroom cloud.", FALSE, victim, 0, 0, TO_ROOM);
@@ -294,7 +290,7 @@ ACMD(do_trans)
     }
   } else {			/* Trans All */
     if (GET_LEVEL(ch) < LVL_GRGOD) {
-      send_to_char("I think not.\r\n", ch);
+      send_to_char(ch, "I think not.\r\n");
       return;
     }
 
@@ -310,7 +306,7 @@ ACMD(do_trans)
 	act("$n has transferred you!", FALSE, ch, 0, victim, TO_VICT);
 	look_at_room(victim, 0);
       }
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
   }
 }
 
@@ -318,23 +314,24 @@ ACMD(do_trans)
 
 ACMD(do_teleport)
 {
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
   struct char_data *victim;
   room_rnum target;
 
   two_arguments(argument, buf, buf2);
 
   if (!*buf)
-    send_to_char("Whom do you wish to teleport?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to teleport?\r\n");
   else if (!(victim = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
   else if (victim == ch)
-    send_to_char("Use 'goto' to teleport yourself.\r\n", ch);
+    send_to_char(ch, "Use 'goto' to teleport yourself.\r\n");
   else if (GET_LEVEL(victim) >= GET_LEVEL(ch))
-    send_to_char("Maybe you shouldn't do that.\r\n", ch);
+    send_to_char(ch, "Maybe you shouldn't do that.\r\n");
   else if (!*buf2)
-    send_to_char("Where do you wish to send this person?\r\n", ch);
+    send_to_char(ch, "Where do you wish to send this person?\r\n");
   else if ((target = find_target_room(ch, buf2)) != NOWHERE) {
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
     act("$n disappears in a puff of smoke.", FALSE, victim, 0, 0, TO_ROOM);
     char_from_room(victim);
     char_to_room(victim, target);
@@ -348,120 +345,104 @@ ACMD(do_teleport)
 
 ACMD(do_vnum)
 {
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
+
   half_chop(argument, buf, buf2);
 
   if (!*buf || !*buf2 || (!is_abbrev(buf, "mob") && !is_abbrev(buf, "obj"))) {
-    send_to_char("Usage: vnum { obj | mob } <name>\r\n", ch);
+    send_to_char(ch, "Usage: vnum { obj | mob } <name>\r\n");
     return;
   }
   if (is_abbrev(buf, "mob"))
     if (!vnum_mobile(buf2, ch))
-      send_to_char("No mobiles by that name.\r\n", ch);
+      send_to_char(ch, "No mobiles by that name.\r\n");
 
   if (is_abbrev(buf, "obj"))
     if (!vnum_object(buf2, ch))
-      send_to_char("No objects by that name.\r\n", ch);
+      send_to_char(ch, "No objects by that name.\r\n");
 }
 
 
 
 void do_stat_room(struct char_data *ch)
 {
+  char buf2[MAX_STRING_LENGTH];
   struct extra_descr_data *desc;
   struct room_data *rm = &world[IN_ROOM(ch)];
-  int i, found;
+  int i, found, column;
   struct obj_data *j;
   struct char_data *k;
 
-  sprintf(buf, "Room name: %s%s%s\r\n", CCCYN(ch, C_NRM), rm->name,
-	  CCNRM(ch, C_NRM));
-  send_to_char(buf, ch);
+  send_to_char(ch, "Room name: %s%s%s\r\n", CCCYN(ch, C_NRM), rm->name, CCNRM(ch, C_NRM));
 
-  sprinttype(rm->sector_type, sector_types, buf2);
-  sprintf(buf, "Zone: [%3d], VNum: [%s%5d%s], RNum: [%5d], Type: %s\r\n",
+  sprinttype(rm->sector_type, sector_types, buf2, sizeof(buf2));
+  send_to_char(ch, "Zone: [%3d], VNum: [%s%5d%s], RNum: [%5d], Type: %s\r\n",
 	  zone_table[rm->zone].number, CCGRN(ch, C_NRM), rm->number,
 	  CCNRM(ch, C_NRM), IN_ROOM(ch), buf2);
-  send_to_char(buf, ch);
 
-  sprintbit(rm->room_flags, room_bits, buf2);
-  sprintf(buf, "SpecProc: %s, Flags: %s\r\n",
-	  (rm->func == NULL) ? "None" : "Exists", buf2);
-  send_to_char(buf, ch);
-
-  send_to_char("Description:\r\n", ch);
-  if (rm->description)
-    send_to_char(rm->description, ch);
-  else
-    send_to_char("  None.\r\n", ch);
+  sprintbit(rm->room_flags, room_bits, buf2, sizeof(buf2));
+  send_to_char(ch, "SpecProc: %s, Flags: %s\r\n", rm->func == NULL ? "None" : "Exists", buf2);
 
+  send_to_char(ch, "Description:\r\n%s", rm->description ? rm->description : "  None.\r\n");
+
   if (rm->ex_description) {
-    sprintf(buf, "Extra descs:%s", CCCYN(ch, C_NRM));
-    for (desc = rm->ex_description; desc; desc = desc->next) {
-      strcat(buf, " ");
-      strcat(buf, desc->keyword);
-    }
-    strcat(buf, CCNRM(ch, C_NRM));
-    send_to_char(strcat(buf, "\r\n"), ch);
+    send_to_char(ch, "Extra descs:%s", CCCYN(ch, C_NRM));
+    for (desc = rm->ex_description; desc; desc = desc->next)
+      send_to_char(ch, " %s", desc->keyword);
+    send_to_char(ch, "%s\r\n", CCNRM(ch, C_NRM));
   }
-  sprintf(buf, "Chars present:%s", CCYEL(ch, C_NRM));
-  for (found = 0, k = rm->people; k; k = k->next_in_room) {
+
+  send_to_char(ch, "Chars present:%s", CCYEL(ch, C_NRM));
+  column = 14;	/* ^^^ strlen ^^^ */
+  for (found = FALSE, k = rm->people; k; k = k->next_in_room) {
     if (!CAN_SEE(ch, k))
       continue;
-    sprintf(buf2, "%s %s(%s)", found++ ? "," : "", GET_NAME(k),
-	    (!IS_NPC(k) ? "PC" : (!IS_MOB(k) ? "NPC" : "MOB")));
-    strcat(buf, buf2);
-    if (strlen(buf) >= 62) {
-      if (k->next_in_room)
-	send_to_char(strcat(buf, ",\r\n"), ch);
-      else
-	send_to_char(strcat(buf, "\r\n"), ch);
-      *buf = found = 0;
+
+    column += send_to_char(ch, "%s %s(%s)", found++ ? "," : "", GET_NAME(k),
+		!IS_NPC(k) ? "PC" : (!IS_MOB(k) ? "NPC" : "MOB"));
+    if (column >= 62) {
+      send_to_char(ch, "%s\r\n", k->next_in_room ? "," : "");
+      found = FALSE;
+      column = 0;
     }
   }
-
-  if (*buf)
-    send_to_char(strcat(buf, "\r\n"), ch);
-  send_to_char(CCNRM(ch, C_NRM), ch);
+  send_to_char(ch, "%s", CCNRM(ch, C_NRM));
 
   if (rm->contents) {
-    sprintf(buf, "Contents:%s", CCGRN(ch, C_NRM));
+    send_to_char(ch, "Contents:%s", CCGRN(ch, C_NRM));
+    column = 9;	/* ^^^ strlen ^^^ */
+
     for (found = 0, j = rm->contents; j; j = j->next_content) {
       if (!CAN_SEE_OBJ(ch, j))
 	continue;
-      sprintf(buf2, "%s %s", found++ ? "," : "", j->short_description);
-      strcat(buf, buf2);
-      if (strlen(buf) >= 62) {
-	if (j->next_content)
-	  send_to_char(strcat(buf, ",\r\n"), ch);
-	else
-	  send_to_char(strcat(buf, "\r\n"), ch);
-	*buf = found = 0;
+
+      column += send_to_char(ch, "%s %s", found++ ? "," : "", j->short_description);
+      if (column >= 62) {
+	send_to_char(ch, "%s\r\n", j->next_content ? "," : "");
+	found = FALSE;
+        column = 0;
       }
     }
-
-    if (*buf)
-      send_to_char(strcat(buf, "\r\n"), ch);
-    send_to_char(CCNRM(ch, C_NRM), ch);
+    send_to_char(ch, "%s", CCNRM(ch, C_NRM));
   }
+
   for (i = 0; i < NUM_OF_DIRS; i++) {
-    if (rm->dir_option[i]) {
-      if (rm->dir_option[i]->to_room == NOWHERE)
-	sprintf(buf1, " %sNONE%s", CCCYN(ch, C_NRM), CCNRM(ch, C_NRM));
-      else
-	sprintf(buf1, "%s%5d%s", CCCYN(ch, C_NRM),
-		GET_ROOM_VNUM(rm->dir_option[i]->to_room), CCNRM(ch, C_NRM));
-      sprintbit(rm->dir_option[i]->exit_info, exit_bits, buf2);
-      sprintf(buf, "Exit %s%-5s%s:  To: [%s], Key: [%5d], Keywrd: %s, Type: %s\r\n ",
-	      CCCYN(ch, C_NRM), dirs[i], CCNRM(ch, C_NRM), buf1, rm->dir_option[i]->key,
-	   rm->dir_option[i]->keyword ? rm->dir_option[i]->keyword : "None",
-	      buf2);
-      send_to_char(buf, ch);
-      if (rm->dir_option[i]->general_description)
-	strcpy(buf, rm->dir_option[i]->general_description);
-      else
-	strcpy(buf, "  No exit description.\r\n");
-      send_to_char(buf, ch);
-    }
+    char buf1[128];
+
+    if (!rm->dir_option[i])
+      continue;
+
+    if (rm->dir_option[i]->to_room == NOWHERE)
+      snprintf(buf1, sizeof(buf1), " %sNONE%s", CCCYN(ch, C_NRM), CCNRM(ch, C_NRM));
+    else
+      snprintf(buf1, sizeof(buf1), "%s%5d%s", CCCYN(ch, C_NRM), GET_ROOM_VNUM(rm->dir_option[i]->to_room), CCNRM(ch, C_NRM));
+
+    sprintbit(rm->dir_option[i]->exit_info, exit_bits, buf2, sizeof(buf2));
+
+    send_to_char(ch, "Exit %s%-5s%s:  To: [%s], Key: [%5d], Keywrd: %s, Type: %s\r\n%s",
+	CCCYN(ch, C_NRM), dirs[i], CCNRM(ch, C_NRM), buf1, rm->dir_option[i]->key,
+	rm->dir_option[i]->keyword ? rm->dir_option[i]->keyword : "None", buf2,
+	rm->dir_option[i]->general_description ? rm->dir_option[i]->general_description : "  No exit description.\r\n");
   }
 }
 
@@ -473,133 +454,107 @@ void do_stat_object(struct char_data *ch
   obj_vnum vnum;
   struct obj_data *j2;
   struct extra_descr_data *desc;
+  char buf[MAX_STRING_LENGTH];
 
   vnum = GET_OBJ_VNUM(j);
-  sprintf(buf, "Name: '%s%s%s', Aliases: %s\r\n", CCYEL(ch, C_NRM),
-	  ((j->short_description) ? j->short_description : "<None>"),
+  send_to_char(ch, "Name: '%s%s%s', Aliases: %s\r\n", CCYEL(ch, C_NRM),
+	  j->short_description ? j->short_description : "<None>",
 	  CCNRM(ch, C_NRM), j->name);
-  send_to_char(buf, ch);
 
-  sprinttype(GET_OBJ_TYPE(j), item_types, buf1);
-  strcpy(buf2, GET_OBJ_SPEC(j) ? "Exists" : "None");
-  sprintf(buf, "VNum: [%s%5d%s], RNum: [%5d], Type: %s, SpecProc: %s\r\n",
-	CCGRN(ch, C_NRM), vnum, CCNRM(ch, C_NRM), GET_OBJ_RNUM(j), buf1, buf2);
-  send_to_char(buf, ch);
+  sprinttype(GET_OBJ_TYPE(j), item_types, buf, sizeof(buf));
+  send_to_char(ch, "VNum: [%s%5d%s], RNum: [%5d], Type: %s, SpecProc: %s\r\n",
+	CCGRN(ch, C_NRM), vnum, CCNRM(ch, C_NRM), GET_OBJ_RNUM(j), buf,
+	GET_OBJ_SPEC(j) ? "Exists" : "None");
 
-  sprintf(buf, "L-Des: %s\r\n", ((j->description) ? j->description : "None"));
-  send_to_char(buf, ch);
-
   if (j->ex_description) {
-    sprintf(buf, "Extra descs:%s", CCCYN(ch, C_NRM));
-    for (desc = j->ex_description; desc; desc = desc->next) {
-      strcat(buf, " ");
-      strcat(buf, desc->keyword);
-    }
-    strcat(buf, CCNRM(ch, C_NRM));
-    send_to_char(strcat(buf, "\r\n"), ch);
-  }
-  send_to_char("Can be worn on: ", ch);
-  sprintbit(GET_OBJ_WEAR(j), wear_bits, buf);
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
-
-  send_to_char("Set char bits : ", ch);
-  sprintbit(GET_OBJ_AFFECT(j), affected_bits, buf);
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
-
-  send_to_char("Extra flags   : ", ch);
-  sprintbit(GET_OBJ_EXTRA(j), extra_bits, buf);
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+    send_to_char(ch, "Extra descs:%s", CCCYN(ch, C_NRM));
+    for (desc = j->ex_description; desc; desc = desc->next)
+      send_to_char(ch, " %s", desc->keyword);
+    send_to_char(ch, "%s\r\n", CCNRM(ch, C_NRM));
+  }
 
-  sprintf(buf, "Weight: %d, Value: %d, Cost/day: %d, Timer: %d\r\n",
+  sprintbit(GET_OBJ_WEAR(j), wear_bits, buf, sizeof(buf));
+  send_to_char(ch, "Can be worn on: %s\r\n", buf);
+
+  sprintbit(GET_OBJ_AFFECT(j), affected_bits, buf, sizeof(buf));
+  send_to_char(ch, "Set char bits : %s\r\n", buf);
+
+  sprintbit(GET_OBJ_EXTRA(j), extra_bits, buf, sizeof(buf));
+  send_to_char(ch, "Extra flags   : %s\r\n", buf);
+
+  send_to_char(ch, "Weight: %d, Value: %d, Cost/day: %d, Timer: %d\r\n",
      GET_OBJ_WEIGHT(j), GET_OBJ_COST(j), GET_OBJ_RENT(j), GET_OBJ_TIMER(j));
-  send_to_char(buf, ch);
 
-  strcpy(buf, "In room: ");
-  if (IN_ROOM(j) == NOWHERE)
-    strcat(buf, "Nowhere");
-  else {
-    sprintf(buf2, "%d", GET_ROOM_VNUM(IN_ROOM(j)));
-    strcat(buf, buf2);
-  }
+  send_to_char(ch, "In room: %d (%s), ", GET_ROOM_VNUM(IN_ROOM(j)),
+	IN_ROOM(j) == NOWHERE ? "Nowhere" : world[IN_ROOM(j)].name);
+
   /*
    * NOTE: In order to make it this far, we must already be able to see the
    *       character holding the object. Therefore, we do not need CAN_SEE().
    */
-  strcat(buf, ", In object: ");
-  strcat(buf, j->in_obj ? j->in_obj->short_description : "None");
-  strcat(buf, ", Carried by: ");
-  strcat(buf, j->carried_by ? GET_NAME(j->carried_by) : "Nobody");
-  strcat(buf, ", Worn by: ");
-  strcat(buf, j->worn_by ? GET_NAME(j->worn_by) : "Nobody");
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+  send_to_char(ch, "In object: %s, ", j->in_obj ? j->in_obj->short_description : "None");
+  send_to_char(ch, "Carried by: %s, ", j->carried_by ? GET_NAME(j->carried_by) : "Nobody");
+  send_to_char(ch, "Worn by: %s\r\n", j->worn_by ? GET_NAME(j->worn_by) : "Nobody");
 
   switch (GET_OBJ_TYPE(j)) {
   case ITEM_LIGHT:
     if (GET_OBJ_VAL(j, 2) == -1)
-      strcpy(buf, "Hours left: Infinite");
+      send_to_char(ch, "Hours left: Infinite\r\n");
     else
-      sprintf(buf, "Hours left: [%d]", GET_OBJ_VAL(j, 2));
+      send_to_char(ch, "Hours left: [%d]\r\n", GET_OBJ_VAL(j, 2));
     break;
   case ITEM_SCROLL:
   case ITEM_POTION:
-    sprintf(buf, "Spells: (Level %d) %s, %s, %s", GET_OBJ_VAL(j, 0),
+    send_to_char(ch, "Spells: (Level %d) %s, %s, %s\r\n", GET_OBJ_VAL(j, 0),
 	    skill_name(GET_OBJ_VAL(j, 1)), skill_name(GET_OBJ_VAL(j, 2)),
 	    skill_name(GET_OBJ_VAL(j, 3)));
     break;
   case ITEM_WAND:
   case ITEM_STAFF:
-    sprintf(buf, "Spell: %s at level %d, %d (of %d) charges remaining",
+    send_to_char(ch, "Spell: %s at level %d, %d (of %d) charges remaining\r\n",
 	    skill_name(GET_OBJ_VAL(j, 3)), GET_OBJ_VAL(j, 0),
 	    GET_OBJ_VAL(j, 2), GET_OBJ_VAL(j, 1));
     break;
   case ITEM_WEAPON:
-    sprintf(buf, "Todam: %dd%d, Message type: %d",
+    send_to_char(ch, "Todam: %dd%d, Message type: %d\r\n",
 	    GET_OBJ_VAL(j, 1), GET_OBJ_VAL(j, 2), GET_OBJ_VAL(j, 3));
     break;
   case ITEM_ARMOR:
-    sprintf(buf, "AC-apply: [%d]", GET_OBJ_VAL(j, 0));
+    send_to_char(ch, "AC-apply: [%d]\r\n", GET_OBJ_VAL(j, 0));
     break;
   case ITEM_TRAP:
-    sprintf(buf, "Spell: %d, - Hitpoints: %d",
-	    GET_OBJ_VAL(j, 0), GET_OBJ_VAL(j, 1));
+    send_to_char(ch, "Spell: %d, - Hitpoints: %d\r\n", GET_OBJ_VAL(j, 0), GET_OBJ_VAL(j, 1));
     break;
   case ITEM_CONTAINER:
-    sprintbit(GET_OBJ_VAL(j, 1), container_bits, buf2);
-    sprintf(buf, "Weight capacity: %d, Lock Type: %s, Key Num: %d, Corpse: %s",
-	    GET_OBJ_VAL(j, 0), buf2, GET_OBJ_VAL(j, 2),
+    sprintbit(GET_OBJ_VAL(j, 1), container_bits, buf, sizeof(buf));
+    send_to_char(ch, "Weight capacity: %d, Lock Type: %s, Key Num: %d, Corpse: %s\r\n",
+	    GET_OBJ_VAL(j, 0), buf, GET_OBJ_VAL(j, 2),
 	    YESNO(GET_OBJ_VAL(j, 3)));
     break;
   case ITEM_DRINKCON:
   case ITEM_FOUNTAIN:
-    sprinttype(GET_OBJ_VAL(j, 2), drinks, buf2);
-    sprintf(buf, "Capacity: %d, Contains: %d, Poisoned: %s, Liquid: %s",
-	    GET_OBJ_VAL(j, 0), GET_OBJ_VAL(j, 1), YESNO(GET_OBJ_VAL(j, 3)),
-	    buf2);
+    sprinttype(GET_OBJ_VAL(j, 2), drinks, buf, sizeof(buf));
+    send_to_char(ch, "Capacity: %d, Contains: %d, Poisoned: %s, Liquid: %s\r\n",
+	    GET_OBJ_VAL(j, 0), GET_OBJ_VAL(j, 1), YESNO(GET_OBJ_VAL(j, 3)), buf);
     break;
   case ITEM_NOTE:
-    sprintf(buf, "Tongue: %d", GET_OBJ_VAL(j, 0));
+    send_to_char(ch, "Tongue: %d\r\n", GET_OBJ_VAL(j, 0));
     break;
   case ITEM_KEY:
-    strcpy(buf, "");
+    /* Nothing */
     break;
   case ITEM_FOOD:
-    sprintf(buf, "Makes full: %d, Poisoned: %s", GET_OBJ_VAL(j, 0),
-	    YESNO(GET_OBJ_VAL(j, 3)));
+    send_to_char(ch, "Makes full: %d, Poisoned: %s\r\n", GET_OBJ_VAL(j, 0), YESNO(GET_OBJ_VAL(j, 3)));
     break;
   case ITEM_MONEY:
-    sprintf(buf, "Coins: %d", GET_OBJ_VAL(j, 0));
+    send_to_char(ch, "Coins: %d\r\n", GET_OBJ_VAL(j, 0));
     break;
   default:
-    sprintf(buf, "Values 0-3: [%d] [%d] [%d] [%d]",
+    send_to_char(ch, "Values 0-3: [%d] [%d] [%d] [%d]\r\n",
 	    GET_OBJ_VAL(j, 0), GET_OBJ_VAL(j, 1),
 	    GET_OBJ_VAL(j, 2), GET_OBJ_VAL(j, 3));
     break;
   }
-  send_to_char(strcat(buf, "\r\n"), ch);
 
   /*
    * I deleted the "equipment status" code from here because it seemed
@@ -607,96 +562,78 @@ void do_stat_object(struct char_data *ch
    */
 
   if (j->contains) {
-    sprintf(buf, "\r\nContents:%s", CCGRN(ch, C_NRM));
+    int column;
+
+    send_to_char(ch, "\r\nContents:%s", CCGRN(ch, C_NRM));
+    column = 9;	/* ^^^ strlen ^^^ */
+
     for (found = 0, j2 = j->contains; j2; j2 = j2->next_content) {
-      sprintf(buf2, "%s %s", found++ ? "," : "", j2->short_description);
-      strcat(buf, buf2);
-      if (strlen(buf) >= 62) {
-	if (j2->next_content)
-	  send_to_char(strcat(buf, ",\r\n"), ch);
-	else
-	  send_to_char(strcat(buf, "\r\n"), ch);
-	*buf = found = 0;
+      column += send_to_char(ch, "%s %s", found++ ? "," : "", j2->short_description);
+      if (column >= 62) {
+	send_to_char(ch, "%s\r\n", j2->next_content ? "," : "");
+	found = FALSE;
+        column = 0;
       }
     }
-
-    if (*buf)
-      send_to_char(strcat(buf, "\r\n"), ch);
-    send_to_char(CCNRM(ch, C_NRM), ch);
+    send_to_char(ch, "%s", CCNRM(ch, C_NRM));
   }
-  found = 0;
-  send_to_char("Affections:", ch);
+
+  found = FALSE;
+  send_to_char(ch, "Affections:");
   for (i = 0; i < MAX_OBJ_AFFECT; i++)
     if (j->affected[i].modifier) {
-      sprinttype(j->affected[i].location, apply_types, buf2);
-      sprintf(buf, "%s %+d to %s", found++ ? "," : "",
-	      j->affected[i].modifier, buf2);
-      send_to_char(buf, ch);
+      sprinttype(j->affected[i].location, apply_types, buf, sizeof(buf));
+      send_to_char(ch, "%s %+d to %s", found++ ? "," : "", j->affected[i].modifier, buf);
     }
   if (!found)
-    send_to_char(" None", ch);
+    send_to_char(ch, " None");
 
-  send_to_char("\r\n", ch);
+  send_to_char(ch, "\r\n");
 }
 
 
 void do_stat_character(struct char_data *ch, struct char_data *k)
 {
-  int i, i2, found = 0;
+  char buf[MAX_STRING_LENGTH];
+  int i, i2, column, found = FALSE;
   struct obj_data *j;
   struct follow_type *fol;
   struct affected_type *aff;
 
-  sprinttype(GET_SEX(k), genders, buf);
-  sprintf(buf2, " %s '%s'  IDNum: [%5ld], In room [%5d]\r\n",
-	  (!IS_NPC(k) ? "PC" : (!IS_MOB(k) ? "NPC" : "MOB")),
+  sprinttype(GET_SEX(k), genders, buf, sizeof(buf));
+  send_to_char(ch, "%s %s '%s'  IDNum: [%5ld], In room [%5d]\r\n",
+	  buf, (!IS_NPC(k) ? "PC" : (!IS_MOB(k) ? "NPC" : "MOB")),
 	  GET_NAME(k), GET_IDNUM(k), GET_ROOM_VNUM(IN_ROOM(k)));
-  send_to_char(strcat(buf, buf2), ch);
-  if (IS_MOB(k)) {
-    sprintf(buf, "Alias: %s, VNum: [%5d], RNum: [%5d]\r\n",
-	    k->player.name, GET_MOB_VNUM(k), GET_MOB_RNUM(k));
-    send_to_char(buf, ch);
-  }
-
-  sprintf(buf, "Title: %s\r\n", (k->player.title ? k->player.title : "<None>"));
-  send_to_char(buf, ch);
-
-  sprintf(buf, "L-Des: %s", (k->player.long_descr ? k->player.long_descr : "<None>\r\n"));
-  send_to_char(buf, ch);
-
-  if (IS_NPC(k)) {	/* Use GET_CLASS() macro? */
-    strcpy(buf, "Monster Class: ");
-    sprinttype(k->player.chclass, npc_class_types, buf2);
-  } else {
-    strcpy(buf, "Class: ");
-    sprinttype(k->player.chclass, pc_class_types, buf2);
-  }
-  strcat(buf, buf2);
 
-  sprintf(buf2, ", Lev: [%s%2d%s], XP: [%s%7d%s], Align: [%4d]\r\n",
-	  CCYEL(ch, C_NRM), GET_LEVEL(k), CCNRM(ch, C_NRM),
-	  CCYEL(ch, C_NRM), GET_EXP(k), CCNRM(ch, C_NRM),
-	  GET_ALIGNMENT(k));
-  strcat(buf, buf2);
-  send_to_char(buf, ch);
+  if (IS_MOB(k))
+    send_to_char(ch, "Alias: %s, VNum: [%5d], RNum: [%5d]\r\n", k->player.name, GET_MOB_VNUM(k), GET_MOB_RNUM(k));
 
+  send_to_char(ch, "Title: %s\r\n", k->player.title ? k->player.title : "<None>");
+
+  send_to_char(ch, "L-Des: %s", k->player.long_descr ? k->player.long_descr : "<None>\r\n");
+
+  sprinttype(k->player.chclass, IS_NPC(k) ? npc_class_types : pc_class_types, buf, sizeof(buf));
+  send_to_char(ch, "%sClass: %s, Lev: [%s%2d%s], XP: [%s%7d%s], Align: [%4d]\r\n",
+	IS_NPC(k) ? "Monster " : "", buf, CCYEL(ch, C_NRM), GET_LEVEL(k), CCNRM(ch, C_NRM),
+	CCYEL(ch, C_NRM), GET_EXP(k), CCNRM(ch, C_NRM), GET_ALIGNMENT(k));
+
   if (!IS_NPC(k)) {
-    strcpy(buf1, (char *) asctime(localtime(&(k->player.time.birth))));
-    strcpy(buf2, (char *) asctime(localtime(&(k->player.time.logon))));
+    char buf1[64], buf2[64];
+
+    strlcpy(buf1, asctime(localtime(&(k->player.time.birth))), sizeof(buf1));
+    strlcpy(buf2, asctime(localtime(&(k->player.time.logon))), sizeof(buf2));
     buf1[10] = buf2[10] = '\0';
 
-    sprintf(buf, "Created: [%s], Last Logon: [%s], Played [%dh %dm], Age [%d]\r\n",
+    send_to_char(ch, "Created: [%s], Last Logon: [%s], Played [%dh %dm], Age [%d]\r\n",
 	    buf1, buf2, k->player.time.played / 3600,
 	    ((k->player.time.played % 3600) / 60), age(k)->year);
-    send_to_char(buf, ch);
 
-    sprintf(buf, "Hometown: [%d], Speaks: [%d/%d/%d], (STL[%d]/per[%d]/NSTL[%d])\r\n",
+    send_to_char(ch, "Hometown: [%d], Speaks: [%d/%d/%d], (STL[%d]/per[%d]/NSTL[%d])\r\n",
 	 k->player.hometown, GET_TALK(k, 0), GET_TALK(k, 1), GET_TALK(k, 2),
 	    GET_PRACTICES(k), int_app[GET_INT(k)].learn,
 	    wis_app[GET_WIS(k)].bonus);
-    send_to_char(buf, ch);
   }
-  sprintf(buf, "Str: [%s%d/%d%s]  Int: [%s%d%s]  Wis: [%s%d%s]  "
+  send_to_char(ch, "Str: [%s%d/%d%s]  Int: [%s%d%s]  Wis: [%s%d%s]  "
 	  "Dex: [%s%d%s]  Con: [%s%d%s]  Cha: [%s%d%s]\r\n",
 	  CCCYN(ch, C_NRM), GET_STR(k), GET_ADD(k), CCNRM(ch, C_NRM),
 	  CCCYN(ch, C_NRM), GET_INT(k), CCNRM(ch, C_NRM),
@@ -704,127 +641,98 @@ void do_stat_character(struct char_data 
 	  CCCYN(ch, C_NRM), GET_DEX(k), CCNRM(ch, C_NRM),
 	  CCCYN(ch, C_NRM), GET_CON(k), CCNRM(ch, C_NRM),
 	  CCCYN(ch, C_NRM), GET_CHA(k), CCNRM(ch, C_NRM));
-  send_to_char(buf, ch);
 
-  sprintf(buf, "Hit p.:[%s%d/%d+%d%s]  Mana p.:[%s%d/%d+%d%s]  Move p.:[%s%d/%d+%d%s]\r\n",
+  send_to_char(ch, "Hit p.:[%s%d/%d+%d%s]  Mana p.:[%s%d/%d+%d%s]  Move p.:[%s%d/%d+%d%s]\r\n",
 	  CCGRN(ch, C_NRM), GET_HIT(k), GET_MAX_HIT(k), hit_gain(k), CCNRM(ch, C_NRM),
 	  CCGRN(ch, C_NRM), GET_MANA(k), GET_MAX_MANA(k), mana_gain(k), CCNRM(ch, C_NRM),
 	  CCGRN(ch, C_NRM), GET_MOVE(k), GET_MAX_MOVE(k), move_gain(k), CCNRM(ch, C_NRM));
-  send_to_char(buf, ch);
 
-  sprintf(buf, "Coins: [%9d], Bank: [%9d] (Total: %d)\r\n",
+  send_to_char(ch, "Coins: [%9d], Bank: [%9d] (Total: %d)\r\n",
 	  GET_GOLD(k), GET_BANK_GOLD(k), GET_GOLD(k) + GET_BANK_GOLD(k));
-  send_to_char(buf, ch);
 
-  sprintf(buf, "AC: [%d%+d/10], Hitroll: [%2d], Damroll: [%2d], Saving throws: [%d/%d/%d/%d/%d]\r\n",
+  send_to_char(ch, "AC: [%d%+d/10], Hitroll: [%2d], Damroll: [%2d], Saving throws: [%d/%d/%d/%d/%d]\r\n",
 	  GET_AC(k), dex_app[GET_DEX(k)].defensive, k->points.hitroll,
 	  k->points.damroll, GET_SAVE(k, 0), GET_SAVE(k, 1), GET_SAVE(k, 2),
 	  GET_SAVE(k, 3), GET_SAVE(k, 4));
-  send_to_char(buf, ch);
 
-  sprinttype(GET_POS(k), position_types, buf2);
-  sprintf(buf, "Pos: %s, Fighting: %s", buf2,
-	  (FIGHTING(k) ? GET_NAME(FIGHTING(k)) : "Nobody"));
+  sprinttype(GET_POS(k), position_types, buf, sizeof(buf));
+  send_to_char(ch, "Pos: %s, Fighting: %s", buf, FIGHTING(k) ? GET_NAME(FIGHTING(k)) : "Nobody");
 
-  if (IS_NPC(k)) {
-    strcat(buf, ", Attack type: ");
-    strcat(buf, attack_hit_text[k->mob_specials.attack_type].singular);
-  }
+  if (IS_NPC(k))
+    send_to_char(ch, ", Attack type: %s", attack_hit_text[(int) k->mob_specials.attack_type].singular);
+
   if (k->desc) {
-    sprinttype(STATE(k->desc), connected_types, buf2);
-    strcat(buf, ", Connected: ");
-    strcat(buf, buf2);
-  }
-  send_to_char(strcat(buf, "\r\n"), ch);
-
-  strcpy(buf, "Default position: ");
-  sprinttype((k->mob_specials.default_pos), position_types, buf2);
-  strcat(buf, buf2);
-
-  sprintf(buf2, ", Idle Timer (in tics) [%d]\r\n", k->char_specials.timer);
-  strcat(buf, buf2);
-  send_to_char(buf, ch);
+    sprinttype(STATE(k->desc), connected_types, buf, sizeof(buf));
+    send_to_char(ch, ", Connected: %s", buf);
+  }
 
   if (IS_NPC(k)) {
-    sprintbit(MOB_FLAGS(k), action_bits, buf2);
-    sprintf(buf, "NPC flags: %s%s%s\r\n", CCCYN(ch, C_NRM), buf2, CCNRM(ch, C_NRM));
-    send_to_char(buf, ch);
+    sprinttype(k->mob_specials.default_pos, position_types, buf, sizeof(buf));
+    send_to_char(ch, ", Default position: %s\r\n", buf);
+    sprintbit(MOB_FLAGS(k), action_bits, buf, sizeof(buf));
+    send_to_char(ch, "NPC flags: %s%s%s\r\n", CCCYN(ch, C_NRM), buf, CCNRM(ch, C_NRM));
   } else {
-    sprintbit(PLR_FLAGS(k), player_bits, buf2);
-    sprintf(buf, "PLR: %s%s%s\r\n", CCCYN(ch, C_NRM), buf2, CCNRM(ch, C_NRM));
-    send_to_char(buf, ch);
-    sprintbit(PRF_FLAGS(k), preference_bits, buf2);
-    sprintf(buf, "PRF: %s%s%s\r\n", CCGRN(ch, C_NRM), buf2, CCNRM(ch, C_NRM));
-    send_to_char(buf, ch);
+    send_to_char(ch, ", Idle Timer (in tics) [%d]\r\n", k->char_specials.timer);
+
+    sprintbit(PLR_FLAGS(k), player_bits, buf, sizeof(buf));
+    send_to_char(ch, "PLR: %s%s%s\r\n", CCCYN(ch, C_NRM), buf, CCNRM(ch, C_NRM));
+
+    sprintbit(PRF_FLAGS(k), preference_bits, buf, sizeof(buf));
+    send_to_char(ch, "PRF: %s%s%s\r\n", CCGRN(ch, C_NRM), buf, CCNRM(ch, C_NRM));
   }
 
-  if (IS_MOB(k)) {
-    sprintf(buf, "Mob Spec-Proc: %s, NPC Bare Hand Dam: %dd%d\r\n",
+  if (IS_MOB(k))
+    send_to_char(ch, "Mob Spec-Proc: %s, NPC Bare Hand Dam: %dd%d\r\n",
 	    (mob_index[GET_MOB_RNUM(k)].func ? "Exists" : "None"),
 	    k->mob_specials.damnodice, k->mob_specials.damsizedice);
-    send_to_char(buf, ch);
-  }
-  sprintf(buf, "Carried: weight: %d, items: %d; ",
-	  IS_CARRYING_W(k), IS_CARRYING_N(k));
 
   for (i = 0, j = k->carrying; j; j = j->next_content, i++);
-  sprintf(buf + strlen(buf), "Items in: inventory: %d, ", i);
+  send_to_char(ch, "Carried: weight: %d, items: %d; Items in: inventory: %d, ", IS_CARRYING_W(k), IS_CARRYING_N(k), i);
 
   for (i = 0, i2 = 0; i < NUM_WEARS; i++)
     if (GET_EQ(k, i))
       i2++;
-  sprintf(buf2, "eq: %d\r\n", i2);
-  strcat(buf, buf2);
-  send_to_char(buf, ch);
+  send_to_char(ch, "eq: %d\r\n", i2);
 
-  if (!IS_NPC(k)) {
-    sprintf(buf, "Hunger: %d, Thirst: %d, Drunk: %d\r\n",
-	  GET_COND(k, FULL), GET_COND(k, THIRST), GET_COND(k, DRUNK));
-    send_to_char(buf, ch);
-  }
+  if (!IS_NPC(k))
+    send_to_char(ch, "Hunger: %d, Thirst: %d, Drunk: %d\r\n", GET_COND(k, FULL), GET_COND(k, THIRST), GET_COND(k, DRUNK));
 
-  sprintf(buf, "Master is: %s, Followers are:",
-	  ((k->master) ? GET_NAME(k->master) : "<none>"));
-
-  for (fol = k->followers; fol; fol = fol->next) {
-    sprintf(buf2, "%s %s", found++ ? "," : "", PERS(fol->follower, ch));
-    strcat(buf, buf2);
-    if (strlen(buf) >= 62) {
-      if (fol->next)
-	send_to_char(strcat(buf, ",\r\n"), ch);
-      else
-	send_to_char(strcat(buf, "\r\n"), ch);
-      *buf = found = 0;
+  column = send_to_char(ch, "Master is: %s, Followers are:", k->master ? GET_NAME(k->master) : "<none>");
+  if (!k->followers)
+    send_to_char(ch, " <none>\r\n");
+  else {
+    for (fol = k->followers; fol; fol = fol->next) {
+      column += send_to_char(ch, "%s %s", found++ ? "," : "", PERS(fol->follower, ch));
+      if (column >= 62) {
+        send_to_char(ch, "%s\r\n", fol->next ? "," : "");
+        found = FALSE;
+        column = 0;
+      }
     }
+    if (column != 0)
+      send_to_char(ch, "\r\n");
   }
 
-  if (*buf)
-    send_to_char(strcat(buf, "\r\n"), ch);
-
   /* Showing the bitvector */
-  sprintbit(AFF_FLAGS(k), affected_bits, buf2);
-  sprintf(buf, "AFF: %s%s%s\r\n", CCYEL(ch, C_NRM), buf2, CCNRM(ch, C_NRM));
-  send_to_char(buf, ch);
+  sprintbit(AFF_FLAGS(k), affected_bits, buf, sizeof(buf));
+  send_to_char(ch, "AFF: %s%s%s\r\n", CCYEL(ch, C_NRM), buf, CCNRM(ch, C_NRM));
 
   /* Routine to show what spells a char is affected by */
   if (k->affected) {
     for (aff = k->affected; aff; aff = aff->next) {
-      *buf2 = '\0';
-      sprintf(buf, "SPL: (%3dhr) %s%-21s%s ", aff->duration + 1,
-	      CCCYN(ch, C_NRM), skill_name(aff->type), CCNRM(ch, C_NRM));
-      if (aff->modifier) {
-	sprintf(buf2, "%+d to %s", aff->modifier, apply_types[(int) aff->location]);
-	strcat(buf, buf2);
-      }
+      send_to_char(ch, "SPL: (%3dhr) %s%-21s%s ", aff->duration + 1, CCCYN(ch, C_NRM), skill_name(aff->type), CCNRM(ch, C_NRM));
+
+      if (aff->modifier)
+	send_to_char(ch, "%+d to %s", aff->modifier, apply_types[(int) aff->location]);
+
       if (aff->bitvector) {
-	if (*buf2)
-	  strcat(buf, ", sets ");
-	else
-	  strcat(buf, "sets ");
-	sprintbit(aff->bitvector, affected_bits, buf2);
-	strcat(buf, buf2);
+	if (aff->modifier)
+	  send_to_char(ch, ", ");
+
+	sprintbit(aff->bitvector, affected_bits, buf, sizeof(buf));
+        send_to_char(ch, "sets %s", buf);
       }
-      send_to_char(strcat(buf, "\r\n"), ch);
+      send_to_char(ch, "\r\n");
     }
   }
 }
@@ -832,6 +740,7 @@ void do_stat_character(struct char_data 
 
 ACMD(do_stat)
 {
+  char buf1[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
   struct char_data *victim;
   struct obj_data *object;
   struct char_file_u tmp_store;
@@ -839,31 +748,31 @@ ACMD(do_stat)
   half_chop(argument, buf1, buf2);
 
   if (!*buf1) {
-    send_to_char("Stats on who or what?\r\n", ch);
+    send_to_char(ch, "Stats on who or what?\r\n");
     return;
   } else if (is_abbrev(buf1, "room")) {
     do_stat_room(ch);
   } else if (is_abbrev(buf1, "mob")) {
     if (!*buf2)
-      send_to_char("Stats on which mobile?\r\n", ch);
+      send_to_char(ch, "Stats on which mobile?\r\n");
     else {
       if ((victim = get_char_vis(ch, buf2, NULL, FIND_CHAR_WORLD)) != NULL)
 	do_stat_character(ch, victim);
       else
-	send_to_char("No such mobile around.\r\n", ch);
+	send_to_char(ch, "No such mobile around.\r\n");
     }
   } else if (is_abbrev(buf1, "player")) {
     if (!*buf2) {
-      send_to_char("Stats on which player?\r\n", ch);
+      send_to_char(ch, "Stats on which player?\r\n");
     } else {
       if ((victim = get_player_vis(ch, buf2, NULL, FIND_CHAR_WORLD)) != NULL)
 	do_stat_character(ch, victim);
       else
-	send_to_char("No such player around.\r\n", ch);
+	send_to_char(ch, "No such player around.\r\n");
     }
   } else if (is_abbrev(buf1, "file")) {
     if (!*buf2)
-      send_to_char("Stats on which player?\r\n", ch);
+      send_to_char(ch, "Stats on which player?\r\n");
     else if ((victim = get_player_vis(ch, buf2, NULL, FIND_CHAR_WORLD)) != NULL)
 	do_stat_character(ch, victim);
     else {
@@ -874,23 +783,23 @@ ACMD(do_stat)
 	victim->player.time.logon = tmp_store.last_logon;
 	char_to_room(victim, 0);
 	if (GET_LEVEL(victim) > GET_LEVEL(ch))
-	  send_to_char("Sorry, you can't do that.\r\n", ch);
+	  send_to_char(ch, "Sorry, you can't do that.\r\n");
 	else
 	  do_stat_character(ch, victim);
 	extract_char_final(victim);
       } else {
-	send_to_char("There is no such player.\r\n", ch);
+	send_to_char(ch, "There is no such player.\r\n");
 	free(victim);
       }
     }
   } else if (is_abbrev(buf1, "object")) {
     if (!*buf2)
-      send_to_char("Stats on which object?\r\n", ch);
+      send_to_char(ch, "Stats on which object?\r\n");
     else {
       if ((object = get_obj_vis(ch, buf2, NULL)) != NULL)
 	do_stat_object(ch, object);
       else
-	send_to_char("No such object around.\r\n", ch);
+	send_to_char(ch, "No such object around.\r\n");
     }
   } else {
     char *name = buf1;
@@ -909,15 +818,17 @@ ACMD(do_stat)
     else if ((object = get_obj_vis(ch, name, &number)) != NULL)
       do_stat_object(ch, object);
     else
-      send_to_char("Nothing around by that name.\r\n", ch);
+      send_to_char(ch, "Nothing around by that name.\r\n");
   }
 }
 
 
 ACMD(do_shutdown)
 {
+  char arg[MAX_INPUT_LENGTH];
+
   if (subcmd != SCMD_SHUTDOWN) {
-    send_to_char("If you want to shut something down, say so!\r\n", ch);
+    send_to_char(ch, "If you want to shut something down, say so!\r\n");
     return;
   }
   one_argument(argument, arg);
@@ -942,7 +853,7 @@ ACMD(do_shutdown)
     touch(PAUSE_FILE);
     circle_shutdown = 1;
   } else
-    send_to_char("Unknown shutdown option.\r\n", ch);
+    send_to_char(ch, "Unknown shutdown option.\r\n");
 }
 
 
@@ -971,9 +882,9 @@ void snoop_check(struct char_data *ch)
 void stop_snooping(struct char_data *ch)
 {
   if (!ch->desc->snooping)
-    send_to_char("You aren't snooping anyone.\r\n", ch);
+    send_to_char(ch, "You aren't snooping anyone.\r\n");
   else {
-    send_to_char("You stop snooping.\r\n", ch);
+    send_to_char(ch, "You stop snooping.\r\n");
     ch->desc->snooping->snoop_by = NULL;
     ch->desc->snooping = NULL;
   }
@@ -982,6 +893,7 @@ void stop_snooping(struct char_data *ch)
 
 ACMD(do_snoop)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *victim, *tch;
 
   if (!ch->desc)
@@ -992,15 +904,15 @@ ACMD(do_snoop)
   if (!*arg)
     stop_snooping(ch);
   else if (!(victim = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)))
-    send_to_char("No such person around.\r\n", ch);
+    send_to_char(ch, "No such person around.\r\n");
   else if (!victim->desc)
-    send_to_char("There's no link.. nothing to snoop.\r\n", ch);
+    send_to_char(ch, "There's no link.. nothing to snoop.\r\n");
   else if (victim == ch)
     stop_snooping(ch);
   else if (victim->desc->snoop_by)
-    send_to_char("Busy already. \r\n", ch);
+    send_to_char(ch, "Busy already. \r\n");
   else if (victim->desc->snooping == ch->desc)
-    send_to_char("Don't be stupid.\r\n", ch);
+    send_to_char(ch, "Don't be stupid.\r\n");
   else {
     if (victim->desc->original)
       tch = victim->desc->original;
@@ -1008,10 +920,10 @@ ACMD(do_snoop)
       tch = victim;
 
     if (GET_LEVEL(tch) >= GET_LEVEL(ch)) {
-      send_to_char("You can't.\r\n", ch);
+      send_to_char(ch, "You can't.\r\n");
       return;
     }
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
 
     if (ch->desc->snooping)
       ch->desc->snooping->snoop_by = NULL;
@@ -1025,29 +937,30 @@ ACMD(do_snoop)
 
 ACMD(do_switch)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *victim;
 
   one_argument(argument, arg);
 
   if (ch->desc->original)
-    send_to_char("You're already switched.\r\n", ch);
+    send_to_char(ch, "You're already switched.\r\n");
   else if (!*arg)
-    send_to_char("Switch with who?\r\n", ch);
+    send_to_char(ch, "Switch with who?\r\n");
   else if (!(victim = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)))
-    send_to_char("No such character.\r\n", ch);
+    send_to_char(ch, "No such character.\r\n");
   else if (ch == victim)
-    send_to_char("Hee hee... we are jolly funny today, eh?\r\n", ch);
+    send_to_char(ch, "Hee hee... we are jolly funny today, eh?\r\n");
   else if (victim->desc)
-    send_to_char("You can't do that, the body is already in use!\r\n", ch);
+    send_to_char(ch, "You can't do that, the body is already in use!\r\n");
   else if ((GET_LEVEL(ch) < LVL_IMPL) && !IS_NPC(victim))
-    send_to_char("You aren't holy enough to use a mortal's body.\r\n", ch);
+    send_to_char(ch, "You aren't holy enough to use a mortal's body.\r\n");
   else if (GET_LEVEL(ch) < LVL_GRGOD && ROOM_FLAGGED(IN_ROOM(victim), ROOM_GODROOM))
-    send_to_char("You are not godly enough to use that room!\r\n", ch);
+    send_to_char(ch, "You are not godly enough to use that room!\r\n");
   else if (GET_LEVEL(ch) < LVL_GRGOD && ROOM_FLAGGED(IN_ROOM(victim), ROOM_HOUSE)
 		&& !House_can_enter(ch, GET_ROOM_VNUM(IN_ROOM(victim))))
-    send_to_char("That's private property -- no trespassing!\r\n", ch);
+    send_to_char(ch, "That's private property -- no trespassing!\r\n");
   else {
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
 
     ch->desc->character = victim;
     ch->desc->original = ch;
@@ -1061,7 +974,7 @@ ACMD(do_switch)
 ACMD(do_return)
 {
   if (ch->desc && ch->desc->original) {
-    send_to_char("You return to your original body.\r\n", ch);
+    send_to_char(ch, "You return to your original body.\r\n");
 
     /*
      * If someone switched into your original body, disconnect them.
@@ -1091,14 +1004,16 @@ ACMD(do_return)
 
 ACMD(do_load)
 {
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
+
   two_arguments(argument, buf, buf2);
 
   if (!*buf || !*buf2 || !isdigit(*buf2)) {
-    send_to_char("Usage: load { obj | mob } <number>\r\n", ch);
+    send_to_char(ch, "Usage: load { obj | mob } <number>\r\n");
     return;
   }
   if (!is_number(buf2)) {
-    send_to_char("That is not a number.\r\n", ch);
+    send_to_char(ch, "That is not a number.\r\n");
     return;
   }
 
@@ -1107,7 +1022,7 @@ ACMD(do_load)
     mob_rnum r_num;
 
     if ((r_num = real_mobile(atoi(buf2))) == NOBODY) {
-      send_to_char("There is no monster with that number.\r\n", ch);
+      send_to_char(ch, "There is no monster with that number.\r\n");
       return;
     }
     mob = read_mobile(r_num, REAL);
@@ -1122,7 +1037,7 @@ ACMD(do_load)
     obj_rnum r_num;
 
     if ((r_num = real_object(atoi(buf2))) == NOTHING) {
-      send_to_char("There is no object with that number.\r\n", ch);
+      send_to_char(ch, "There is no object with that number.\r\n");
       return;
     }
     obj = read_object(r_num, REAL);
@@ -1134,21 +1049,23 @@ ACMD(do_load)
     act("$n has created $p!", FALSE, ch, obj, 0, TO_ROOM);
     act("You create $p.", FALSE, ch, obj, 0, TO_CHAR);
   } else
-    send_to_char("That'll have to be either 'obj' or 'mob'.\r\n", ch);
+    send_to_char(ch, "That'll have to be either 'obj' or 'mob'.\r\n");
 }
 
 
 
 ACMD(do_vstat)
 {
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
+
   two_arguments(argument, buf, buf2);
 
   if (!*buf || !*buf2 || !isdigit(*buf2)) {
-    send_to_char("Usage: vstat { obj | mob } <number>\r\n", ch);
+    send_to_char(ch, "Usage: vstat { obj | mob } <number>\r\n");
     return;
   }
   if (!is_number(buf2)) {
-    send_to_char("That's not a valid number.\r\n", ch);
+    send_to_char(ch, "That's not a valid number.\r\n");
     return;
   }
 
@@ -1157,7 +1074,7 @@ ACMD(do_vstat)
     mob_rnum r_num;
 
     if ((r_num = real_mobile(atoi(buf2))) == NOBODY) {
-      send_to_char("There is no monster with that number.\r\n", ch);
+      send_to_char(ch, "There is no monster with that number.\r\n");
       return;
     }
     mob = read_mobile(r_num, REAL);
@@ -1169,14 +1086,14 @@ ACMD(do_vstat)
     obj_rnum r_num;
 
     if ((r_num = real_object(atoi(buf2))) == NOTHING) {
-      send_to_char("There is no object with that number.\r\n", ch);
+      send_to_char(ch, "There is no object with that number.\r\n");
       return;
     }
     obj = read_object(r_num, REAL);
     do_stat_object(ch, obj);
     extract_obj(obj);
   } else
-    send_to_char("That'll have to be either 'obj' or 'mob'.\r\n", ch);
+    send_to_char(ch, "That'll have to be either 'obj' or 'mob'.\r\n");
 }
 
 
@@ -1185,6 +1102,7 @@ ACMD(do_vstat)
 /* clean a room of all mobiles and objects */
 ACMD(do_purge)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *vict;
   struct obj_data *obj;
 
@@ -1194,14 +1112,13 @@ ACMD(do_purge)
   if (*buf) {
     if ((vict = get_char_vis(ch, buf, NULL, FIND_CHAR_ROOM)) != NULL) {
       if (!IS_NPC(vict) && (GET_LEVEL(ch) <= GET_LEVEL(vict))) {
-	send_to_char("Fuuuuuuuuu!\r\n", ch);
+	send_to_char(ch, "Fuuuuuuuuu!\r\n");
 	return;
       }
       act("$n disintegrates $N.", FALSE, ch, 0, vict, TO_NOTVICT);
 
       if (!IS_NPC(vict)) {
-	sprintf(buf, "(GC) %s has purged %s.", GET_NAME(ch), GET_NAME(vict));
-	mudlog(buf, BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+	mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s has purged %s.", GET_NAME(ch), GET_NAME(vict));
 	if (vict->desc) {
 	  STATE(vict->desc) = CON_CLOSE;
 	  vict->desc->character = NULL;
@@ -1213,17 +1130,17 @@ ACMD(do_purge)
       act("$n destroys $p.", FALSE, ch, obj, 0, TO_ROOM);
       extract_obj(obj);
     } else {
-      send_to_char("Nothing here by that name.\r\n", ch);
+      send_to_char(ch, "Nothing here by that name.\r\n");
       return;
     }
 
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
   } else {			/* no argument. clean out the room */
     int i;
 
     act("$n gestures... You are surrounded by scorching flames!",
 	FALSE, ch, 0, 0, TO_ROOM);
-    send_to_room("The world seems a little cleaner.\r\n", IN_ROOM(ch));
+    send_to_room(IN_ROOM(ch), "The world seems a little cleaner.\r\n");
 
     for (vict = world[IN_ROOM(ch)].people; vict; vict = vict->next_in_room) {
       if (!IS_NPC(vict))
@@ -1256,26 +1173,23 @@ const char *logtypes[] = {
 
 ACMD(do_syslog)
 {
+  char arg[MAX_INPUT_LENGTH];
   int tp;
 
   one_argument(argument, arg);
-
   if (!*arg) {
-    tp = ((PRF_FLAGGED(ch, PRF_LOG1) ? 1 : 0) +
-	  (PRF_FLAGGED(ch, PRF_LOG2) ? 2 : 0));
-    sprintf(buf, "Your syslog is currently %s.\r\n", logtypes[tp]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "Your syslog is currently %s.\r\n",
+	logtypes[(PRF_FLAGGED(ch, PRF_LOG1) ? 1 : 0) + (PRF_FLAGGED(ch, PRF_LOG2) ? 2 : 0)]);
     return;
   }
   if (((tp = search_block(arg, logtypes, FALSE)) == -1)) {
-    send_to_char("Usage: syslog { Off | Brief | Normal | Complete }\r\n", ch);
+    send_to_char(ch, "Usage: syslog { Off | Brief | Normal | Complete }\r\n");
     return;
   }
   REMOVE_BIT(PRF_FLAGS(ch), PRF_LOG1 | PRF_LOG2);
   SET_BIT(PRF_FLAGS(ch), (PRF_LOG1 * (tp & 1)) | (PRF_LOG2 * (tp & 2) >> 1));
 
-  sprintf(buf, "Your syslog is now %s.\r\n", logtypes[tp]);
-  send_to_char(buf, ch);
+  send_to_char(ch, "Your syslog is now %s.\r\n", logtypes[tp]);
 }
 
 
@@ -1283,52 +1197,50 @@ ACMD(do_syslog)
 ACMD(do_advance)
 {
   struct char_data *victim;
-  char *name = arg, *level = buf2;
+  char name[MAX_INPUT_LENGTH], level[MAX_INPUT_LENGTH];
   int newlevel, oldlevel;
 
   two_arguments(argument, name, level);
 
   if (*name) {
     if (!(victim = get_char_vis(ch, name, NULL, FIND_CHAR_WORLD))) {
-      send_to_char("That player is not here.\r\n", ch);
+      send_to_char(ch, "That player is not here.\r\n");
       return;
     }
   } else {
-    send_to_char("Advance who?\r\n", ch);
+    send_to_char(ch, "Advance who?\r\n");
     return;
   }
 
   if (GET_LEVEL(ch) <= GET_LEVEL(victim)) {
-    send_to_char("Maybe that's not such a great idea.\r\n", ch);
+    send_to_char(ch, "Maybe that's not such a great idea.\r\n");
     return;
   }
   if (IS_NPC(victim)) {
-    send_to_char("NO!  Not on NPC's.\r\n", ch);
+    send_to_char(ch, "NO!  Not on NPC's.\r\n");
     return;
   }
   if (!*level || (newlevel = atoi(level)) <= 0) {
-    send_to_char("That's not a level!\r\n", ch);
+    send_to_char(ch, "That's not a level!\r\n");
     return;
   }
   if (newlevel > LVL_IMPL) {
-    sprintf(buf, "%d is the highest possible level.\r\n", LVL_IMPL);
-    send_to_char(buf, ch);
+    send_to_char(ch, "%d is the highest possible level.\r\n", LVL_IMPL);
     return;
   }
   if (newlevel > GET_LEVEL(ch)) {
-    send_to_char("Yeah, right.\r\n", ch);
+    send_to_char(ch, "Yeah, right.\r\n");
     return;
   }
   if (newlevel == GET_LEVEL(victim)) {
-    send_to_char("They are already at that level.\r\n", ch);
+    send_to_char(ch, "They are already at that level.\r\n");
     return;
   }
   oldlevel = GET_LEVEL(victim);
   if (newlevel < GET_LEVEL(victim)) {
     do_start(victim);
     GET_LEVEL(victim) = newlevel;
-    send_to_char("You are momentarily enveloped by darkness!\r\n"
-		 "You feel somewhat diminished.\r\n", victim);
+    send_to_char(victim, "You are momentarily enveloped by darkness!\r\nYou feel somewhat diminished.\r\n");
   } else {
     act("$n makes some strange gestures.\r\n"
 	"A strange feeling comes upon you,\r\n"
@@ -1344,7 +1256,7 @@ ACMD(do_advance)
 	"You feel slightly different.", FALSE, ch, 0, victim, TO_VICT);
   }
 
-  send_to_char(OK, ch);
+  send_to_char(ch, "%s", OK);
 
   if (newlevel < oldlevel)
     log("(GC) %s demoted %s from level %d to %d.",
@@ -1353,12 +1265,13 @@ ACMD(do_advance)
     log("(GC) %s has advanced %s to level %d (from %d)",
 		GET_NAME(ch), GET_NAME(victim), newlevel, oldlevel);
 
-  if (newlevel < LVL_IMMORT) {
+  if (oldlevel >= LVL_IMMORT && newlevel < LVL_IMMORT) {
     /* If they are no longer an immortal, let's remove some of the
      * nice immortal only flags, shall we?
      */
     REMOVE_BIT(PRF_FLAGS(victim), PRF_LOG1 | PRF_LOG2);
     REMOVE_BIT(PRF_FLAGS(victim), PRF_NOHASSLE | PRF_HOLYLIGHT);
+    run_autowiz();
   }
 
   gain_exp_regardless(victim,
@@ -1368,21 +1281,21 @@ ACMD(do_advance)
 
 ACMD(do_restore)
 {
+  char buf[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int i;
 
   one_argument(argument, buf);
   if (!*buf)
-    send_to_char("Whom do you wish to restore?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to restore?\r\n");
   else if (!(vict = get_char_vis(ch, buf, NULL, FIND_CHAR_WORLD)))
-    send_to_char(NOPERSON, ch);
-  else if (!IS_NPC(vict) && GET_LEVEL(vict) >= GET_LEVEL(ch))
-    send_to_char("They don't need your help.\r\n", ch);
+    send_to_char(ch, "%s", NOPERSON);
+  else if (!IS_NPC(vict) && ch != vict && GET_LEVEL(vict) >= GET_LEVEL(ch))
+    send_to_char(ch, "They don't need your help.\r\n");
   else {
     GET_HIT(vict) = GET_MAX_HIT(vict);
     GET_MANA(vict) = GET_MAX_MANA(vict);
     GET_MOVE(vict) = GET_MAX_MOVE(vict);
-    update_pos(vict);
 
     if (!IS_NPC(vict) && GET_LEVEL(ch) >= LVL_GRGOD) {
       if (GET_LEVEL(vict) >= LVL_IMMORT)
@@ -1399,9 +1312,9 @@ ACMD(do_restore)
 	vict->real_abils.cha = 25;
       }
     }
+    update_pos(vict);
     affect_total(vict);
-
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
     act("You have been fully healed by $N!", FALSE, vict, 0, ch, TO_CHAR);
   }
 }
@@ -1410,13 +1323,13 @@ ACMD(do_restore)
 void perform_immort_vis(struct char_data *ch)
 {
   if (GET_INVIS_LEV(ch) == 0 && !AFF_FLAGGED(ch, AFF_HIDE | AFF_INVISIBLE)) {
-    send_to_char("You are already fully visible.\r\n", ch);
+    send_to_char(ch, "You are already fully visible.\r\n");
     return;
   }
    
   GET_INVIS_LEV(ch) = 0;
   appear(ch);
-  send_to_char("You are now fully visible.\r\n", ch);
+  send_to_char(ch, "You are now fully visible.\r\n");
 }
 
 
@@ -1436,17 +1349,17 @@ void perform_immort_invis(struct char_da
   }
 
   GET_INVIS_LEV(ch) = level;
-  sprintf(buf, "Your invisibility level is %d.\r\n", level);
-  send_to_char(buf, ch);
+  send_to_char(ch, "Your invisibility level is %d.\r\n", level);
 }
   
 
 ACMD(do_invis)
 {
+  char arg[MAX_INPUT_LENGTH];
   int level;
 
   if (IS_NPC(ch)) {
-    send_to_char("You can't do that!\r\n", ch);
+    send_to_char(ch, "You can't do that!\r\n");
     return;
   }
 
@@ -1459,7 +1372,7 @@ ACMD(do_invis)
   } else {
     level = atoi(arg);
     if (level > GET_LEVEL(ch))
-      send_to_char("You can't go invisible above your own level.\r\n", ch);
+      send_to_char(ch, "You can't go invisible above your own level.\r\n");
     else if (level < 1)
       perform_immort_vis(ch);
     else
@@ -1476,16 +1389,16 @@ ACMD(do_gecho)
   delete_doubledollar(argument);
 
   if (!*argument)
-    send_to_char("That must be a mistake...\r\n", ch);
+    send_to_char(ch, "That must be a mistake...\r\n");
   else {
-    sprintf(buf, "%s\r\n", argument);
     for (pt = descriptor_list; pt; pt = pt->next)
       if (STATE(pt) == CON_PLAYING && pt->character && pt->character != ch)
-	send_to_char(buf, pt->character);
+	send_to_char(pt->character, "%s\r\n", argument);
+
     if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-      send_to_char(OK, ch);
+      send_to_char(ch, "%s", OK);
     else
-      send_to_char(buf, ch);
+      send_to_char(ch, "%s\r\n", argument);
   }
 }
 
@@ -1508,34 +1421,35 @@ ACMD(do_poofset)
   if (!*argument)
     *msg = NULL;
   else
-    *msg = str_dup(argument);
+    *msg = strdup(argument);
 
-  send_to_char(OK, ch);
+  send_to_char(ch, "%s", OK);
 }
 
 
 
 ACMD(do_dc)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct descriptor_data *d;
   int num_to_dc;
 
   one_argument(argument, arg);
   if (!(num_to_dc = atoi(arg))) {
-    send_to_char("Usage: DC <user number> (type USERS for a list)\r\n", ch);
+    send_to_char(ch, "Usage: DC <user number> (type USERS for a list)\r\n");
     return;
   }
   for (d = descriptor_list; d && d->desc_num != num_to_dc; d = d->next);
 
   if (!d) {
-    send_to_char("No such connection.\r\n", ch);
+    send_to_char(ch, "No such connection.\r\n");
     return;
   }
   if (d->character && GET_LEVEL(d->character) >= GET_LEVEL(ch)) {
     if (!CAN_SEE(ch, d->character))
-      send_to_char("No such connection.\r\n", ch);
+      send_to_char(ch, "No such connection.\r\n");
     else
-      send_to_char("Umm.. maybe that's not such a good idea...\r\n", ch);
+      send_to_char(ch, "Umm.. maybe that's not such a good idea...\r\n");
     return;
   }
 
@@ -1555,7 +1469,7 @@ ACMD(do_dc)
    * the below 'if' check. -gg 12/17/99
    */
   if (STATE(d) == CON_DISCONNECT || STATE(d) == CON_CLOSE)
-    send_to_char("They're already being disconnected.\r\n", ch);
+    send_to_char(ch, "They're already being disconnected.\r\n");
   else {
     /*
      * Remember that we can disconnect people not in the game and
@@ -1567,8 +1481,7 @@ ACMD(do_dc)
     else
       STATE(d) = CON_CLOSE;
 
-    sprintf(buf, "Connection #%d closed.\r\n", num_to_dc);
-    send_to_char(buf, ch);
+    send_to_char(ch, "Connection #%d closed.\r\n", num_to_dc);
     log("(GC) Connection closed by %s.", GET_NAME(ch));
   }
 }
@@ -1577,6 +1490,7 @@ ACMD(do_dc)
 
 ACMD(do_wizlock)
 {
+  char arg[MAX_INPUT_LENGTH];
   int value;
   const char *when;
 
@@ -1584,7 +1498,7 @@ ACMD(do_wizlock)
   if (*arg) {
     value = atoi(arg);
     if (value < 0 || value > GET_LEVEL(ch)) {
-      send_to_char("Invalid wizlock value.\r\n", ch);
+      send_to_char(ch, "Invalid wizlock value.\r\n");
       return;
     }
     circle_restrict = value;
@@ -1594,17 +1508,15 @@ ACMD(do_wizlock)
 
   switch (circle_restrict) {
   case 0:
-    sprintf(buf, "The game is %s completely open.\r\n", when);
+    send_to_char(ch, "The game is %s completely open.\r\n", when);
     break;
   case 1:
-    sprintf(buf, "The game is %s closed to new players.\r\n", when);
+    send_to_char(ch, "The game is %s closed to new players.\r\n", when);
     break;
   default:
-    sprintf(buf, "Only level %d and above may enter the game %s.\r\n",
-	    circle_restrict, when);
+    send_to_char(ch, "Only level %d and above may enter the game %s.\r\n", circle_restrict, when);
     break;
   }
-  send_to_char(buf, ch);
 }
 
 
@@ -1623,44 +1535,41 @@ ACMD(do_date)
   *(tmstr + strlen(tmstr) - 1) = '\0';
 
   if (subcmd == SCMD_DATE)
-    sprintf(buf, "Current machine time: %s\r\n", tmstr);
+    send_to_char(ch, "Current machine time: %s\r\n", tmstr);
   else {
     mytime = time(0) - boot_time;
     d = mytime / 86400;
     h = (mytime / 3600) % 24;
     m = (mytime / 60) % 60;
 
-    sprintf(buf, "Up since %s: %d day%s, %d:%02d\r\n", tmstr, d,
-	    ((d == 1) ? "" : "s"), h, m);
+    send_to_char(ch, "Up since %s: %d day%s, %d:%02d\r\n", tmstr, d, d == 1 ? "" : "s", h, m);
   }
-
-  send_to_char(buf, ch);
 }
 
 
 
 ACMD(do_last)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_file_u chdata;
 
   one_argument(argument, arg);
   if (!*arg) {
-    send_to_char("For whom do you wish to search?\r\n", ch);
+    send_to_char(ch, "For whom do you wish to search?\r\n");
     return;
   }
   if (load_char(arg, &chdata) < 0) {
-    send_to_char("There is no such player.\r\n", ch);
+    send_to_char(ch, "There is no such player.\r\n");
     return;
   }
   if ((chdata.level > GET_LEVEL(ch)) && (GET_LEVEL(ch) < LVL_IMPL)) {
-    send_to_char("You are not sufficiently godly for that!\r\n", ch);
+    send_to_char(ch, "You are not sufficiently godly for that!\r\n");
     return;
   }
-  sprintf(buf, "[%5ld] [%2d %s] %-12s : %-18s : %-20s\r\n",
+  send_to_char(ch, "[%5ld] [%2d %s] %-12s : %-18s : %-20s\r\n",
 	  chdata.char_specials_saved.idnum, chdata.level,
 	  class_abbrevs[(int) chdata.chclass], chdata.name, chdata.host,
 	  ctime(&chdata.last_logon));
-  send_to_char(buf, ch);
 }
 
 
@@ -1668,31 +1577,29 @@ ACMD(do_force)
 {
   struct descriptor_data *i, *next_desc;
   struct char_data *vict, *next_force;
-  char to_force[MAX_INPUT_LENGTH + 2];
+  char arg[MAX_INPUT_LENGTH], to_force[MAX_INPUT_LENGTH], buf1[MAX_INPUT_LENGTH + 32];
 
   half_chop(argument, arg, to_force);
 
-  sprintf(buf1, "$n has forced you to '%s'.", to_force);
+  snprintf(buf1, sizeof(buf1), "$n has forced you to '%s'.", to_force);
 
   if (!*arg || !*to_force)
-    send_to_char("Whom do you wish to force do what?\r\n", ch);
+    send_to_char(ch, "Whom do you wish to force do what?\r\n");
   else if ((GET_LEVEL(ch) < LVL_GRGOD) || (str_cmp("all", arg) && str_cmp("room", arg))) {
     if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)))
-      send_to_char(NOPERSON, ch);
+      send_to_char(ch, "%s", NOPERSON);
     else if (!IS_NPC(vict) && GET_LEVEL(ch) <= GET_LEVEL(vict))
-      send_to_char("No, no, no!\r\n", ch);
+      send_to_char(ch, "No, no, no!\r\n");
     else {
-      send_to_char(OK, ch);
+      send_to_char(ch, "%s", OK);
       act(buf1, TRUE, ch, NULL, vict, TO_VICT);
-      sprintf(buf, "(GC) %s forced %s to %s", GET_NAME(ch), GET_NAME(vict), to_force);
-      mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s forced %s to %s", GET_NAME(ch), GET_NAME(vict), to_force);
       command_interpreter(vict, to_force);
     }
   } else if (!str_cmp("room", arg)) {
-    send_to_char(OK, ch);
-    sprintf(buf, "(GC) %s forced room %d to %s",
+    send_to_char(ch, "%s", OK);
+    mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s forced room %d to %s",
 		GET_NAME(ch), GET_ROOM_VNUM(IN_ROOM(ch)), to_force);
-    mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
 
     for (vict = world[IN_ROOM(ch)].people; vict; vict = next_force) {
       next_force = vict->next_in_room;
@@ -1702,9 +1609,8 @@ ACMD(do_force)
       command_interpreter(vict, to_force);
     }
   } else { /* force all */
-    send_to_char(OK, ch);
-    sprintf(buf, "(GC) %s forced all to %s", GET_NAME(ch), to_force);
-    mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+    send_to_char(ch, "%s", OK);
+    mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s forced all to %s", GET_NAME(ch), to_force);
 
     for (i = descriptor_list; i; i = next_desc) {
       next_desc = i->next;
@@ -1721,6 +1627,8 @@ ACMD(do_force)
 
 ACMD(do_wiznet)
 {
+  char buf1[MAX_INPUT_LENGTH + MAX_NAME_LENGTH + 32],
+	buf2[MAX_INPUT_LENGTH + MAX_NAME_LENGTH + 32];
   struct descriptor_data *d;
   char emote = FALSE;
   char any = FALSE;
@@ -1730,8 +1638,7 @@ ACMD(do_wiznet)
   delete_doubledollar(argument);
 
   if (!*argument) {
-    send_to_char("Usage: wiznet <text> | #<level> <text> | *<emotetext> |\r\n "
-		 "       wiznet @<level> *<emotetext> | wiz @\r\n", ch);
+    send_to_char(ch, "Usage: wiznet <text> | #<level> <text> | *<emotetext> |\r\n        wiznet @<level> *<emotetext> | wiz @\r\n");
     return;
   }
   switch (*argument) {
@@ -1743,45 +1650,28 @@ ACMD(do_wiznet)
       half_chop(argument+1, buf1, argument);
       level = MAX(atoi(buf1), LVL_IMMORT);
       if (level > GET_LEVEL(ch)) {
-	send_to_char("You can't wizline above your own level.\r\n", ch);
+	send_to_char(ch, "You can't wizline above your own level.\r\n");
 	return;
       }
     } else if (emote)
       argument++;
     break;
+
   case '@':
-    for (d = descriptor_list; d; d = d->next) {
-      if (STATE(d) == CON_PLAYING && GET_LEVEL(d->character) >= LVL_IMMORT &&
-	  !PRF_FLAGGED(d->character, PRF_NOWIZ) &&
-	  (CAN_SEE(ch, d->character) || GET_LEVEL(ch) == LVL_IMPL)) {
-	if (!any) {
-	  strcpy(buf1, "Gods online:\r\n");
-	  any = TRUE;
-	}
-	sprintf(buf1 + strlen(buf1), "  %s", GET_NAME(d->character));
-	if (PLR_FLAGGED(d->character, PLR_WRITING))
-	  strcat(buf1, " (Writing)\r\n");
-	else if (PLR_FLAGGED(d->character, PLR_MAILING))
-	  strcat(buf1, " (Writing mail)\r\n");
-	else
-	  strcat(buf1, "\r\n");
+    send_to_char(ch, "God channel status:\r\n");
+    for (any = 0, d = descriptor_list; d; d = d->next) {
+      if (STATE(d) != CON_PLAYING || GET_LEVEL(d->character) < LVL_IMMORT)
+        continue;
+      if (!CAN_SEE(ch, d->character))
+        continue;
 
-      }
-    }
-    any = FALSE;
-    for (d = descriptor_list; d; d = d->next) {
-      if (STATE(d) == CON_PLAYING && GET_LEVEL(d->character) >= LVL_IMMORT &&
-	  PRF_FLAGGED(d->character, PRF_NOWIZ) &&
-	  CAN_SEE(ch, d->character)) {
-	if (!any) {
-	  strcat(buf1, "Gods offline:\r\n");
-	  any = TRUE;
-	}
-	sprintf(buf1 + strlen(buf1), "  %s\r\n", GET_NAME(d->character));
-      }
+      send_to_char(ch, "  %-*s%s%s%s\r\n", MAX_NAME_LENGTH, GET_NAME(d->character),
+		PLR_FLAGGED(d->character, PLR_WRITING) ? " (Writing)" : "",
+		PLR_FLAGGED(d->character, PLR_MAILING) ? " (Writing mail)" : "",
+		PRF_FLAGGED(d->character, PRF_NOWIZ) ? " (Offline)" : "");
     }
-    send_to_char(buf1, ch);
     return;
+
   case '\\':
     ++argument;
     break;
@@ -1789,24 +1679,21 @@ ACMD(do_wiznet)
     break;
   }
   if (PRF_FLAGGED(ch, PRF_NOWIZ)) {
-    send_to_char("You are offline!\r\n", ch);
+    send_to_char(ch, "You are offline!\r\n");
     return;
   }
   skip_spaces(&argument);
 
   if (!*argument) {
-    send_to_char("Don't bother the gods like that!\r\n", ch);
+    send_to_char(ch, "Don't bother the gods like that!\r\n");
     return;
   }
   if (level > LVL_IMMORT) {
-    sprintf(buf1, "%s: <%d> %s%s\r\n", GET_NAME(ch), level,
-	    emote ? "<--- " : "", argument);
-    sprintf(buf2, "Someone: <%d> %s%s\r\n", level, emote ? "<--- " : "",
-	    argument);
+    snprintf(buf1, sizeof(buf1), "%s: <%d> %s%s\r\n", GET_NAME(ch), level, emote ? "<--- " : "", argument);
+    snprintf(buf2, sizeof(buf1), "Someone: <%d> %s%s\r\n", level, emote ? "<--- " : "", argument);
   } else {
-    sprintf(buf1, "%s: %s%s\r\n", GET_NAME(ch), emote ? "<--- " : "",
-	    argument);
-    sprintf(buf2, "Someone: %s%s\r\n", emote ? "<--- " : "", argument);
+    snprintf(buf1, sizeof(buf1), "%s: %s%s\r\n", GET_NAME(ch), emote ? "<--- " : "", argument);
+    snprintf(buf2, sizeof(buf1), "Someone: %s%s\r\n", emote ? "<--- " : "", argument);
   }
 
   for (d = descriptor_list; d; d = d->next) {
@@ -1814,37 +1701,37 @@ ACMD(do_wiznet)
 	(!PRF_FLAGGED(d->character, PRF_NOWIZ)) &&
 	(!PLR_FLAGGED(d->character, PLR_WRITING | PLR_MAILING))
 	&& (d != ch->desc || !(PRF_FLAGGED(d->character, PRF_NOREPEAT)))) {
-      send_to_char(CCCYN(d->character, C_NRM), d->character);
+      send_to_char(d->character, CCCYN(d->character, C_NRM));
       if (CAN_SEE(d->character, ch))
-	send_to_char(buf1, d->character);
+	send_to_char(d->character, buf1);
       else
-	send_to_char(buf2, d->character);
-      send_to_char(CCNRM(d->character, C_NRM), d->character);
+	send_to_char(d->character, buf2);
+      send_to_char(d->character, CCNRM(d->character, C_NRM));
     }
   }
 
   if (PRF_FLAGGED(ch, PRF_NOREPEAT))
-    send_to_char(OK, ch);
+    send_to_char(ch, "%s", OK);
 }
 
 
 
 ACMD(do_zreset)
 {
+  char arg[MAX_INPUT_LENGTH];
   zone_rnum i;
   zone_vnum j;
 
   one_argument(argument, arg);
   if (!*arg) {
-    send_to_char("You must specify a zone.\r\n", ch);
+    send_to_char(ch, "You must specify a zone.\r\n");
     return;
   }
   if (*arg == '*') {
     for (i = 0; i <= top_of_zone_table; i++)
       reset_zone(i);
-    send_to_char("Reset world.\r\n", ch);
-    sprintf(buf, "(GC) %s reset entire world.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_GRGOD, GET_INVIS_LEV(ch)), TRUE);
+    send_to_char(ch, "Reset world.\r\n");
+    mudlog(NRM, MAX(LVL_GRGOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s reset entire world.", GET_NAME(ch));
     return;
   } else if (*arg == '.')
     i = world[IN_ROOM(ch)].zone;
@@ -1856,13 +1743,10 @@ ACMD(do_zreset)
   }
   if (i <= top_of_zone_table) {
     reset_zone(i);
-    sprintf(buf, "Reset zone %d (#%d): %s.\r\n", i, zone_table[i].number,
-	    zone_table[i].name);
-    send_to_char(buf, ch);
-    sprintf(buf, "(GC) %s reset zone %d (%s)", GET_NAME(ch), i, zone_table[i].name);
-    mudlog(buf, NRM, MAX(LVL_GRGOD, GET_INVIS_LEV(ch)), TRUE);
+    send_to_char(ch, "Reset zone %d (#%d): %s.\r\n", i, zone_table[i].number, zone_table[i].name);
+    mudlog(NRM, MAX(LVL_GRGOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s reset zone %d (%s)", GET_NAME(ch), i, zone_table[i].name);
   } else
-    send_to_char("Invalid zone number.\r\n", ch);
+    send_to_char(ch, "Invalid zone number.\r\n");
 }
 
 
@@ -1871,101 +1755,92 @@ ACMD(do_zreset)
  */
 ACMD(do_wizutil)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
   long result;
 
   one_argument(argument, arg);
 
   if (!*arg)
-    send_to_char("Yes, but for whom?!?\r\n", ch);
+    send_to_char(ch, "Yes, but for whom?!?\r\n");
   else if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD)))
-    send_to_char("There is no such player.\r\n", ch);
+    send_to_char(ch, "There is no such player.\r\n");
   else if (IS_NPC(vict))
-    send_to_char("You can't do that to a mob!\r\n", ch);
+    send_to_char(ch, "You can't do that to a mob!\r\n");
   else if (GET_LEVEL(vict) > GET_LEVEL(ch))
-    send_to_char("Hmmm...you'd better not.\r\n", ch);
+    send_to_char(ch, "Hmmm...you'd better not.\r\n");
   else {
     switch (subcmd) {
     case SCMD_REROLL:
-      send_to_char("Rerolled...\r\n", ch);
+      send_to_char(ch, "Rerolled...\r\n");
       roll_real_abils(vict);
       log("(GC) %s has rerolled %s.", GET_NAME(ch), GET_NAME(vict));
-      sprintf(buf, "New stats: Str %d/%d, Int %d, Wis %d, Dex %d, Con %d, Cha %d\r\n",
+      send_to_char(ch, "New stats: Str %d/%d, Int %d, Wis %d, Dex %d, Con %d, Cha %d\r\n",
 	      GET_STR(vict), GET_ADD(vict), GET_INT(vict), GET_WIS(vict),
 	      GET_DEX(vict), GET_CON(vict), GET_CHA(vict));
-      send_to_char(buf, ch);
       break;
     case SCMD_PARDON:
       if (!PLR_FLAGGED(vict, PLR_THIEF | PLR_KILLER)) {
-	send_to_char("Your victim is not flagged.\r\n", ch);
+	send_to_char(ch, "Your victim is not flagged.\r\n");
 	return;
       }
       REMOVE_BIT(PLR_FLAGS(vict), PLR_THIEF | PLR_KILLER);
-      send_to_char("Pardoned.\r\n", ch);
-      send_to_char("You have been pardoned by the Gods!\r\n", vict);
-      sprintf(buf, "(GC) %s pardoned by %s", GET_NAME(vict), GET_NAME(ch));
-      mudlog(buf, BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+      send_to_char(ch, "Pardoned.\r\n");
+      send_to_char(vict, "You have been pardoned by the Gods!\r\n");
+      mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s pardoned by %s", GET_NAME(vict), GET_NAME(ch));
       break;
     case SCMD_NOTITLE:
       result = PLR_TOG_CHK(vict, PLR_NOTITLE);
-      sprintf(buf, "(GC) Notitle %s for %s by %s.", ONOFF(result),
-	      GET_NAME(vict), GET_NAME(ch));
-      mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
-      strcat(buf, "\r\n");
-      send_to_char(buf, ch);
+      mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) Notitle %s for %s by %s.",
+		ONOFF(result), GET_NAME(vict), GET_NAME(ch));
+      send_to_char(ch, "(GC) Notitle %s for %s by %s.\r\n", ONOFF(result), GET_NAME(vict), GET_NAME(ch));
       break;
     case SCMD_SQUELCH:
       result = PLR_TOG_CHK(vict, PLR_NOSHOUT);
-      sprintf(buf, "(GC) Squelch %s for %s by %s.", ONOFF(result),
-	      GET_NAME(vict), GET_NAME(ch));
-      mudlog(buf, BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
-      strcat(buf, "\r\n");
-      send_to_char(buf, ch);
+      mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) Squelch %s for %s by %s.",
+		ONOFF(result), GET_NAME(vict), GET_NAME(ch));
+      send_to_char(ch, "(GC) Squelch %s for %s by %s.\r\n", ONOFF(result), GET_NAME(vict), GET_NAME(ch));
       break;
     case SCMD_FREEZE:
       if (ch == vict) {
-	send_to_char("Oh, yeah, THAT'S real smart...\r\n", ch);
+	send_to_char(ch, "Oh, yeah, THAT'S real smart...\r\n");
 	return;
       }
       if (PLR_FLAGGED(vict, PLR_FROZEN)) {
-	send_to_char("Your victim is already pretty cold.\r\n", ch);
+	send_to_char(ch, "Your victim is already pretty cold.\r\n");
 	return;
       }
       SET_BIT(PLR_FLAGS(vict), PLR_FROZEN);
       GET_FREEZE_LEV(vict) = GET_LEVEL(ch);
-      send_to_char("A bitter wind suddenly rises and drains every erg of heat from your body!\r\nYou feel frozen!\r\n", vict);
-      send_to_char("Frozen.\r\n", ch);
+      send_to_char(vict, "A bitter wind suddenly rises and drains every erg of heat from your body!\r\nYou feel frozen!\r\n");
+      send_to_char(ch, "Frozen.\r\n");
       act("A sudden cold wind conjured from nowhere freezes $n!", FALSE, vict, 0, 0, TO_ROOM);
-      sprintf(buf, "(GC) %s frozen by %s.", GET_NAME(vict), GET_NAME(ch));
-      mudlog(buf, BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s frozen by %s.", GET_NAME(vict), GET_NAME(ch));
       break;
     case SCMD_THAW:
       if (!PLR_FLAGGED(vict, PLR_FROZEN)) {
-	send_to_char("Sorry, your victim is not morbidly encased in ice at the moment.\r\n", ch);
+	send_to_char(ch, "Sorry, your victim is not morbidly encased in ice at the moment.\r\n");
 	return;
       }
       if (GET_FREEZE_LEV(vict) > GET_LEVEL(ch)) {
-	sprintf(buf, "Sorry, a level %d God froze %s... you can't unfreeze %s.\r\n",
-	   GET_FREEZE_LEV(vict), GET_NAME(vict), HMHR(vict));
-	send_to_char(buf, ch);
+	send_to_char(ch, "Sorry, a level %d God froze %s... you can't unfreeze %s.\r\n",
+		GET_FREEZE_LEV(vict), GET_NAME(vict), HMHR(vict));
 	return;
       }
-      sprintf(buf, "(GC) %s un-frozen by %s.", GET_NAME(vict), GET_NAME(ch));
-      mudlog(buf, BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(BRF, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "(GC) %s un-frozen by %s.", GET_NAME(vict), GET_NAME(ch));
       REMOVE_BIT(PLR_FLAGS(vict), PLR_FROZEN);
-      send_to_char("A fireball suddenly explodes in front of you, melting the ice!\r\nYou feel thawed.\r\n", vict);
-      send_to_char("Thawed.\r\n", ch);
+      send_to_char(vict, "A fireball suddenly explodes in front of you, melting the ice!\r\nYou feel thawed.\r\n");
+      send_to_char(ch, "Thawed.\r\n");
       act("A sudden fireball conjured from nowhere thaws $n!", FALSE, vict, 0, 0, TO_ROOM);
       break;
     case SCMD_UNAFFECT:
       if (vict->affected) {
 	while (vict->affected)
 	  affect_remove(vict, vict->affected);
-	send_to_char("There is a brief flash of light!\r\n"
-		     "You feel slightly different.\r\n", vict);
-	send_to_char("All spells removed.\r\n", ch);
+	send_to_char(vict, "There is a brief flash of light!\r\nYou feel slightly different.\r\n");
+	send_to_char(ch, "All spells removed.\r\n");
       } else {
-	send_to_char("Your victim does not have any affections!\r\n", ch);
+	send_to_char(ch, "Your victim does not have any affections!\r\n");
 	return;
       }
       break;
@@ -1981,13 +1856,15 @@ ACMD(do_wizutil)
 /* single zone printing fn used by "show zone" so it's not repeated in the
    code 3 times ... -je, 4/6/93 */
 
-void print_zone_to_buf(char *bufptr, zone_rnum zone)
+/* FIXME: overflow possible */
+size_t print_zone_to_buf(char *bufptr, size_t left, zone_rnum zone)
 {
-  sprintf(bufptr, "%s%3d %-30.30s Age: %3d; Reset: %3d (%1d); Range: %5d-%5d\r\n",
-	  bufptr, zone_table[zone].number, zone_table[zone].name,
-	  zone_table[zone].age, zone_table[zone].lifespan,
-	  zone_table[zone].reset_mode,
-	  zone_table[zone].bot, zone_table[zone].top);
+  return snprintf(bufptr, left,
+	"%3d %-30.30s Age: %3d; Reset: %3d (%1d); Range: %5d-%5d\r\n",
+	zone_table[zone].number, zone_table[zone].name,
+	zone_table[zone].age, zone_table[zone].lifespan,
+	zone_table[zone].reset_mode,
+	zone_table[zone].bot, zone_table[zone].top);
 }
 
 
@@ -1995,13 +1872,15 @@ ACMD(do_show)
 {
   struct char_file_u vbuf;
   int i, j, k, l, con;		/* i, j, k to specifics? */
+  size_t len, nlen;
   zone_rnum zrn;
   zone_vnum zvn;
-  char self = 0;
+  byte self = FALSE;
   struct char_data *vict;
   struct obj_data *obj;
   struct descriptor_data *d;
-  char field[MAX_INPUT_LENGTH], value[MAX_INPUT_LENGTH], birth[80];
+  char field[MAX_INPUT_LENGTH], value[MAX_INPUT_LENGTH],
+	arg[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH];
 
   struct show_struct {
     const char *cmd;
@@ -2024,77 +1903,84 @@ ACMD(do_show)
   skip_spaces(&argument);
 
   if (!*argument) {
-    strcpy(buf, "Show options:\r\n");
+    send_to_char(ch, "Show options:\r\n");
     for (j = 0, i = 1; fields[i].level; i++)
       if (fields[i].level <= GET_LEVEL(ch))
-	sprintf(buf + strlen(buf), "%-15s%s", fields[i].cmd, (!(++j % 5) ? "\r\n" : ""));
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
+	send_to_char(ch, "%-15s%s", fields[i].cmd, (!(++j % 5) ? "\r\n" : ""));
+    send_to_char(ch, "\r\n");
     return;
   }
 
-  strcpy(arg, two_arguments(argument, field, value));
+  strcpy(arg, two_arguments(argument, field, value));	/* strcpy: OK (argument <= MAX_INPUT_LENGTH == arg) */
 
   for (l = 0; *(fields[l].cmd) != '\n'; l++)
     if (!strncmp(field, fields[l].cmd, strlen(field)))
       break;
 
   if (GET_LEVEL(ch) < fields[l].level) {
-    send_to_char("You are not godly enough for that!\r\n", ch);
+    send_to_char(ch, "You are not godly enough for that!\r\n");
     return;
   }
   if (!strcmp(value, "."))
-    self = 1;
+    self = TRUE;
   buf[0] = '\0';
+
   switch (l) {
-  case 1:			/* zone */
+  /* show zone */
+  case 1:
     /* tightened up by JE 4/6/93 */
     if (self)
-      print_zone_to_buf(buf, world[IN_ROOM(ch)].zone);
+      print_zone_to_buf(buf, sizeof(buf), world[IN_ROOM(ch)].zone);
     else if (*value && is_number(value)) {
       for (zvn = atoi(value), zrn = 0; zone_table[zrn].number != zvn && zrn <= top_of_zone_table; zrn++);
       if (zrn <= top_of_zone_table)
-	print_zone_to_buf(buf, zrn);
+	print_zone_to_buf(buf, sizeof(buf), zrn);
       else {
-	send_to_char("That is not a valid zone.\r\n", ch);
+	send_to_char(ch, "That is not a valid zone.\r\n");
 	return;
       }
     } else
-      for (zrn = 0; zrn <= top_of_zone_table; zrn++)
-	print_zone_to_buf(buf, zrn);
+      for (len = zrn = 0; zrn <= top_of_zone_table; zrn++) {
+	nlen = print_zone_to_buf(buf + len, sizeof(buf) - len, zrn);
+        if (len + nlen >= sizeof(buf) || nlen < 0)
+          break;
+        len += nlen;
+      }
     page_string(ch->desc, buf, TRUE);
     break;
-  case 2:			/* player */
+
+  /* show player */
+  case 2:
     if (!*value) {
-      send_to_char("A name would help.\r\n", ch);
+      send_to_char(ch, "A name would help.\r\n");
       return;
     }
 
     if (load_char(value, &vbuf) < 0) {
-      send_to_char("There is no such player.\r\n", ch);
+      send_to_char(ch, "There is no such player.\r\n");
       return;
     }
-    sprintf(buf, "Player: %-12s (%s) [%2d %s]\r\n", vbuf.name,
-      genders[(int) vbuf.sex], vbuf.level, class_abbrevs[(int) vbuf.chclass]);
-    sprintf(buf + strlen(buf),
-	 "Au: %-8d  Bal: %-8d  Exp: %-8d  Align: %-5d  Lessons: %-3d\r\n",
-	    vbuf.points.gold, vbuf.points.bank_gold, vbuf.points.exp,
-	    vbuf.char_specials_saved.alignment,
-	    vbuf.player_specials_saved.spells_to_learn);
-    strcpy(birth, ctime(&vbuf.birth));
-    sprintf(buf + strlen(buf),
-	    "Started: %-20.16s  Last: %-20.16s  Played: %3dh %2dm\r\n",
-	    birth, ctime(&vbuf.last_logon), vbuf.played / 3600,
-	    vbuf.played / 60 % 60);
-    send_to_char(buf, ch);
+
+    send_to_char(ch, "Player: %-12s (%s) [%2d %s]\r\n", vbuf.name,
+	genders[(int) vbuf.sex], vbuf.level, class_abbrevs[(int) vbuf.chclass]);
+    send_to_char(ch, "Au: %-8d  Bal: %-8d  Exp: %-8d  Align: %-5d  Lessons: %-3d\r\n",
+	vbuf.points.gold, vbuf.points.bank_gold, vbuf.points.exp,
+	vbuf.char_specials_saved.alignment, vbuf.player_specials_saved.spells_to_learn);
+    /* ctime() uses static buffer: do not combine. */
+    send_to_char(ch, "Started: %-20.16s  ", ctime(&vbuf.birth));
+    send_to_char(ch, "Last: %-20.16s  Played: %3dh %2dm\r\n", ctime(&vbuf.last_logon), vbuf.played / 3600, vbuf.played / 60 % 60);
     break;
+
+  /* show rent */
   case 3:
     if (!*value) {
-      send_to_char("A name would help.\r\n", ch);
+      send_to_char(ch, "A name would help.\r\n");
       return;
     }
     Crash_listrent(ch, value);
     break;
+
+  /* show stats */
   case 4:
     i = 0;
     j = 0;
@@ -2111,58 +1997,79 @@ ACMD(do_show)
     }
     for (obj = object_list; obj; obj = obj->next)
       k++;
-    strcpy(buf, "Current stats:\r\n");
-    sprintf(buf + strlen(buf), "  %5d players in game  %5d connected\r\n",
-		i, con);
-    sprintf(buf + strlen(buf), "  %5d registered\r\n",
-		top_of_p_table + 1);
-    sprintf(buf + strlen(buf), "  %5d mobiles          %5d prototypes\r\n",
-		j, top_of_mobt + 1);
-    sprintf(buf + strlen(buf), "  %5d objects          %5d prototypes\r\n",
-		k, top_of_objt + 1);
-    sprintf(buf + strlen(buf), "  %5d rooms            %5d zones\r\n",
-		top_of_world + 1, top_of_zone_table + 1);
-    sprintf(buf + strlen(buf), "  %5d large bufs\r\n",
-		buf_largecount);
-    sprintf(buf + strlen(buf), "  %5d buf switches     %5d overflows\r\n",
-		buf_switches, buf_overflows);
-    send_to_char(buf, ch);
+    send_to_char(ch,
+	"Current stats:\r\n"
+	"  %5d players in game  %5d connected\r\n"
+	"  %5d registered\r\n"
+	"  %5d mobiles          %5d prototypes\r\n"
+	"  %5d objects          %5d prototypes\r\n"
+	"  %5d rooms            %5d zones\r\n"
+	"  %5d large bufs\r\n"
+	"  %5d buf switches     %5d overflows\r\n",
+	i, con,
+	top_of_p_table + 1,
+	j, top_of_mobt + 1,
+	k, top_of_objt + 1,
+	top_of_world + 1, top_of_zone_table + 1,
+	buf_largecount,
+	buf_switches, buf_overflows
+	);
     break;
+
+  /* show errors */
   case 5:
-    strcpy(buf, "Errant Rooms\r\n------------\r\n");
+    len = strlcpy(buf, "Errant Rooms\r\n------------\r\n", sizeof(buf));
     for (i = 0, k = 0; i <= top_of_world; i++)
       for (j = 0; j < NUM_OF_DIRS; j++)
-	if (world[i].dir_option[j] && world[i].dir_option[j]->to_room == 0)
-	  sprintf(buf + strlen(buf), "%2d: [%5d] %s\r\n", ++k, GET_ROOM_VNUM(i),
-		  world[i].name);
+	if (world[i].dir_option[j] && world[i].dir_option[j]->to_room == 0) {
+	  nlen = snprintf(buf + len, sizeof(buf) - len, "%2d: [%5d] %s\r\n", ++k, GET_ROOM_VNUM(i), world[i].name);
+          if (len + nlen >= sizeof(buf) || nlen < 0)
+            break;
+          len += nlen;
+        }
     page_string(ch->desc, buf, TRUE);
     break;
+
+  /* show death */
   case 6:
-    strcpy(buf, "Death Traps\r\n-----------\r\n");
+    len = strlcpy(buf, "Death Traps\r\n-----------\r\n", sizeof(buf));
     for (i = 0, j = 0; i <= top_of_world; i++)
-      if (ROOM_FLAGGED(i, ROOM_DEATH))
-	sprintf(buf + strlen(buf), "%2d: [%5d] %s\r\n", ++j,
-		GET_ROOM_VNUM(i), world[i].name);
+      if (ROOM_FLAGGED(i, ROOM_DEATH)) {
+        nlen = snprintf(buf + len, sizeof(buf) - len, "%2d: [%5d] %s\r\n", ++j, GET_ROOM_VNUM(i), world[i].name);
+        if (len + nlen >= sizeof(buf) || nlen < 0)
+          break;
+        len += nlen;
+      }
     page_string(ch->desc, buf, TRUE);
     break;
+
+  /* show godrooms */
   case 7:
-    strcpy(buf, "Godrooms\r\n--------------------------\r\n");
+    len = strlcpy(buf, "Godrooms\r\n--------------------------\r\n", sizeof(buf));
     for (i = 0, j = 0; i <= top_of_world; i++)
-    if (ROOM_FLAGGED(i, ROOM_GODROOM))
-      sprintf(buf + strlen(buf), "%2d: [%5d] %s\r\n",
-		++j, GET_ROOM_VNUM(i), world[i].name);
+      if (ROOM_FLAGGED(i, ROOM_GODROOM)) {
+        nlen = snprintf(buf + len, sizeof(buf) - len, "%2d: [%5d] %s\r\n", ++j, GET_ROOM_VNUM(i), world[i].name);
+        if (len + nlen >= sizeof(buf) || nlen < 0)
+          break;
+        len += nlen;
+      }
     page_string(ch->desc, buf, TRUE);
     break;
+
+  /* show shops */
   case 8:
     show_shops(ch, value);
     break;
+
+  /* show houses */
   case 9:
     hcontrol_list_houses(ch);
     break;
+
+  /* show snoop */
   case 10:
-    *buf = '\0';
-    send_to_char("People currently snooping:\r\n", ch);
-    send_to_char("--------------------------\r\n", ch);
+    i = 0;
+    send_to_char(ch, "People currently snooping:\r\n--------------------------\r\n");
     for (d = descriptor_list; d; d = d->next) {
       if (d->snooping == NULL || d->character == NULL)
 	continue;
@@ -2170,13 +2077,16 @@ ACMD(do_show)
 	continue;
       if (!CAN_SEE(ch, d->character) || IN_ROOM(d->character) == NOWHERE)
 	continue;
-      sprintf(buf + strlen(buf), "%-10s - snooped by %s.\r\n",
-               GET_NAME(d->snooping->character), GET_NAME(d->character));
+      i++;
+      send_to_char(ch, "%-10s - snooped by %s.\r\n", GET_NAME(d->snooping->character), GET_NAME(d->character));
     }
-    send_to_char(*buf ? buf : "No one is currently snooping.\r\n", ch);
-    break; /* snoop */
+    if (i == 0)
+      send_to_char(ch, "No one is currently snooping.\r\n");
+    break;
+
+  /* show what? */
   default:
-    send_to_char("Sorry, I don't understand that.\r\n", ch);
+    send_to_char(ch, "Sorry, I don't understand that.\r\n");
     break;
   }
 }
@@ -2267,26 +2177,25 @@ int perform_set(struct char_data *ch, st
   int i, on = 0, off = 0, value = 0;
   room_rnum rnum;
   room_vnum rvnum;
-  char output[MAX_STRING_LENGTH];
 
   /* Check to make sure all the levels are correct */
   if (GET_LEVEL(ch) != LVL_IMPL) {
     if (!IS_NPC(vict) && GET_LEVEL(ch) <= GET_LEVEL(vict) && vict != ch) {
-      send_to_char("Maybe that's not such a great idea...\r\n", ch);
+      send_to_char(ch, "Maybe that's not such a great idea...\r\n");
       return (0);
     }
   }
   if (GET_LEVEL(ch) < set_fields[mode].level) {
-    send_to_char("You are not godly enough for that!\r\n", ch);
+    send_to_char(ch, "You are not godly enough for that!\r\n");
     return (0);
   }
 
   /* Make sure the PC/NPC is correct */
   if (IS_NPC(vict) && !(set_fields[mode].pcnpc & NPC)) {
-    send_to_char("You can't do that to a beast!\r\n", ch);
+    send_to_char(ch, "You can't do that to a beast!\r\n");
     return (0);
   } else if (!IS_NPC(vict) && !(set_fields[mode].pcnpc & PC)) {
-    send_to_char("That can only be done to a beast!\r\n", ch);
+    send_to_char(ch, "That can only be done to a beast!\r\n");
     return (0);
   }
 
@@ -2297,18 +2206,15 @@ int perform_set(struct char_data *ch, st
     else if (!strcmp(val_arg, "off") || !strcmp(val_arg, "no"))
       off = 1;
     if (!(on || off)) {
-      send_to_char("Value must be 'on' or 'off'.\r\n", ch);
+      send_to_char(ch, "Value must be 'on' or 'off'.\r\n");
       return (0);
     }
-    sprintf(output, "%s %s for %s.", set_fields[mode].cmd, ONOFF(on),
-	    GET_NAME(vict));
+    send_to_char(ch, "%s %s for %s.\r\n", set_fields[mode].cmd, ONOFF(on), GET_NAME(vict));
   } else if (set_fields[mode].type == NUMBER) {
     value = atoi(val_arg);
-    sprintf(output, "%s's %s set to %d.", GET_NAME(vict),
-	    set_fields[mode].cmd, value);
-  } else {
-    strcpy(output, "Okay.");  /* can't use OK macro here 'cause of \r\n */
-  }
+    send_to_char(ch, "%s's %s set to %d.\r\n", GET_NAME(vict), set_fields[mode].cmd, value);
+  } else
+    send_to_char(ch, "%s", OK);
 
   switch (mode) {
   case 0:
@@ -2319,11 +2225,11 @@ int perform_set(struct char_data *ch, st
     break;
   case 2:
     set_title(vict, val_arg);
-    sprintf(output, "%s's title is now: %s", GET_NAME(vict), GET_TITLE(vict));
+    send_to_char(ch, "%s's title is now: %s\r\n", GET_NAME(vict), GET_TITLE(vict));
     break;
   case 3:
     SET_OR_REMOVE(PRF_FLAGS(vict), PRF_SUMMONABLE);
-    sprintf(output, "Nosummon %s for %s.\r\n", ONOFF(!on), GET_NAME(vict));
+    send_to_char(ch, "Nosummon %s for %s.\r\n", ONOFF(!on), GET_NAME(vict));
     break;
   case 4:
     vict->points.max_hit = RANGE(1, 5000);
@@ -2431,21 +2337,21 @@ int perform_set(struct char_data *ch, st
     break;
   case 24:
     if (GET_LEVEL(ch) < LVL_IMPL && ch != vict) {
-      send_to_char("You aren't godly enough for that!\r\n", ch);
+      send_to_char(ch, "You aren't godly enough for that!\r\n");
       return (0);
     }
     GET_INVIS_LEV(vict) = RANGE(0, GET_LEVEL(vict));
     break;
   case 25:
     if (GET_LEVEL(ch) < LVL_IMPL && ch != vict) {
-      send_to_char("You aren't godly enough for that!\r\n", ch);
+      send_to_char(ch, "You aren't godly enough for that!\r\n");
       return (0);
     }
     SET_OR_REMOVE(PRF_FLAGS(vict), PRF_NOHASSLE);
     break;
   case 26:
     if (ch == vict && on) {
-      send_to_char("Better not -- could be a long winter!\r\n", ch);
+      send_to_char(ch, "Better not -- could be a long winter!\r\n");
       return (0);
     }
     SET_OR_REMOVE(PLR_FLAGS(vict), PLR_FROZEN);
@@ -2459,15 +2365,14 @@ int perform_set(struct char_data *ch, st
   case 31:
     if (!str_cmp(val_arg, "off")) {
       GET_COND(vict, (mode - 29)) = -1; /* warning: magic number here */
-      sprintf(output, "%s's %s now off.", GET_NAME(vict), set_fields[mode].cmd);
+      send_to_char(ch, "%s's %s now off.\r\n", GET_NAME(vict), set_fields[mode].cmd);
     } else if (is_number(val_arg)) {
       value = atoi(val_arg);
       RANGE(0, 24);
       GET_COND(vict, (mode - 29)) = value; /* and here too */
-      sprintf(output, "%s's %s set to %d.", GET_NAME(vict),
-	      set_fields[mode].cmd, value);
+      send_to_char(ch, "%s's %s set to %d.\r\n", GET_NAME(vict), set_fields[mode].cmd, value);
     } else {
-      send_to_char("Must be 'off' or a value from 0 to 24.\r\n", ch);
+      send_to_char(ch, "Must be 'off' or a value from 0 to 24.\r\n");
       return (0);
     }
     break;
@@ -2479,7 +2384,7 @@ int perform_set(struct char_data *ch, st
     break;
   case 34:
     if (value > GET_LEVEL(ch) || value > LVL_IMPL) {
-      send_to_char("You can't do that.\r\n", ch);
+      send_to_char(ch, "You can't do that.\r\n");
       return (0);
     }
     RANGE(0, LVL_IMPL);
@@ -2487,7 +2392,7 @@ int perform_set(struct char_data *ch, st
     break;
   case 35:
     if ((rnum = real_room(value)) == NOWHERE) {
-      send_to_char("No room exists with that number.\r\n", ch);
+      send_to_char(ch, "No room exists with that number.\r\n");
       return (0);
     }
     if (IN_ROOM(vict) != NOWHERE)	/* Another Eric Green special. */
@@ -2505,7 +2410,7 @@ int perform_set(struct char_data *ch, st
     break;
   case 39:
     if ((i = parse_class(*val_arg)) == CLASS_UNDEFINED) {
-      send_to_char("That is not a class.\r\n", ch);
+      send_to_char(ch, "That is not a class.\r\n");
       return (0);
     }
     GET_CLASS(vict) = i;
@@ -2524,14 +2429,13 @@ int perform_set(struct char_data *ch, st
       if (real_room(rvnum) != NOWHERE) {
         SET_BIT(PLR_FLAGS(vict), PLR_LOADROOM);
 	GET_LOADROOM(vict) = rvnum;
-	sprintf(output, "%s will enter at room #%d.", GET_NAME(vict),
-		GET_LOADROOM(vict));
+	send_to_char(ch, "%s will enter at room #%d.", GET_NAME(vict), GET_LOADROOM(vict));
       } else {
-	send_to_char("That room does not exist!\r\n", ch);
+	send_to_char(ch, "That room does not exist!\r\n");
 	return (0);
       }
     } else {
-      send_to_char("Must be 'off' or a room's virtual number.\r\n", ch);
+      send_to_char(ch, "Must be 'off' or a room's virtual number.\r\n");
       return (0);
     }
     break;
@@ -2545,30 +2449,30 @@ int perform_set(struct char_data *ch, st
     break;
   case 45:
     if (GET_IDNUM(ch) > 1) {
-      send_to_char("Please don't use this command, yet.\r\n", ch);
+      send_to_char(ch, "Please don't use this command, yet.\r\n");
       return (0);
     }
     if (GET_LEVEL(vict) >= LVL_GRGOD) {
-      send_to_char("You cannot change that.\r\n", ch);
+      send_to_char(ch, "You cannot change that.\r\n");
       return (0);
     }
-    strncpy(GET_PASSWD(vict), CRYPT(val_arg, GET_NAME(vict)), MAX_PWD_LENGTH);
+    strncpy(GET_PASSWD(vict), CRYPT(val_arg, GET_NAME(vict)), MAX_PWD_LENGTH);	/* strncpy: OK (G_P:MAX_PWD_LENGTH) */
     *(GET_PASSWD(vict) + MAX_PWD_LENGTH) = '\0';
-    sprintf(output, "Password changed to '%s'.", val_arg);
+    send_to_char(ch, "Password changed to '%s'.\r\n", val_arg);
     break;
   case 46:
     SET_OR_REMOVE(PLR_FLAGS(vict), PLR_NODELETE);
     break;
   case 47:
     if ((i = search_block(val_arg, genders, FALSE)) < 0) {
-      send_to_char("Must be 'male', 'female', or 'neutral'.\r\n", ch);
+      send_to_char(ch, "Must be 'male', 'female', or 'neutral'.\r\n");
       return (0);
     }
     GET_SEX(vict) = i;
     break;
   case 48:	/* set age */
     if (value < 2 || value > 200) {	/* Arbitrary limits. */
-      send_to_char("Ages 2 to 200 accepted.\r\n", ch);
+      send_to_char(ch, "Ages 2 to 200 accepted.\r\n");
       return (0);
     }
     /*
@@ -2590,12 +2494,10 @@ int perform_set(struct char_data *ch, st
     break;
 
   default:
-    send_to_char("Can't set that!\r\n", ch);
+    send_to_char(ch, "Can't set that!\r\n");
     return (0);
   }
 
-  strcat(output, "\r\n");
-  send_to_char(CAP(output), ch);
   return (1);
 }
 
@@ -2604,8 +2506,7 @@ ACMD(do_set)
 {
   struct char_data *vict = NULL, *cbuf = NULL;
   struct char_file_u tmp_store;
-  char field[MAX_INPUT_LENGTH], name[MAX_INPUT_LENGTH],
-	val_arg[MAX_INPUT_LENGTH];
+  char field[MAX_INPUT_LENGTH], name[MAX_INPUT_LENGTH], buf[MAX_INPUT_LENGTH];
   int mode, len, player_i = 0, retval;
   char is_file = 0, is_player = 0;
 
@@ -2621,10 +2522,9 @@ ACMD(do_set)
     half_chop(buf, name, buf);
 
   half_chop(buf, field, buf);
-  strcpy(val_arg, buf);
 
   if (!*name || !*field) {
-    send_to_char("Usage: set <victim> <field> <value>\r\n", ch);
+    send_to_char(ch, "Usage: set <victim> <field> <value>\r\n");
     return;
   }
 
@@ -2632,12 +2532,12 @@ ACMD(do_set)
   if (!is_file) {
     if (is_player) {
       if (!(vict = get_player_vis(ch, name, NULL, FIND_CHAR_WORLD))) {
-	send_to_char("There is no such player.\r\n", ch);
+	send_to_char(ch, "There is no such player.\r\n");
 	return;
       }
     } else { /* is_mob */
       if (!(vict = get_char_vis(ch, name, NULL, FIND_CHAR_WORLD))) {
-	send_to_char("There is no such creature.\r\n", ch);
+	send_to_char(ch, "There is no such creature.\r\n");
 	return;
       }
     }
@@ -2649,13 +2549,13 @@ ACMD(do_set)
       store_to_char(&tmp_store, cbuf);
       if (GET_LEVEL(cbuf) >= GET_LEVEL(ch)) {
 	free_char(cbuf);
-	send_to_char("Sorry, you can't do that.\r\n", ch);
+	send_to_char(ch, "Sorry, you can't do that.\r\n");
 	return;
       }
       vict = cbuf;
     } else {
       free(cbuf);
-      send_to_char("There is no such player.\r\n", ch);
+      send_to_char(ch, "There is no such player.\r\n");
       return;
     }
   }
@@ -2667,7 +2567,7 @@ ACMD(do_set)
       break;
 
   /* perform the set */
-  retval = perform_set(ch, vict, mode, val_arg);
+  retval = perform_set(ch, vict, mode, buf);
 
   /* save the character if a change was made */
   if (retval) {
@@ -2677,7 +2577,7 @@ ACMD(do_set)
       char_to_store(vict, &tmp_store);
       fseek(player_fl, (player_i) * sizeof(struct char_file_u), SEEK_SET);
       fwrite(&tmp_store, sizeof(struct char_file_u), 1, player_fl);
-      send_to_char("Saved in file.\r\n", ch);
+      send_to_char(ch, "Saved in file.\r\n");
     }
   }
 
Index: src/alias.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/alias.c,v
retrieving revision 1.6
retrieving revision 1.8
diff -u -p -r1.6 -r1.8
--- src/alias.c	1998/10/29 01:02:12	1.6
+++ src/alias.c	2002/03/20 22:30:27	1.8
@@ -25,7 +25,7 @@ void write_aliases(struct char_data *ch)
   char fn[MAX_STRING_LENGTH];
   struct alias_data *temp;
 
-  get_filename(GET_NAME(ch), fn, ALIAS_FILE);
+  get_filename(fn, sizeof(fn), ALIAS_FILE, GET_NAME(ch));
   remove(fn);
 
   if (GET_ALIASES(ch) == NULL)
@@ -56,10 +56,10 @@ void read_aliases(struct char_data *ch)
 {   
   FILE *file;
   char xbuf[MAX_STRING_LENGTH];
-  struct alias_data *t2;
+  struct alias_data *t2, *prev = NULL;
   int length;
 
-  get_filename(GET_NAME(ch), xbuf, ALIAS_FILE);
+  get_filename(xbuf, sizeof(xbuf), ALIAS_FILE, GET_NAME(ch));
 
   if ((file = fopen(xbuf, "r")) == NULL) {
     if (errno != ENOENT) {
@@ -74,26 +74,42 @@ void read_aliases(struct char_data *ch)
 
   for (;;) {
     /* Read the aliased command. */
-    fscanf(file, "%d\n", &length);
+    if (fscanf(file, "%d\n", &length) != 1)
+      goto read_alias_error;
+
     fgets(xbuf, length + 1, file);
-    t2->alias = str_dup(xbuf);
+    t2->alias = strdup(xbuf);
 
     /* Build the replacement. */
-    fscanf(file, "%d\n", &length);
+    if (fscanf(file, "%d\n", &length) != 1)
+       goto read_alias_error;
+
     *xbuf = ' ';		/* Doesn't need terminated, fgets() will. */
     fgets(xbuf + 1, length + 1, file);
-    t2->replacement = str_dup(xbuf); 
+    t2->replacement = strdup(xbuf); 
 
     /* Figure out the alias type. */
-    fscanf(file, "%d\n", &length);
+    if (fscanf(file, "%d\n", &length) != 1)
+      goto read_alias_error;
+
     t2->type = length; 
 
     if (feof(file))
       break;
 
     CREATE(t2->next, struct alias_data, 1);
+    prev = t2;
     t2 = t2->next;
   }; 
   
+  fclose(file);
+  return;
+
+read_alias_error:
+  if (t2->alias)
+    free(t2->alias);
+  free(t2);
+  if (prev)
+    prev->next = NULL;
   fclose(file);
 } 
Index: src/ban.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/ban.c,v
retrieving revision 1.15
retrieving revision 1.20
diff -u -p -r1.15 -r1.20
--- src/ban.c	2002/01/15 23:53:07	1.15
+++ src/ban.c	2002/04/09 14:12:15	1.20
@@ -62,9 +62,9 @@ void load_banned(void)
   }
   while (fscanf(fl, " %s %s %d %s ", ban_type, site_name, &date, name) == 4) {
     CREATE(next_node, struct ban_list_element, 1);
-    strncpy(next_node->site, site_name, BANNED_SITE_LENGTH);
+    strncpy(next_node->site, site_name, BANNED_SITE_LENGTH);	/* strncpy: OK (n_n->site:BANNED_SITE_LENGTH+1) */
     next_node->site[BANNED_SITE_LENGTH] = '\0';
-    strncpy(next_node->name, name, MAX_NAME_LENGTH);
+    strncpy(next_node->name, name, MAX_NAME_LENGTH);	/* strncpy: OK (n_n->name:MAX_NAME_LENGTH+1) */
     next_node->name[MAX_NAME_LENGTH] = '\0';
     next_node->date = date;
 
@@ -129,66 +129,61 @@ void write_ban_list(void)
 #define BAN_LIST_FORMAT "%-25.25s  %-8.8s  %-10.10s  %-16.16s\r\n"
 ACMD(do_ban)
 {
-  char flag[MAX_INPUT_LENGTH], site[MAX_INPUT_LENGTH], *nextchar, *timestr;
+  char flag[MAX_INPUT_LENGTH], site[MAX_INPUT_LENGTH], *nextchar;
+  char timestr[16];
   int i;
   struct ban_list_element *ban_node;
 
-  *buf = '\0';
-
   if (!*argument) {
     if (!ban_list) {
-      send_to_char("No sites are banned.\r\n", ch);
+      send_to_char(ch, "No sites are banned.\r\n");
       return;
     }
-    sprintf(buf, BAN_LIST_FORMAT,
+    send_to_char(ch, BAN_LIST_FORMAT,
 	    "Banned Site Name",
 	    "Ban Type",
 	    "Banned On",
 	    "Banned By");
-    send_to_char(buf, ch);
-    sprintf(buf, BAN_LIST_FORMAT,
+    send_to_char(ch, BAN_LIST_FORMAT,
 	    "---------------------------------",
 	    "---------------------------------",
 	    "---------------------------------",
 	    "---------------------------------");
-    send_to_char(buf, ch);
 
     for (ban_node = ban_list; ban_node; ban_node = ban_node->next) {
       if (ban_node->date) {
-	timestr = asctime(localtime(&(ban_node->date)));
-	*(timestr + 10) = 0;
-	strcpy(site, timestr);
+	strlcpy(timestr, asctime(localtime(&(ban_node->date))), 10);
+	timestr[10] = '\0';
       } else
-	strcpy(site, "Unknown");
+	strcpy(timestr, "Unknown");	/* strcpy: OK (strlen("Unknown") < 16) */
 
-      sprintf(buf, BAN_LIST_FORMAT, ban_node->site, ban_types[ban_node->type],
-		site, ban_node->name);
-      send_to_char(buf, ch);
+      send_to_char(ch, BAN_LIST_FORMAT, ban_node->site, ban_types[ban_node->type], timestr, ban_node->name);
     }
     return;
   }
+
   two_arguments(argument, flag, site);
   if (!*site || !*flag) {
-    send_to_char("Usage: ban {all | select | new} site_name\r\n", ch);
+    send_to_char(ch, "Usage: ban {all | select | new} site_name\r\n");
     return;
   }
   if (!(!str_cmp(flag, "select") || !str_cmp(flag, "all") || !str_cmp(flag, "new"))) {
-    send_to_char("Flag must be ALL, SELECT, or NEW.\r\n", ch);
+    send_to_char(ch, "Flag must be ALL, SELECT, or NEW.\r\n");
     return;
   }
   for (ban_node = ban_list; ban_node; ban_node = ban_node->next) {
     if (!str_cmp(ban_node->site, site)) {
-      send_to_char("That site has already been banned -- unban it to change the ban type.\r\n", ch);
+      send_to_char(ch, "That site has already been banned -- unban it to change the ban type.\r\n");
       return;
     }
   }
 
   CREATE(ban_node, struct ban_list_element, 1);
-  strncpy(ban_node->site, site, BANNED_SITE_LENGTH);
+  strncpy(ban_node->site, site, BANNED_SITE_LENGTH);	/* strncpy: OK (b_n->site:BANNED_SITE_LENGTH+1) */
   for (nextchar = ban_node->site; *nextchar; nextchar++)
     *nextchar = LOWER(*nextchar);
   ban_node->site[BANNED_SITE_LENGTH] = '\0';
-  strncpy(ban_node->name, GET_NAME(ch), MAX_NAME_LENGTH);
+  strncpy(ban_node->name, GET_NAME(ch), MAX_NAME_LENGTH);	/* strncpy: OK (b_n->size:MAX_NAME_LENGTH+1) */
   ban_node->name[MAX_NAME_LENGTH] = '\0';
   ban_node->date = time(0);
 
@@ -199,10 +194,9 @@ ACMD(do_ban)
   ban_node->next = ban_list;
   ban_list = ban_node;
 
-  sprintf(buf, "%s has banned %s for %s players.", GET_NAME(ch), site,
-	  ban_types[ban_node->type]);
-  mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
-  send_to_char("Site banned.\r\n", ch);
+  mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s has banned %s for %s players.",
+	GET_NAME(ch), site, ban_types[ban_node->type]);
+  send_to_char(ch, "Site banned.\r\n");
   write_ban_list();
 }
 #undef BAN_LIST_FORMAT
@@ -216,7 +210,7 @@ ACMD(do_unban)
 
   one_argument(argument, site);
   if (!*site) {
-    send_to_char("A site to unban might help.\r\n", ch);
+    send_to_char(ch, "A site to unban might help.\r\n");
     return;
   }
   ban_node = ban_list;
@@ -228,14 +222,13 @@ ACMD(do_unban)
   }
 
   if (!found) {
-    send_to_char("That site is not currently banned.\r\n", ch);
+    send_to_char(ch, "That site is not currently banned.\r\n");
     return;
   }
   REMOVE_FROM_LIST(ban_node, ban_list, next);
-  send_to_char("Site unbanned.\r\n", ch);
-  sprintf(buf, "%s removed the %s-player ban on %s.",
-	  GET_NAME(ch), ban_types[ban_node->type], ban_node->site);
-  mudlog(buf, NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE);
+  send_to_char(ch, "Site unbanned.\r\n");
+  mudlog(NRM, MAX(LVL_GOD, GET_INVIS_LEV(ch)), TRUE, "%s removed the %s-player ban on %s.",
+	GET_NAME(ch), ban_types[ban_node->type], ban_node->site);
 
   free(ban_node);
   write_ban_list();
@@ -273,7 +266,7 @@ int Valid_Name(char *newname)
     return (1);
 
   /* change to lowercase */
-  strcpy(tempname, newname);
+  strlcpy(tempname, newname, sizeof(tempname));
   for (i = 0; tempname[i]; i++)
     tempname[i] = LOWER(tempname[i]);
 
@@ -310,7 +303,7 @@ void Read_Invalid_List(void)
 
   num_invalid = 0;
   while (get_line(fp, temp) && num_invalid < MAX_INVALID_NAMES)
-    invalid_list[num_invalid++] = str_dup(temp);
+    invalid_list[num_invalid++] = strdup(temp);
 
   if (num_invalid >= MAX_INVALID_NAMES) {
     log("SYSERR: Too many invalid names; change MAX_INVALID_NAMES in ban.c");
Index: src/boards.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/boards.c,v
retrieving revision 1.23
retrieving revision 1.26
diff -u -p -r1.23 -r1.26
--- src/boards.c	2002/01/10 17:24:47	1.23
+++ src/boards.c	2002/01/28 17:24:37	1.26
@@ -183,18 +183,18 @@ int Board_write_message(int board_type, 
 {
   char *tmstr;
   time_t ct;
-  char buf[MAX_INPUT_LENGTH], buf2[MAX_INPUT_LENGTH];
+  char buf[MAX_INPUT_LENGTH], buf2[MAX_NAME_LENGTH + 3];
 
   if (GET_LEVEL(ch) < WRITE_LVL(board_type)) {
-    send_to_char("You are not holy enough to write on this board.\r\n", ch);
+    send_to_char(ch, "You are not holy enough to write on this board.\r\n");
     return (1);
   }
   if (num_of_msgs[board_type] >= MAX_BOARD_MESSAGES) {
-    send_to_char("The board is full.\r\n", ch);
+    send_to_char(ch, "The board is full.\r\n");
     return (1);
   }
   if ((NEW_MSG_INDEX(board_type).slot_num = find_slot()) == -1) {
-    send_to_char("The board is malfunctioning - sorry.\r\n", ch);
+    send_to_char(ch, "The board is malfunctioning - sorry.\r\n");
     log("SYSERR: Board: failed to find empty slot on write.");
     return (1);
   }
@@ -206,19 +206,19 @@ int Board_write_message(int board_type, 
   arg[80] = '\0';
 
   if (!*arg) {
-    send_to_char("We must have a headline!\r\n", ch);
+    send_to_char(ch, "We must have a headline!\r\n");
     return (1);
   }
   ct = time(0);
   tmstr = (char *) asctime(localtime(&ct));
   *(tmstr + strlen(tmstr) - 1) = '\0';
 
-  sprintf(buf2, "(%s)", GET_NAME(ch));
-  sprintf(buf, "%6.10s %-12s :: %s", tmstr, buf2, arg);
-  NEW_MSG_INDEX(board_type).heading = str_dup(buf);
+  snprintf(buf2, sizeof(buf2), "(%s)", GET_NAME(ch));
+  snprintf(buf, sizeof(buf), "%6.10s %-12s :: %s", tmstr, buf2, arg);
+  NEW_MSG_INDEX(board_type).heading = strdup(buf);
   NEW_MSG_INDEX(board_type).level = GET_LEVEL(ch);
 
-  send_to_char("Write your message.  Terminate with a @ on a new line.\r\n\r\n", ch);
+  send_to_char(ch, "Write your message.  Terminate with a @ on a new line.\r\n\r\n");
   act("$n starts to write a message.", TRUE, ch, 0, 0, TO_ROOM);
 
   string_write(ch->desc, &(msg_storage[NEW_MSG_INDEX(board_type).slot_num]),
@@ -243,48 +243,57 @@ int Board_show_board(int board_type, str
     return (0);
 
   if (GET_LEVEL(ch) < READ_LVL(board_type)) {
-    send_to_char("You try but fail to understand the holy words.\r\n", ch);
+    send_to_char(ch, "You try but fail to understand the holy words.\r\n");
     return (1);
   }
   act("$n studies the board.", TRUE, ch, 0, 0, TO_ROOM);
 
-  strcpy(buf,
-	 "This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\n"
-	 "You will need to look at the board to save your message.\r\n");
   if (!num_of_msgs[board_type])
-    strcat(buf, "The board is empty.\r\n");
+    send_to_char(ch, "This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\nThe board is empty.\r\n");
   else {
-    sprintf(buf + strlen(buf), "There are %d messages on the board.\r\n",
-	    num_of_msgs[board_type]);
-#if NEWEST_AT_TOP
-    for (i = num_of_msgs[board_type] - 1; i >= 0; i--)
-#else
-    for (i = 0; i < num_of_msgs[board_type]; i++)
-#endif
-    {
-      if (MSG_HEADING(board_type, i))
+    size_t len = 0;
+    int nlen;
+
+    len = snprintf(buf, sizeof(buf),
+		"This is a bulletin board.  Usage: READ/REMOVE <messg #>, WRITE <header>.\r\n"
+		"You will need to look at the board to save your message.\r\n"
+		"There are %d messages on the board.\r\n",
+		num_of_msgs[board_type]);
 #if NEWEST_AT_TOP
-	sprintf(buf + strlen(buf), "%-2d : %s\r\n",
-		num_of_msgs[board_type] - i, MSG_HEADING(board_type, i));
+    for (i = num_of_msgs[board_type] - 1; i >= 0; i--) {
+      if (!MSG_HEADING(board_type, i))
+        goto fubar;
+
+      nlen = snprintf(buf + len, sizeof(buf) - len, "%-2d : %s\r\n", num_of_msgs[board_type] - i, MSG_HEADING(board_type, i));
+      if (len + nlen >= sizeof(buf) || nlen < 0)
+        break;
+      len += nlen;
+    }
 #else
-	sprintf(buf + strlen(buf), "%-2d : %s\r\n", i + 1, MSG_HEADING(board_type, i));
-#endif
-      else {
-	log("SYSERR: The board is fubar'd.");
-	send_to_char("Sorry, the board isn't working.\r\n", ch);
-	return (1);
-      }
+    for (i = 0; i < num_of_msgs[board_type]; i++) {
+      if (!MSG_HEADING(board_type, i))
+        goto fubar;
+
+      nlen = snprintf(buf + len, sizeof(buf) - len, "%-2d : %s\r\n", i + 1, MSG_HEADING(board_type, i));
+      if (len + nlen >= sizeof(buf) || nlen < 0)
+        break;
+      len += nlen;
     }
+#endif
+    page_string(ch->desc, buf, TRUE);
   }
-  page_string(ch->desc, buf, 1);
+  return (1);
 
+fubar:
+  log("SYSERR: Board %d is fubar'd.", board_type);
+  send_to_char(ch, "Sorry, the board isn't working.\r\n");
   return (1);
 }
 
 
 int Board_display_msg(int board_type, struct char_data *ch, char *arg, struct obj_data *board)
 {
-  char number[MAX_STRING_LENGTH], buffer[MAX_STRING_LENGTH];
+  char number[MAX_INPUT_LENGTH], buffer[MAX_STRING_LENGTH];
   int msg, ind;
 
   one_argument(arg, number);
@@ -298,16 +307,15 @@ int Board_display_msg(int board_type, st
     return (0);
 
   if (GET_LEVEL(ch) < READ_LVL(board_type)) {
-    send_to_char("You try but fail to understand the holy words.\r\n", ch);
+    send_to_char(ch, "You try but fail to understand the holy words.\r\n");
     return (1);
   }
   if (!num_of_msgs[board_type]) {
-    send_to_char("The board is empty!\r\n", ch);
+    send_to_char(ch, "The board is empty!\r\n");
     return (1);
   }
   if (msg < 1 || msg > num_of_msgs[board_type]) {
-    send_to_char("That message exists only in your imagination.\r\n",
-		 ch);
+    send_to_char(ch, "That message exists only in your imagination.\r\n");
     return (1);
   }
 #if NEWEST_AT_TOP
@@ -317,23 +325,23 @@ int Board_display_msg(int board_type, st
 #endif
   if (MSG_SLOTNUM(board_type, ind) < 0 ||
       MSG_SLOTNUM(board_type, ind) >= INDEX_SIZE) {
-    send_to_char("Sorry, the board is not working.\r\n", ch);
+    send_to_char(ch, "Sorry, the board is not working.\r\n");
     log("SYSERR: Board is screwed up. (Room #%d)", GET_ROOM_VNUM(IN_ROOM(ch)));
     return (1);
   }
   if (!(MSG_HEADING(board_type, ind))) {
-    send_to_char("That message appears to be screwed up.\r\n", ch);
+    send_to_char(ch, "That message appears to be screwed up.\r\n");
     return (1);
   }
   if (!(msg_storage[MSG_SLOTNUM(board_type, ind)])) {
-    send_to_char("That message seems to be empty.\r\n", ch);
+    send_to_char(ch, "That message seems to be empty.\r\n");
     return (1);
   }
-  sprintf(buffer, "Message %d : %s\r\n\r\n%s\r\n", msg,
+  snprintf(buffer, sizeof(buffer), "Message %d : %s\r\n\r\n%s\r\n", msg,
 	  MSG_HEADING(board_type, ind),
 	  msg_storage[MSG_SLOTNUM(board_type, ind)]);
 
-  page_string(ch->desc, buffer, 1);
+  page_string(ch->desc, buffer, TRUE);
 
   return (1);
 }
@@ -353,11 +361,11 @@ int Board_remove_msg(int board_type, str
     return (0);
 
   if (!num_of_msgs[board_type]) {
-    send_to_char("The board is empty!\r\n", ch);
+    send_to_char(ch, "The board is empty!\r\n");
     return (1);
   }
   if (msg < 1 || msg > num_of_msgs[board_type]) {
-    send_to_char("That message exists only in your imagination.\r\n", ch);
+    send_to_char(ch, "That message exists only in your imagination.\r\n");
     return (1);
   }
 #if NEWEST_AT_TOP
@@ -366,28 +374,28 @@ int Board_remove_msg(int board_type, str
   ind = msg - 1;
 #endif
   if (!MSG_HEADING(board_type, ind)) {
-    send_to_char("That message appears to be screwed up.\r\n", ch);
+    send_to_char(ch, "That message appears to be screwed up.\r\n");
     return (1);
   }
-  sprintf(buf, "(%s)", GET_NAME(ch));
+  snprintf(buf, sizeof(buf), "(%s)", GET_NAME(ch));
   if (GET_LEVEL(ch) < REMOVE_LVL(board_type) &&
       !(strstr(MSG_HEADING(board_type, ind), buf))) {
-    send_to_char("You are not holy enough to remove other people's messages.\r\n", ch);
+    send_to_char(ch, "You are not holy enough to remove other people's messages.\r\n");
     return (1);
   }
   if (GET_LEVEL(ch) < MSG_LEVEL(board_type, ind)) {
-    send_to_char("You can't remove a message holier than yourself.\r\n", ch);
+    send_to_char(ch, "You can't remove a message holier than yourself.\r\n");
     return (1);
   }
   slot_num = MSG_SLOTNUM(board_type, ind);
   if (slot_num < 0 || slot_num >= INDEX_SIZE) {
-    send_to_char("That message is majorly screwed up.\r\n", ch);
+    send_to_char(ch, "That message is majorly screwed up.\r\n");
     log("SYSERR: The board is seriously screwed up. (Room #%d)", GET_ROOM_VNUM(IN_ROOM(ch)));
     return (1);
   }
   for (d = descriptor_list; d; d = d->next)
     if (STATE(d) == CON_PLAYING && d->str == &(msg_storage[slot_num])) {
-      send_to_char("At least wait until the author is finished before removing it!\r\n", ch);
+      send_to_char(ch, "At least wait until the author is finished before removing it!\r\n");
       return (1);
     }
   if (msg_storage[slot_num])
@@ -403,8 +411,8 @@ int Board_remove_msg(int board_type, str
     MSG_LEVEL(board_type, ind) = MSG_LEVEL(board_type, ind + 1);
   }
   num_of_msgs[board_type]--;
-  send_to_char("Message removed.\r\n", ch);
-  sprintf(buf, "$n just removed message %d.", msg);
+  send_to_char(ch, "Message removed.\r\n");
+  snprintf(buf, sizeof(buf), "$n just removed message %d.", msg);
   act(buf, FALSE, ch, 0, 0, TO_ROOM);
   Board_save_board(board_type);
 
Index: src/bsd-snprintf.c
===================================================================
RCS file: bsd-snprintf.c
diff -N bsd-snprintf.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvswzR9E5	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,788 @@
+/*
+ * This file taken from openbsd-compat of OpenSSH 3.1. It is only used
+ * if your operating system does not provide snprintf() or vsnprintf().
+ *
+ * --- 8< --- OpenSSH LICENSE --- 8< ---
+ * Remaining components of the software are provided under a standard
+ * 2-term BSD licence with the following names as copyright holders:
+ *
+ *      Markus Friedl
+ *      Theo de Raadt
+ *      Niels Provos
+ *      Dug Song
+ *      Aaron Campbell
+ *      Damien Miller
+ *      Kevin Steves
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * --- 8< --- OpenSSH LICENSE --- 8< ---
+ */
+
+/**************************************************************
+ * Original:
+ * Patrick Powell Tue Apr 11 09:48:21 PDT 1995
+ * A bombproof version of doprnt (dopr) included.
+ * Sigh.  This sort of thing is always nasty do deal with.  Note that
+ * the version here does not include floating point...
+ *
+ * snprintf() is used instead of sprintf() as it does limit checks
+ * for string length.  This covers a nasty loophole.
+ *
+ * The other functions are there to prevent NULL pointers from
+ * causing nast effects.
+ *
+ * More Recently:
+ *  Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43
+ *  This was ugly.  It is still ugly.  I opted out of floating point
+ *  numbers, but the formatter understands just about everything
+ *  from the normal C string format, at least as far as I can tell from
+ *  the Solaris 2.5 printf(3S) man page.
+ *
+ *  Brandon Long <blong@fiction.net> 10/22/97 for mutt 0.87.1
+ *    Ok, added some minimal floating point support, which means this
+ *    probably requires libm on most operating systems.  Don't yet
+ *    support the exponent (e,E) and sigfig (g,G).  Also, fmtint()
+ *    was pretty badly broken, it just wasn't being exercised in ways
+ *    which showed it, so that's been fixed.  Also, formated the code
+ *    to mutt conventions, and removed dead code left over from the
+ *    original.  Also, there is now a builtin-test, just compile with:
+ *           gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
+ *    and run snprintf for results.
+ * 
+ *  Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
+ *    The PGP code was using unsigned hexadecimal formats. 
+ *    Unfortunately, unsigned formats simply didn't work.
+ *
+ *  Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
+ *    The original code assumed that both snprintf() and vsnprintf() were
+ *    missing.  Some systems only have snprintf() but not vsnprintf(), so
+ *    the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
+ *
+ *  Ben Lindstrom <mouring@eviladmin.org> 09/27/00 for OpenSSH
+ *    Welcome to the world of %lld and %qd support.  With other
+ *    long long support.  This is needed for sftp-server to work
+ *    right.
+ *
+ *  Ben Lindstrom <mouring@eviladmin.org> 02/12/01 for OpenSSH
+ *    Removed all hint of VARARGS stuff and banished it to the void,
+ *    and did a bit of KNF style work to make things a bit more
+ *    acceptable.  Consider stealing from mutt or enlightenment.
+ **************************************************************/
+
+#if 0
+#include "includes.h"
+
+RCSID("$Id: bsd-snprintf.c,v 1.1 2002/04/16 02:22:12 greerga Exp $");
+#else
+# include "conf.h"
+# include "sysdep.h"
+# define MAX(a, b)	((a) < (b) ? (b) : (a))
+#endif
+
+#if defined(BROKEN_SNPRINTF)		/* For those with broken snprintf() */
+# undef HAVE_SNPRINTF
+# undef HAVE_VSNPRINTF
+#endif
+
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
+
+static void 
+dopr(char *buffer, size_t maxlen, const char *format, va_list args);
+
+static void 
+fmtstr(char *buffer, size_t *currlen, size_t maxlen, char *value, int flags, 
+       int min, int max);
+
+static void 
+fmtint(char *buffer, size_t *currlen, size_t maxlen, long value, int base, 
+       int min, int max, int flags);
+
+static void 
+fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue, 
+      int min, int max, int flags);
+
+static void
+dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
+
+/*
+ * dopr(): poor man's version of doprintf
+ */
+
+/* format read states */
+#define DP_S_DEFAULT 0
+#define DP_S_FLAGS   1
+#define DP_S_MIN     2
+#define DP_S_DOT     3
+#define DP_S_MAX     4
+#define DP_S_MOD     5
+#define DP_S_CONV    6
+#define DP_S_DONE    7
+
+/* format flags - Bits */
+#define DP_F_MINUS 	(1 << 0)
+#define DP_F_PLUS  	(1 << 1)
+#define DP_F_SPACE 	(1 << 2)
+#define DP_F_NUM   	(1 << 3)
+#define DP_F_ZERO  	(1 << 4)
+#define DP_F_UP    	(1 << 5)
+#define DP_F_UNSIGNED 	(1 << 6)
+
+/* Conversion Flags */
+#define DP_C_SHORT     1
+#define DP_C_LONG      2
+#define DP_C_LDOUBLE   3
+#define DP_C_LONG_LONG 4
+
+#define char_to_int(p) (p - '0')
+#define abs_val(p) (p < 0 ? -p : p)
+
+
+static void 
+dopr(char *buffer, size_t maxlen, const char *format, va_list args)
+{
+	char *strvalue;
+	char ch;
+	long value;
+	long double fvalue;
+	int min = 0;
+	int max = -1;
+	int state = DP_S_DEFAULT;
+	int flags = 0;
+	int cflags = 0;
+	size_t currlen = 0;
+  
+	ch = *format++;
+
+	while (state != DP_S_DONE) {
+		if ((ch == '\0') || (currlen >= maxlen)) 
+			state = DP_S_DONE;
+
+		switch(state) {
+			case DP_S_DEFAULT:
+				if (ch == '%') 
+					state = DP_S_FLAGS;
+				else 
+					dopr_outch(buffer, &currlen, maxlen, ch);
+				ch = *format++;
+				break;
+			case DP_S_FLAGS:
+				switch (ch) {
+					case '-':
+						flags |= DP_F_MINUS;
+						ch = *format++;
+						break;
+					case '+':
+						flags |= DP_F_PLUS;
+						ch = *format++;
+						break;
+					case ' ':
+						flags |= DP_F_SPACE;
+						ch = *format++;
+						break;
+					case '#':
+						flags |= DP_F_NUM;
+						ch = *format++;
+						break;
+					case '0':
+						flags |= DP_F_ZERO;
+						ch = *format++;
+						break;
+					default:
+						state = DP_S_MIN;
+						break;
+				}
+				break;
+			case DP_S_MIN:
+				if (isdigit((unsigned char)ch)) {
+					min = 10*min + char_to_int (ch);
+					ch = *format++;
+				} else if (ch == '*') {
+					min = va_arg (args, int);
+					ch = *format++;
+					state = DP_S_DOT;
+				} else 
+					state = DP_S_DOT;
+				break;
+			case DP_S_DOT:
+				if (ch == '.') {
+					state = DP_S_MAX;
+					ch = *format++;
+				} else 
+					state = DP_S_MOD;
+				break;
+			case DP_S_MAX:
+				if (isdigit((unsigned char)ch)) {
+					if (max < 0)
+						max = 0;
+					max = 10*max + char_to_int(ch);
+					ch = *format++;
+				} else if (ch == '*') {
+					max = va_arg (args, int);
+					ch = *format++;
+					state = DP_S_MOD;
+				} else 
+					state = DP_S_MOD;
+				break;
+			case DP_S_MOD:
+				switch (ch) {
+					case 'h':
+						cflags = DP_C_SHORT;
+						ch = *format++;
+						break;
+					case 'l':
+						cflags = DP_C_LONG;
+						ch = *format++;
+						if (ch == 'l') {
+							cflags = DP_C_LONG_LONG;
+							ch = *format++;
+						}
+						break;
+					case 'q':
+						cflags = DP_C_LONG_LONG;
+						ch = *format++;
+						break;
+					case 'L':
+						cflags = DP_C_LDOUBLE;
+						ch = *format++;
+						break;
+					default:
+						break;
+				}
+				state = DP_S_CONV;
+				break;
+			case DP_S_CONV:
+				switch (ch) {
+					case 'd':
+					case 'i':
+						if (cflags == DP_C_SHORT) 
+							value = va_arg(args, int);
+						else if (cflags == DP_C_LONG)
+							value = va_arg(args, long int);
+						else if (cflags == DP_C_LONG_LONG)
+							value = va_arg (args, long long);
+						else
+							value = va_arg (args, int);
+						fmtint(buffer, &currlen, maxlen, value, 10, min, max, flags);
+						break;
+					case 'o':
+						flags |= DP_F_UNSIGNED;
+						if (cflags == DP_C_SHORT)
+							value = va_arg(args, unsigned int);
+						else if (cflags == DP_C_LONG)
+							value = va_arg(args, unsigned long int);
+						else if (cflags == DP_C_LONG_LONG)
+							value = va_arg(args, unsigned long long);
+						else
+							value = va_arg(args, unsigned int);
+						fmtint(buffer, &currlen, maxlen, value, 8, min, max, flags);
+						break;
+					case 'u':
+						flags |= DP_F_UNSIGNED;
+						if (cflags == DP_C_SHORT)
+							value = va_arg(args, unsigned int);
+						else if (cflags == DP_C_LONG)
+							value = va_arg(args, unsigned long int);
+						else if (cflags == DP_C_LONG_LONG)
+							value = va_arg(args, unsigned long long);
+						else
+							value = va_arg(args, unsigned int);
+						fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
+						break;
+					case 'X':
+						flags |= DP_F_UP;
+					case 'x':
+						flags |= DP_F_UNSIGNED;
+						if (cflags == DP_C_SHORT)
+							value = va_arg(args, unsigned int);
+						else if (cflags == DP_C_LONG)
+							value = va_arg(args, unsigned long int);
+						else if (cflags == DP_C_LONG_LONG)
+							value = va_arg(args, unsigned long long);
+						else
+							value = va_arg(args, unsigned int);
+						fmtint(buffer, &currlen, maxlen, value, 16, min, max, flags);
+						break;
+					case 'f':
+						if (cflags == DP_C_LDOUBLE)
+							fvalue = va_arg(args, long double);
+						else
+							fvalue = va_arg(args, double);
+						/* um, floating point? */
+						fmtfp(buffer, &currlen, maxlen, fvalue, min, max, flags);
+						break;
+					case 'E':
+						flags |= DP_F_UP;
+					case 'e':
+						if (cflags == DP_C_LDOUBLE)
+							fvalue = va_arg(args, long double);
+						else
+							fvalue = va_arg(args, double);
+						break;
+					case 'G':
+						flags |= DP_F_UP;
+					case 'g':
+						if (cflags == DP_C_LDOUBLE)
+							fvalue = va_arg(args, long double);
+						else
+							fvalue = va_arg(args, double);
+						break;
+					case 'c':
+						dopr_outch(buffer, &currlen, maxlen, va_arg(args, int));
+						break;
+					case 's':
+						strvalue = va_arg(args, char *);
+						if (max < 0) 
+							max = maxlen; /* ie, no max */
+						fmtstr(buffer, &currlen, maxlen, strvalue, flags, min, max);
+						break;
+					case 'p':
+						strvalue = va_arg(args, void *);
+						fmtint(buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
+						break;
+					case 'n':
+						if (cflags == DP_C_SHORT) {
+							short int *num;
+							num = va_arg(args, short int *);
+							*num = currlen;
+						} else if (cflags == DP_C_LONG) {
+							long int *num;
+							num = va_arg(args, long int *);
+							*num = currlen;
+						} else if (cflags == DP_C_LONG_LONG) {
+							long long *num;
+							num = va_arg(args, long long *);
+							*num = currlen;
+						} else {
+							int *num;
+							num = va_arg(args, int *);
+							*num = currlen;
+						}
+						break;
+					case '%':
+						dopr_outch(buffer, &currlen, maxlen, ch);
+						break;
+					case 'w': /* not supported yet, treat as next char */
+						ch = *format++;
+						break;
+					default: /* Unknown, skip */
+					break;
+				}
+				ch = *format++;
+				state = DP_S_DEFAULT;
+				flags = cflags = min = 0;
+				max = -1;
+				break;
+			case DP_S_DONE:
+				break;
+			default: /* hmm? */
+				break; /* some picky compilers need this */
+		}
+	}
+	if (currlen < maxlen - 1) 
+		buffer[currlen] = '\0';
+	else 
+		buffer[maxlen - 1] = '\0';
+}
+
+static void
+fmtstr(char *buffer, size_t *currlen, size_t maxlen,
+       char *value, int flags, int min, int max)
+{
+	int padlen, strln;     /* amount to pad */
+	int cnt = 0;
+  
+	if (value == 0) 
+		value = "<NULL>";
+
+	for (strln = 0; value[strln]; ++strln); /* strlen */
+	padlen = min - strln;
+	if (padlen < 0) 
+		padlen = 0;
+	if (flags & DP_F_MINUS) 
+		padlen = -padlen; /* Left Justify */
+
+	while ((padlen > 0) && (cnt < max)) {
+		dopr_outch(buffer, currlen, maxlen, ' ');
+		--padlen;
+		++cnt;
+	}
+	while (*value && (cnt < max)) {
+		dopr_outch(buffer, currlen, maxlen, *value++);
+		++cnt;
+	}
+	while ((padlen < 0) && (cnt < max)) {
+		dopr_outch(buffer, currlen, maxlen, ' ');
+		++padlen;
+		++cnt;
+	}
+}
+
+/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
+
+static void 
+fmtint(char *buffer, size_t *currlen, size_t maxlen,
+       long value, int base, int min, int max, int flags)
+{
+	unsigned long uvalue;
+	char convert[20];
+	int signvalue = 0;
+	int place = 0;
+	int spadlen = 0; /* amount to space pad */
+	int zpadlen = 0; /* amount to zero pad */
+	int caps = 0;
+  
+	if (max < 0)
+		max = 0;
+
+	uvalue = value;
+
+	if (!(flags & DP_F_UNSIGNED)) {
+		if (value < 0) {
+			signvalue = '-';
+			uvalue = -value;
+		} else if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
+			signvalue = '+';
+		else if (flags & DP_F_SPACE)
+			signvalue = ' ';
+	}
+  
+	if (flags & DP_F_UP) 
+		caps = 1; /* Should characters be upper case? */
+
+	do {
+		convert[place++] =
+			(caps? "0123456789ABCDEF":"0123456789abcdef")
+			[uvalue % (unsigned)base];
+		uvalue = (uvalue / (unsigned)base );
+	} while (uvalue && (place < 20));
+	if (place == 20) 
+		place--;
+	convert[place] = 0;
+
+	zpadlen = max - place;
+	spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
+	if (zpadlen < 0)
+		zpadlen = 0;
+	if (spadlen < 0)
+		spadlen = 0;
+	if (flags & DP_F_ZERO) {
+		zpadlen = MAX(zpadlen, spadlen);
+		spadlen = 0;
+	}
+	if (flags & DP_F_MINUS) 
+		spadlen = -spadlen; /* Left Justifty */
+
+
+	/* Spaces */
+	while (spadlen > 0) {
+		dopr_outch(buffer, currlen, maxlen, ' ');
+		--spadlen;
+	}
+
+	/* Sign */
+	if (signvalue) 
+		dopr_outch(buffer, currlen, maxlen, signvalue);
+
+	/* Zeros */
+	if (zpadlen > 0) {
+		while (zpadlen > 0) {
+			dopr_outch(buffer, currlen, maxlen, '0');
+			--zpadlen;
+		}
+	}
+
+	/* Digits */
+	while (place > 0) 
+		dopr_outch(buffer, currlen, maxlen, convert[--place]);
+  
+	/* Left Justified spaces */
+	while (spadlen < 0) {
+		dopr_outch (buffer, currlen, maxlen, ' ');
+		++spadlen;
+	}
+}
+
+static long double 
+pow10(int exp)
+{
+	long double result = 1;
+
+	while (exp) {
+		result *= 10;
+		exp--;
+	}
+  
+	return result;
+}
+
+static long 
+round(long double value)
+{
+	long intpart = value;
+
+	value -= intpart;
+	if (value >= 0.5)
+		intpart++;
+
+	return intpart;
+}
+
+static void 
+fmtfp(char *buffer, size_t *currlen, size_t maxlen, long double fvalue, 
+      int min, int max, int flags)
+{
+	char iconvert[20];
+	char fconvert[20];
+	int signvalue = 0;
+	int iplace = 0;
+	int fplace = 0;
+	int padlen = 0; /* amount to pad */
+	int zpadlen = 0; 
+	int caps = 0;
+	long intpart;
+	long fracpart;
+	long double ufvalue;
+  
+	/* 
+	 * AIX manpage says the default is 0, but Solaris says the default
+	 * is 6, and sprintf on AIX defaults to 6
+	 */
+	if (max < 0)
+		max = 6;
+
+	ufvalue = abs_val(fvalue);
+
+	if (fvalue < 0)
+		signvalue = '-';
+	else if (flags & DP_F_PLUS)  /* Do a sign (+/i) */
+		signvalue = '+';
+	else if (flags & DP_F_SPACE)
+		signvalue = ' ';
+
+	intpart = ufvalue;
+
+	/* 
+	 * Sorry, we only support 9 digits past the decimal because of our 
+	 * conversion method
+	 */
+	if (max > 9)
+		max = 9;
+
+	/* We "cheat" by converting the fractional part to integer by
+	 * multiplying by a factor of 10
+	 */
+	fracpart = round((pow10 (max)) * (ufvalue - intpart));
+
+	if (fracpart >= pow10 (max)) {
+		intpart++;
+		fracpart -= pow10 (max);
+	}
+
+	/* Convert integer part */
+	do {
+		iconvert[iplace++] =
+		  (caps? "0123456789ABCDEF":"0123456789abcdef")[intpart % 10];
+		intpart = (intpart / 10);
+	} while(intpart && (iplace < 20));
+	if (iplace == 20) 
+		iplace--;
+	iconvert[iplace] = 0;
+
+	/* Convert fractional part */
+	do {
+		fconvert[fplace++] =
+		  (caps? "0123456789ABCDEF":"0123456789abcdef")[fracpart % 10];
+		fracpart = (fracpart / 10);
+	} while(fracpart && (fplace < 20));
+	if (fplace == 20) 
+		fplace--;
+	fconvert[fplace] = 0;
+
+	/* -1 for decimal point, another -1 if we are printing a sign */
+	padlen = min - iplace - max - 1 - ((signvalue) ? 1 : 0); 
+	zpadlen = max - fplace;
+	if (zpadlen < 0)
+		zpadlen = 0;
+	if (padlen < 0) 
+		padlen = 0;
+	if (flags & DP_F_MINUS) 
+		padlen = -padlen; /* Left Justifty */
+
+	if ((flags & DP_F_ZERO) && (padlen > 0)) {
+		if (signvalue) {
+			dopr_outch(buffer, currlen, maxlen, signvalue);
+			--padlen;
+			signvalue = 0;
+		}
+		while (padlen > 0) {
+			dopr_outch(buffer, currlen, maxlen, '0');
+			--padlen;
+		}
+	}
+	while (padlen > 0) {
+		dopr_outch(buffer, currlen, maxlen, ' ');
+		--padlen;
+	}
+	if (signvalue) 
+		dopr_outch(buffer, currlen, maxlen, signvalue);
+
+	while (iplace > 0) 
+		dopr_outch(buffer, currlen, maxlen, iconvert[--iplace]);
+
+	/*
+	 * Decimal point.  This should probably use locale to find the correct
+	 * char to print out.
+	 */
+	dopr_outch(buffer, currlen, maxlen, '.');
+
+	while (fplace > 0) 
+		dopr_outch(buffer, currlen, maxlen, fconvert[--fplace]);
+
+	while (zpadlen > 0) {
+		dopr_outch(buffer, currlen, maxlen, '0');
+		--zpadlen;
+	}
+
+	while (padlen < 0) {
+		dopr_outch(buffer, currlen, maxlen, ' ');
+		++padlen;
+	}
+}
+
+static void 
+dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
+{
+	if (*currlen < maxlen)
+		buffer[(*currlen)++] = c;
+}
+#endif /* !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF) */
+
+#ifndef HAVE_VSNPRINTF
+int 
+vsnprintf(char *str, size_t count, const char *fmt, va_list args)
+{
+	str[0] = 0;
+	dopr(str, count, fmt, args);
+
+	return(strlen(str));
+}
+#endif /* !HAVE_VSNPRINTF */
+
+#ifndef HAVE_SNPRINTF
+int 
+snprintf(char *str,size_t count,const char *fmt,...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	(void) vsnprintf(str, count, fmt, ap);
+	va_end(ap);
+
+	return(strlen(str));
+}
+
+#ifdef TEST_SNPRINTF
+int 
+main(void)
+{
+#define LONG_STRING 1024
+	char buf1[LONG_STRING];
+	char buf2[LONG_STRING];
+	char *fp_fmt[] = {
+		"%-1.5f",
+		"%1.5f",
+		"%123.9f",
+		"%10.5f",
+		"% 10.5f",
+		"%+22.9f",
+		"%+4.9f",
+		"%01.3f",
+		"%4f",
+		"%3.1f",
+		"%3.2f",
+		NULL
+	};
+	double fp_nums[] = { 
+		-1.5, 
+		134.21, 
+		91340.2, 
+		341.1234, 
+		0203.9, 
+		0.96, 
+		0.996, 
+		0.9996, 
+		1.996, 
+		4.136, 
+		0
+	};
+	char *int_fmt[] = {
+		"%-1.5d",
+		"%1.5d",
+		"%123.9d",
+		"%5.5d",
+		"%10.5d",
+		"% 10.5d",
+		"%+22.33d",
+		"%01.3d",
+		"%4d",
+		"%lld",
+		"%qd",
+		NULL
+	};
+	long long int_nums[] = { -1, 134, 91340, 341, 0203, 0, 9999999 };
+	int x, y;
+	int fail = 0;
+	int num = 0;
+
+	printf("Testing snprintf format codes against system sprintf...\n");
+
+	for (x = 0; fp_fmt[x] != NULL ; x++) {
+		for (y = 0; fp_nums[y] != 0 ; y++) {
+			snprintf(buf1, sizeof (buf1), fp_fmt[x], fp_nums[y]);
+			sprintf (buf2, fp_fmt[x], fp_nums[y]);
+			if (strcmp (buf1, buf2)) {
+				printf("snprintf doesn't match Format: %s\n\t"
+                                       "snprintf = %s\n\tsprintf  = %s\n", 
+					fp_fmt[x], buf1, buf2);
+				fail++;
+			}
+			num++;
+		}
+	}
+	for (x = 0; int_fmt[x] != NULL ; x++) {
+		for (y = 0; int_nums[y] != 0 ; y++) {
+			snprintf(buf1, sizeof (buf1), int_fmt[x], int_nums[y]);
+			sprintf(buf2, int_fmt[x], int_nums[y]);
+			if (strcmp (buf1, buf2)) {
+				printf("snprintf doesn't match Format: %s\n\t"
+				       "snprintf = %s\n\tsprintf  = %s\n", 
+					int_fmt[x], buf1, buf2);
+				fail++;
+			}
+			num++;
+		}
+	}
+	printf("%d tests failed out of %d.\n", fail, num);
+	return(0);
+}
+#endif /* SNPRINTF_TEST */
+
+#endif /* !HAVE_SNPRINTF */
Index: src/bsd-snprintf.h
===================================================================
RCS file: bsd-snprintf.h
diff -N bsd-snprintf.h
--- /dev/null	Tue May  5 13:32:27 1998
+++ /tmp/cvsaVKtE8	Mon Apr 15 20:36:22 2002
@@ -0,0 +1,58 @@
+/*
+ * This file taken from openbsd-compat of OpenSSH 3.1:
+ *
+ * --- 8< --- OpenSSH LICENSE --- 8< ---
+ * Remaining components of the software are provided under a standard
+ * 2-term BSD licence with the following names as copyright holders:
+ *
+ *      Markus Friedl
+ *      Theo de Raadt
+ *      Niels Provos
+ *      Dug Song
+ *      Aaron Campbell
+ *      Damien Miller
+ *      Kevin Steves
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * --- 8< --- OpenSSH LICENSE --- 8< ---
+ */
+
+/* $Id: bsd-snprintf.h,v 1.1 2002/04/16 02:22:12 greerga Exp $ */
+
+#ifndef _BSD_SNPRINTF_H
+#define _BSD_SNPRINTF_H
+
+#if 0
+#include "config.h"
+
+#include <sys/types.h> /* For size_t */
+#endif
+
+#ifndef HAVE_SNPRINTF
+int snprintf(char *str, size_t count, const char *fmt, ...);
+#endif /* !HAVE_SNPRINTF */
+
+#ifndef HAVE_VSNPRINTF
+int vsnprintf(char *str, size_t count, const char *fmt, va_list args);
+#endif /* !HAVE_SNPRINTF */
+
+
+#endif /* _BSD_SNPRINTF_H */
Index: src/castle.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/castle.c,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -p -r1.24 -r1.28
--- src/castle.c	2002/01/10 22:26:32	1.24
+++ src/castle.c	2002/04/09 12:34:36	1.28
@@ -268,7 +268,7 @@ struct char_data *get_victim(struct char
   if (!iNum_bad_guys)
     return (NULL);
 
-  iVictim = number(0, iNum_bad_guys);	/* How nice, we give them a chance */
+  iVictim = rand_number(0, iNum_bad_guys);	/* How nice, we give them a chance */
   if (!iVictim)
     return (NULL);
 
@@ -364,7 +364,7 @@ int block_way(struct char_data *ch, int 
   if (!member_of_staff(ch))
     act("The guard roars at $n and pushes $m back.", FALSE, ch, 0, 0, TO_ROOM);
 
-  send_to_char("The guard roars: 'Entrance is Prohibited!', and pushes you back.\r\n", ch);
+  send_to_char(ch, "The guard roars: 'Entrance is Prohibited!', and pushes you back.\r\n");
   return (TRUE);
 }
 
@@ -402,17 +402,17 @@ void fry_victim(struct char_data *ch)
   if (!(tch = get_victim(ch)))
     return;
 
-  switch (number(0, 8)) {
+  switch (rand_number(0, 8)) {
   case 1:
   case 2:
   case 3:
-    send_to_char("You raise your hand in a dramatical gesture.\r\n", ch);
+    send_to_char(ch, "You raise your hand in a dramatical gesture.\r\n");
     act("$n raises $s hand in a dramatical gesture.", 1, ch, 0, 0, TO_ROOM);
     cast_spell(ch, tch, 0, SPELL_COLOR_SPRAY);
     break;
   case 4:
   case 5:
-    send_to_char("You concentrate and mumble to yourself.\r\n", ch);
+    send_to_char(ch, "You concentrate and mumble to yourself.\r\n");
     act("$n concentrates, and mumbles to $mself.", 1, ch, 0, 0, TO_ROOM);
     cast_spell(ch, tch, 0, SPELL_HARM);
     break;
@@ -424,7 +424,7 @@ void fry_victim(struct char_data *ch)
     cast_spell(ch, tch, 0, SPELL_FIREBALL);
     break;
   default:
-    if (!number(0, 1))
+    if (!rand_number(0, 1))
       cast_spell(ch, ch, 0, SPELL_HEAL);
     break;
   }
@@ -457,22 +457,22 @@ SPECIAL(king_welmar)
   const char monolog_path[] = "ABCDPPPP.";
 
   static const char *path;
-  static int index;
+  static int path_index;
   static bool move = FALSE;
 
   if (!move) {
     if (time_info.hours == 8 && IN_ROOM(ch) == castle_real_room(51)) {
       move = TRUE;
       path = throne_path;
-      index = 0;
+      path_index = 0;
     } else if (time_info.hours == 21 && IN_ROOM(ch) == castle_real_room(17)) {
       move = TRUE;
       path = bedroom_path;
-      index = 0;
+      path_index = 0;
     } else if (time_info.hours == 12 && IN_ROOM(ch) == castle_real_room(17)) {
       move = TRUE;
       path = monolog_path;
-      index = 0;
+      path_index = 0;
     }
   }
   if (cmd || (GET_POS(ch) < POS_SLEEPING) ||
@@ -488,21 +488,21 @@ SPECIAL(king_welmar)
   if (!move)
     return (FALSE);
 
-  switch (path[index]) {
+  switch (path[path_index]) {
   case '0':
   case '1':
   case '2':
   case '3':
   case '4':
   case '5':
-    perform_move(ch, path[index] - '0', 1);
+    perform_move(ch, path[path_index] - '0', 1);
     break;
 
   case 'A':
   case 'B':
   case 'C':
   case 'D':
-    act(monolog[path[index] - 'A'], FALSE, ch, 0, 0, TO_ROOM);
+    act(monolog[path[path_index] - 'A'], FALSE, ch, 0, 0, TO_ROOM);
     break;
 
   case 'P':
@@ -537,13 +537,13 @@ SPECIAL(king_welmar)
     break;
 
   case 'o':
-    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_UNLOCK);
-    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_OPEN);
+    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_UNLOCK);	/* strcpy: OK */
+    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_OPEN);	/* strcpy: OK */
     break;
 
   case 'c':
-    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_CLOSE);
-    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_LOCK);
+    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_CLOSE);	/* strcpy: OK */
+    do_gen_door(ch, strcpy(actbuf, "door"), 0, SCMD_LOCK);	/* strcpy: OK */
     break;
 
   case '.':
@@ -551,7 +551,7 @@ SPECIAL(king_welmar)
     break;
   }
 
-  index++;
+  path_index++;
   return (FALSE);
 }
 
@@ -573,7 +573,7 @@ SPECIAL(training_master)
   if (cmd)
     return (FALSE);
 
-  if (banzaii(ch) || number(0, 2))
+  if (banzaii(ch) || rand_number(0, 2))
     return (FALSE);
 
   if (!(pupil1 = find_npc_by_name(ch, "Brian", 5)))
@@ -585,13 +585,13 @@ SPECIAL(training_master)
   if (FIGHTING(pupil1) || FIGHTING(pupil2))
     return (FALSE);
 
-  if (number(0, 1)) {
+  if (rand_number(0, 1)) {
     tch = pupil1;
     pupil1 = pupil2;
     pupil2 = tch;
   }
 
-  switch (number(0, 7)) {
+  switch (rand_number(0, 7)) {
   case 0:
     act("$n hits $N on $s head with a powerful blow.", FALSE, pupil1, 0, pupil2, TO_NOTVICT);
     act("You hit $N on $s head with a powerful blow.", FALSE, pupil1, 0, pupil2, TO_CHAR);
@@ -605,7 +605,7 @@ SPECIAL(training_master)
     break;
 
   case 2:
-    send_to_char("You command your pupils to bow.\r\n", ch);
+    send_to_char(ch, "You command your pupils to bow.\r\n");
     act("$n commands $s pupils to bow.", FALSE, ch, 0, 0, TO_ROOM);
     act("$n bows before $N.", FALSE, pupil1, 0, pupil2, TO_NOTVICT);
     act("$N bows before $n.", FALSE, pupil1, 0, pupil2, TO_NOTVICT);
@@ -617,7 +617,7 @@ SPECIAL(training_master)
     act("$N yells at $n, as he fumbles and drops $s sword.", FALSE, pupil1, 0, ch, TO_NOTVICT);
     act("$n quickly picks up $s weapon.", FALSE, pupil1, 0, 0, TO_ROOM);
     act("$N yells at you, as you fumble, losing your weapon.", FALSE, pupil1, 0, ch, TO_CHAR);
-    send_to_char("You quickly pick up your weapon again.\r\n", pupil1);
+    send_to_char(pupil1, "You quickly pick up your weapon again.\r\n");
     act("You yell at $n, as he fumbles, losing $s weapon.", FALSE, pupil1, 0, ch, TO_VICT);
     break;
 
@@ -640,7 +640,7 @@ SPECIAL(training_master)
     break;
 
   default:
-    send_to_char("You show your pupils an advanced technique.\r\n", ch);
+    send_to_char(ch, "You show your pupils an advanced technique.\r\n");
     act("$n shows $s pupils an advanced technique.", FALSE, ch, 0, 0, TO_ROOM);
     break;
   }
@@ -651,12 +651,12 @@ SPECIAL(training_master)
 
 SPECIAL(tom)
 {
-  return castle_twin_proc(ch, cmd, arg, 48, "Tim");
+  return castle_twin_proc(ch, cmd, argument, 48, "Tim");
 }
 
 SPECIAL(tim)
 {
-  return castle_twin_proc(ch, cmd, arg, 49, "Tom");
+  return castle_twin_proc(ch, cmd, argument, 49, "Tom");
 }
 
 /*
@@ -676,7 +676,7 @@ int castle_twin_proc(struct char_data *c
     char actbuf[MAX_INPUT_LENGTH];
 
     if (!ch->master)
-      do_follow(ch, strcpy(actbuf, "King Welmar"), 0, 0);
+      do_follow(ch, strcpy(actbuf, "King Welmar"), 0, 0);	/* strcpy: OK */
     if (FIGHTING(king))
       do_npc_rescue(ch, king);
   }
@@ -768,7 +768,7 @@ SPECIAL(DicknDavid)
   if (!cmd && GET_POS(ch) != POS_FIGHTING)
     banzaii(ch);
 
-  return (block_way(ch, cmd, arg, castle_virtual(36), 1));
+  return (block_way(ch, cmd, argument, castle_virtual(36), 1));
 }
 
 
@@ -786,8 +786,8 @@ SPECIAL(peter)
   if (banzaii(ch))
     return (FALSE);
 
-  if (!(number(0, 3)) && (ch_guard = find_guard(ch)))
-    switch (number(0, 5)) {
+  if (!(rand_number(0, 3)) && (ch_guard = find_guard(ch)))
+    switch (rand_number(0, 5)) {
     case 0:
       act("$N comes sharply into attention as $n inspects $M.",
 	  FALSE, ch, 0, ch_guard, TO_NOTVICT);
@@ -853,7 +853,7 @@ SPECIAL(jerry)
   if (cmd)
     return (FALSE);
 
-  if (banzaii(ch) || number(0, 2))
+  if (banzaii(ch) || rand_number(0, 2))
     return (FALSE);
 
   if (!(gambler1 = ch))
@@ -865,13 +865,13 @@ SPECIAL(jerry)
   if (FIGHTING(gambler1) || FIGHTING(gambler2))
     return (FALSE);
 
-  if (number(0, 1)) {
+  if (rand_number(0, 1)) {
     tch = gambler1;
     gambler1 = gambler2;
     gambler2 = tch;
   }
 
-  switch (number(0, 5)) {
+  switch (rand_number(0, 5)) {
   case 0:
     act("$n rolls the dice and cheers loudly at the result.",
 	    FALSE, gambler1, 0, gambler2, TO_NOTVICT);
Index: src/class.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/class.c,v
retrieving revision 1.27
retrieving revision 1.33
diff -u -p -r1.27 -r1.33
--- src/class.c	2002/01/13 21:46:14	1.27
+++ src/class.c	2002/04/09 14:52:43	1.33
@@ -32,7 +32,7 @@ extern int siteok_everyone;
 /* local functions */
 void snoop_check(struct char_data *ch);
 int parse_class(char arg);
-long find_class_bitvector(char arg);
+bitvector_t find_class_bitvector(const char *arg);
 byte saving_throws(int class_num, int type, int level);
 int thaco(int class_num, int level);
 void roll_real_abils(struct char_data *ch);
@@ -96,20 +96,16 @@ int parse_class(char arg)
  * bitvectors (i.e., powers of two) for each class, mainly for use in
  * do_who and do_users.  Add new classes at the end so that all classes
  * use sequential powers of two (1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4,
- * 1 << 5, etc.
+ * 1 << 5, etc.) up to the limit of your bitvector_t, typically 0-31.
  */
-
-long find_class_bitvector(char arg)
+bitvector_t find_class_bitvector(const char *arg)
 {
-  arg = LOWER(arg);
+  size_t rpos, ret = 0;
 
-  switch (arg) {
-    case 'm': return (1 << CLASS_MAGIC_USER);
-    case 'c': return (1 << CLASS_CLERIC);
-    case 't': return (1 << CLASS_THIEF);
-    case 'w': return (1 << CLASS_WARRIOR);
-    default:  return 0;
-  }
+  for (rpos = 0; rpos < strlen(arg); rpos++)
+    ret |= (1 << parse_class(arg[rpos]));
+
+  return (ret);
 }
 
 
@@ -165,19 +161,19 @@ int prac_params[4][NUM_CLASSES] = {
  * "recycle" the existing mobs that are used in other guilds for your new
  * guild, then you don't have to change that file, only here.
  */
-int guild_info[][3] = {
+struct guild_info_type guild_info[] = {
 
 /* Midgaard */
-  {CLASS_MAGIC_USER,	3017,	SCMD_SOUTH},
-  {CLASS_CLERIC,	3004,	SCMD_NORTH},
-  {CLASS_THIEF,		3027,	SCMD_EAST},
-  {CLASS_WARRIOR,	3021,	SCMD_EAST},
+  { CLASS_MAGIC_USER,	3017,	SCMD_SOUTH	},
+  { CLASS_CLERIC,	3004,	SCMD_NORTH	},
+  { CLASS_THIEF,	3027,	SCMD_EAST	},
+  { CLASS_WARRIOR,	3021,	SCMD_EAST	},
 
 /* Brass Dragon */
-  {-999 /* all */ ,	5065,	SCMD_WEST},
+  { -999 /* all */ ,	5065,	SCMD_WEST	},
 
 /* this must go last -- add new guards above! */
-  {-1, -1, -1}
+  { -1, NOWHERE, -1}
 };
 
 
@@ -1410,7 +1406,7 @@ void roll_real_abils(struct char_data *c
   for (i = 0; i < 6; i++) {
 
     for (j = 0; j < 4; j++)
-      rolls[j] = number(1, 6);
+      rolls[j] = rand_number(1, 6);
 
     temp = rolls[0] + rolls[1] + rolls[2] + rolls[3] -
       MIN(rolls[0], MIN(rolls[1], MIN(rolls[2], rolls[3])));
@@ -1458,7 +1454,7 @@ void roll_real_abils(struct char_data *c
     ch->real_abils.intel = table[4];
     ch->real_abils.cha = table[5];
     if (ch->real_abils.str == 18)
-      ch->real_abils.str_add = number(0, 100);
+      ch->real_abils.str_add = rand_number(0, 100);
     break;
   }
   ch->aff_abils = ch->real_abils;
@@ -1473,7 +1469,10 @@ void do_start(struct char_data *ch)
 
   set_title(ch, NULL);
   roll_real_abils(ch);
-  ch->points.max_hit = 10;
+
+  GET_MAX_HIT(ch)  = 10;
+  GET_MAX_MANA(ch) = 100;
+  GET_MAX_MOVE(ch) = 82;
 
   switch (GET_CLASS(ch)) {
 
@@ -1497,8 +1496,7 @@ void do_start(struct char_data *ch)
   }
 
   advance_level(ch);
-  sprintf(buf, "%s advanced to level %d", GET_NAME(ch), GET_LEVEL(ch));
-  mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+  mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s advanced to level %d", GET_NAME(ch), GET_LEVEL(ch));
 
   GET_HIT(ch) = GET_MAX_HIT(ch);
   GET_MANA(ch) = GET_MAX_MANA(ch);
@@ -1508,9 +1506,6 @@ void do_start(struct char_data *ch)
   GET_COND(ch, FULL) = 24;
   GET_COND(ch, DRUNK) = 0;
 
-  ch->player.time.played = 0;
-  ch->player.time.logon = time(0);
-
   if (siteok_everyone)
     SET_BIT(PLR_FLAGS(ch), PLR_SITEOK);
 }
@@ -1530,29 +1525,29 @@ void advance_level(struct char_data *ch)
   switch (GET_CLASS(ch)) {
 
   case CLASS_MAGIC_USER:
-    add_hp += number(3, 8);
-    add_mana = number(GET_LEVEL(ch), 1.5 * GET_LEVEL(ch));
+    add_hp += rand_number(3, 8);
+    add_mana = rand_number(GET_LEVEL(ch), (int)(1.5 * GET_LEVEL(ch)));
     add_mana = MIN(add_mana, 10);
-    add_move = number(0, 2);
+    add_move = rand_number(0, 2);
     break;
 
   case CLASS_CLERIC:
-    add_hp += number(5, 10);
-    add_mana = number(GET_LEVEL(ch), 1.5 * GET_LEVEL(ch));
+    add_hp += rand_number(5, 10);
+    add_mana = rand_number(GET_LEVEL(ch), (int)(1.5 * GET_LEVEL(ch)));
     add_mana = MIN(add_mana, 10);
-    add_move = number(0, 2);
+    add_move = rand_number(0, 2);
     break;
 
   case CLASS_THIEF:
-    add_hp += number(7, 13);
+    add_hp += rand_number(7, 13);
     add_mana = 0;
-    add_move = number(1, 3);
+    add_move = rand_number(1, 3);
     break;
 
   case CLASS_WARRIOR:
-    add_hp += number(10, 15);
+    add_hp += rand_number(10, 15);
     add_mana = 0;
-    add_move = number(1, 3);
+    add_move = rand_number(1, 3);
     break;
   }
 
Index: src/comm.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/comm.c,v
retrieving revision 1.104
retrieving revision 1.114
diff -u -p -r1.104 -r1.114
--- src/comm.c	2002/01/13 21:46:14	1.104
+++ src/comm.c	2002/04/09 14:31:05	1.114
@@ -119,7 +119,6 @@ ssize_t perform_socket_read(socket_t des
 ssize_t perform_socket_write(socket_t desc, const char *txt,size_t length);
 void echo_off(struct descriptor_data *d);
 void echo_on(struct descriptor_data *d);
-void sanity_check(void);
 void circle_sleep(struct timeval *timeout);
 int get_from_q(struct txt_q *queue, char *dest, int *aliased);
 void init_game(ush_int port);
@@ -135,7 +134,6 @@ void timeadd(struct timeval *sum, struct
 void flush_queues(struct descriptor_data *d);
 void nonblock(socket_t s);
 int perform_subst(struct descriptor_data *t, char *orig, char *subst);
-int perform_alias(struct descriptor_data *d, char *orig);
 void record_usage(void);
 char *make_prompt(struct descriptor_data *point);
 void check_idle_passwords(void);
@@ -158,6 +156,7 @@ void perform_violence(void);
 void show_string(struct descriptor_data *d, char *input);
 int isbanned(char *hostname);
 void weather_and_time(int mode);
+int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen);
 void clear_free_list(void);
 void free_messages(void);
 void Board_clear_all(void);
@@ -203,9 +202,6 @@ void gettimeofday(struct timeval *t, str
 #endif	/* CIRCLE_WINDOWS || CIRCLE_MACINTOSH */
 
 
-#define plant_magic(x)	do { (x)[sizeof(x) - 1] = MAGIC_NUMBER; } while (0)
-#define test_magic(x)	((x)[sizeof(x) - 1])
-
 int main(int argc, char **argv)
 {
   ush_int port;
@@ -216,12 +212,6 @@ int main(int argc, char **argv)
   mtrace();	/* This must come before any use of malloc(). */
 #endif
 
-  /* Initialize these to check for overruns later. */
-  plant_magic(buf);
-  plant_magic(buf1);
-  plant_magic(buf2);
-  plant_magic(arg);
-
 #ifdef CIRCLE_MACINTOSH
   /*
    * ccommand() calls the command line/io redirection dialog box from
@@ -755,7 +745,7 @@ void game_loop(socket_t mother_desc)
       else {			/* else: we're playing normally. */
 	if (aliased)		/* To prevent recursive aliases. */
 	  d->has_prompt = 1;	/* To get newline before next cmd output. */
-	else if (perform_alias(d, comm))    /* Run it through aliasing system */
+	else if (perform_alias(d, comm, sizeof(comm)))    /* Run it through aliasing system */
 	  get_from_q(&d->input, comm, &aliased);
 	command_interpreter(d->character, comm); /* Send it to interpreter */
       }
@@ -813,12 +803,12 @@ void game_loop(socket_t mother_desc)
     /* Check for any signals we may have received. */
     if (reread_wizlist) {
       reread_wizlist = FALSE;
-      mudlog("Signal received - rereading wizlists.", CMP, LVL_IMMORT, TRUE);
+      mudlog(CMP, LVL_IMMORT, TRUE, "Signal received - rereading wizlists.");
       reboot_wizlists();
     }
     if (emergency_unban) {
       emergency_unban = FALSE;
-      mudlog("Received SIGUSR2 - completely unrestricting game (emergent)", BRF, LVL_IMMORT, TRUE);
+      mudlog(BRF, LVL_IMMORT, TRUE, "Received SIGUSR2 - completely unrestricting game (emergent)");
       ban_list = NULL;
       circle_restrict = 0;
       num_invalid = 0;
@@ -840,9 +830,6 @@ void heartbeat(int pulse)
 {
   static int mins_since_crashsave = 0;
 
-  if (!(pulse % PULSE_SANITY))
-    sanity_check();
-
   if (!(pulse % PULSE_ZONE))
     zone_update();
 
@@ -974,7 +961,7 @@ void echo_off(struct descriptor_data *d)
     (char) 0,
   };
 
-  SEND_TO_Q(off_string, d);
+  write_to_output(d, off_string);
 }
 
 
@@ -991,41 +978,56 @@ void echo_on(struct descriptor_data *d)
     (char) 0
   };
 
-  SEND_TO_Q(on_string, d);
+  write_to_output(d, on_string);
 }
 
 
 char *make_prompt(struct descriptor_data *d)
 {
-  static char prompt[MAX_PROMPT_LENGTH + 1];
+  static char prompt[MAX_PROMPT_LENGTH];
 
-  /* Note, prompt is truncated at MAX_PROMPT_LENGTH chars (structs.h )*/
+  /* Note, prompt is truncated at MAX_PROMPT_LENGTH chars (structs.h) */
 
   if (d->str)
-    strcpy(prompt, "] ");
+    strcpy(prompt, "] ");	/* strcpy: OK (for 'MAX_PROMPT_LENGTH >= 3') */
   else if (d->showstr_count) {
-    sprintf(prompt,
-	    "\r[ Return to continue, (q)uit, (r)efresh, (b)ack, or page number (%d/%d) ]",
+    snprintf(prompt, sizeof(prompt),
+	    "\r\n[ Return to continue, (q)uit, (r)efresh, (b)ack, or page number (%d/%d) ]",
 	    d->showstr_page, d->showstr_count);
   } else if (STATE(d) == CON_PLAYING && !IS_NPC(d->character)) {
-    int count = 0;
+    int count;
+    size_t len = 0;
+
     *prompt = '\0';
 
-    if (GET_INVIS_LEV(d->character))
-      count += sprintf(prompt + count, "i%d ", GET_INVIS_LEV(d->character));
+    if (GET_INVIS_LEV(d->character) && len < sizeof(prompt)) {
+      count = snprintf(prompt + len, sizeof(prompt) - len, "i%d ", GET_INVIS_LEV(d->character));
+      if (count >= 0)
+        len += count;
+    }
 
-    if (PRF_FLAGGED(d->character, PRF_DISPHP))
-      count += sprintf(prompt + count, "%dH ", GET_HIT(d->character));
+    if (PRF_FLAGGED(d->character, PRF_DISPHP) && len < sizeof(prompt)) {
+      count = snprintf(prompt + len, sizeof(prompt) - len, "%dH ", GET_HIT(d->character));
+      if (count >= 0)
+        len += count;
+    }
 
-    if (PRF_FLAGGED(d->character, PRF_DISPMANA))
-      count += sprintf(prompt + count, "%dM ", GET_MANA(d->character));
+    if (PRF_FLAGGED(d->character, PRF_DISPMANA) && len < sizeof(prompt)) {
+      count = snprintf(prompt + len, sizeof(prompt) - len, "%dM ", GET_MANA(d->character));
+      if (count >= 0)
+        len += count;
+    }
 
-    if (PRF_FLAGGED(d->character, PRF_DISPMOVE))
-      count += sprintf(prompt + count, "%dV ", GET_MOVE(d->character));
+    if (PRF_FLAGGED(d->character, PRF_DISPMOVE) && len < sizeof(prompt)) {
+      count = snprintf(prompt + len, sizeof(prompt) - len, "%dV ", GET_MOVE(d->character));
+      if (count >= 0)
+        len += count;
+    }
 
-    strcat(prompt, "> ");
+    if (len < sizeof(prompt))
+      strncat(prompt, "> ", sizeof(prompt) - len - 1);	/* strncat: OK */
   } else if (STATE(d) == CON_PLAYING && IS_NPC(d->character))
-    sprintf(prompt, "%s> ", GET_NAME(d->character));
+    snprintf(prompt, sizeof(prompt), "%s> ", GET_NAME(d->character));
   else
     *prompt = '\0';
 
@@ -1033,12 +1035,15 @@ char *make_prompt(struct descriptor_data
 }
 
 
+/*
+ * NOTE: 'txt' must be at most MAX_INPUT_LENGTH big.
+ */
 void write_to_q(const char *txt, struct txt_q *queue, int aliased)
 {
   struct txt_block *newt;
 
   CREATE(newt, struct txt_block, 1);
-  newt->text = str_dup(txt);
+  newt->text = strdup(txt);
   newt->aliased = aliased;
 
   /* queue empty? */
@@ -1053,7 +1058,9 @@ void write_to_q(const char *txt, struct 
 }
 
 
-
+/*
+ * NOTE: 'dest' must be at least MAX_INPUT_LENGTH big.
+ */
 int get_from_q(struct txt_q *queue, char *dest, int *aliased)
 {
   struct txt_block *tmp;
@@ -1062,11 +1069,11 @@ int get_from_q(struct txt_q *queue, char
   if (!queue->head)
     return (0);
 
-  tmp = queue->head;
-  strcpy(dest, queue->head->text);
+  strcpy(dest, queue->head->text);	/* strcpy: OK (mutual MAX_INPUT_LENGTH) */
   *aliased = queue->head->aliased;
-  queue->head = queue->head->next;
 
+  tmp = queue->head;
+  queue->head = queue->head->next;
   free(tmp->text);
   free(tmp);
 
@@ -1074,45 +1081,68 @@ int get_from_q(struct txt_q *queue, char
 }
 
 
-
 /* Empty the queues before closing connection */
 void flush_queues(struct descriptor_data *d)
 {
-  int dummy;
-
   if (d->large_outbuf) {
     d->large_outbuf->next = bufpool;
     bufpool = d->large_outbuf;
+  }
+  while (d->input.head) {
+    struct txt_block *tmp = d->input.head;
+    d->input.head = d->input.head->next;
+    free(tmp->text);
+    free(tmp);
   }
-  while (get_from_q(&d->input, buf2, &dummy));
+}
+
+
+/* Add a new string to a player's output queue. For outside use. */
+size_t write_to_output(struct descriptor_data *t, const char *txt, ...)
+{
+  va_list args;
+  size_t left;
+
+  va_start(args, txt);
+  left = vwrite_to_output(t, txt, args);
+  va_end(args);
+
+  return left;
 }
 
-/* Add a new string to a player's output queue */
-void write_to_output(const char *txt, struct descriptor_data *t)
+
+/* Add a new string to a player's output queue. */
+size_t vwrite_to_output(struct descriptor_data *t, const char *format, va_list args)
 {
+  static char txt[MAX_STRING_LENGTH];
+  size_t wantsize;
   int size;
 
   /* if we're in the overflow state already, ignore this new output */
   if (t->bufptr < 0)
-    return;
+    return (0);
 
-  size = strlen(txt);
+  wantsize = size = vsnprintf(txt, sizeof(txt), format, args);
+  if (size < 0 || wantsize >= sizeof(txt))
+    size = sizeof(txt) - 1;
 
   /* if we have enough space, just write to buffer and that's it! */
   if (t->bufspace >= size) {
-    strcpy(t->output + t->bufptr, txt);
+    strcpy(t->output + t->bufptr, txt);	/* strcpy: OK (size checked above) */
     t->bufspace -= size;
     t->bufptr += size;
-    return;
+    return (t->bufspace);
   }
+
   /*
    * If the text is too big to fit into even a large buffer, chuck the
-   * new text and switch to the overflow state.
+   * the new text, and switch to the overflow state.
    */
+  /* FIXME: This should write a partial string up to what fits! */
   if (size + t->bufptr > LARGE_BUFSIZE - 1) {
     t->bufptr = -1;
     buf_overflows++;
-    return;
+    return (0);
   }
   buf_switches++;
 
@@ -1126,15 +1156,17 @@ void write_to_output(const char *txt, st
     buf_largecount++;
   }
 
-  strcpy(t->large_outbuf->text, t->output);	/* copy to big buffer */
+  strcpy(t->large_outbuf->text, t->output);	/* strcpy: OK (size checked previously) */
   t->output = t->large_outbuf->text;	/* make big buffer primary */
-  strcat(t->output, txt);	/* now add new text */
+  strcat(t->output, txt);	/* strcat: OK (size checked) */
 
   /* set the pointer for the next write */
   t->bufptr = strlen(t->output);
 
   /* calculate how much space is left in the buffer */
   t->bufspace = LARGE_BUFSIZE - 1 - t->bufptr;
+
+  return (t->bufspace);
 }
 
 
@@ -1288,18 +1320,17 @@ int new_descriptor(socket_t s)
       perror("SYSERR: gethostbyaddr");
 
     /* find the numeric site address */
-    strncpy(newd->host, (char *)inet_ntoa(peer.sin_addr), HOST_LENGTH);
+    strncpy(newd->host, (char *)inet_ntoa(peer.sin_addr), HOST_LENGTH);	/* strncpy: OK (n->host:HOST_LENGTH+1) */
     *(newd->host + HOST_LENGTH) = '\0';
   } else {
-    strncpy(newd->host, from->h_name, HOST_LENGTH);
+    strncpy(newd->host, from->h_name, HOST_LENGTH);	/* strncpy: OK (n->host:HOST_LENGTH+1) */
     *(newd->host + HOST_LENGTH) = '\0';
   }
 
   /* determine if the site is banned */
   if (isbanned(newd->host) == BAN_ALL) {
     CLOSE_SOCKET(desc);
-    sprintf(buf2, "Connection attempt denied from [%s]", newd->host);
-    mudlog(buf2, CMP, LVL_GOD, TRUE);
+    mudlog(CMP, LVL_GOD, TRUE, "Connection attempt denied from [%s]", newd->host);
     free(newd);
     return (0);
   }
@@ -1309,8 +1340,7 @@ int new_descriptor(socket_t s)
    * Note that your immortals may wonder if they see a connection from
    * your site, but you are wizinvis upon login.
    */
-  sprintf(buf2, "New connection from [%s]", newd->host);
-  mudlog(buf2, CMP, LVL_GOD, FALSE);
+  mudlog(CMP, LVL_GOD, FALSE, "New connection from [%s]", newd->host);
 #endif
 
   /* initialize descriptor data */
@@ -1339,7 +1369,7 @@ int new_descriptor(socket_t s)
   newd->next = descriptor_list;
   descriptor_list = newd;
 
-  SEND_TO_Q(GREETINGS, newd);
+  write_to_output(newd, "%s", GREETINGS);
 
   return (0);
 }
@@ -1349,6 +1379,13 @@ int new_descriptor(socket_t s)
  * Send all of the output that we've accumulated for a player out to
  * the player's descriptor.
  * FIXME - This will be rewritten before 3.1, this code is dumb.
+ * FIXME: string nightmare
+ *
+ * 32 byte GARBAGE_SPACE in MAX_SOCK_BUF used for:
+ *	 2 bytes: prepended \r\n
+ *	14 bytes: overflow message
+ *	 2 bytes: extra \r\n for non-comapct
+ *      14 bytes: unused
  */
 int process_output(struct descriptor_data *t)
 {
@@ -1356,21 +1393,21 @@ int process_output(struct descriptor_dat
   int result;
 
   /* we may need this \r\n for later -- see below */
-  strcpy(i, "\r\n");
+  strcpy(i, "\r\n");	/* strcpy: OK (for 'MAX_SOCK_BUF >= 3') */
 
   /* now, append the 'real' output */
-  strcpy(i + 2, t->output);
+  strcpy(i + 2, t->output);	/* strcpy: OK (t->output:LARGE_BUFSIZE < i:MAX_SOCK_BUF-2) */
 
   /* if we're in the overflow state, notify the user */
   if (t->bufptr < 0)
-    strcat(i, "**OVERFLOW**\r\n");
+    strcat(i, "**OVERFLOW**\r\n");	/* strcpy: OK (i:MAX_SOCK_BUF reserves space) */
 
   /* add the extra CRLF if the person isn't in compact mode */
   if (STATE(t) == CON_PLAYING && t->character && !IS_NPC(t->character) && !PRF_FLAGGED(t->character, PRF_COMPACT))
-    strcat(i + 2, "\r\n");
+    strcat(i, "\r\n");	/* strcpy: OK (i:MAX_SOCK_BUF reserves space) */
 
   /* add a prompt */
-  strncat(i + 2, make_prompt(t), MAX_PROMPT_LENGTH);
+  strcat(i, make_prompt(t));	/* strcpy: OK (i:MAX_SOCK_BUF reserves space) */
 
   /*
    * now, send the output.  If this is an 'interruption', use the prepended
@@ -1382,11 +1419,9 @@ int process_output(struct descriptor_dat
     result = write_to_descriptor(t->descriptor, i + 2);
 
   /* handle snooping: prepend "% " and send to snooper */
-  if (t->snoop_by) {
-    SEND_TO_Q("% ", t->snoop_by);
-    SEND_TO_Q(t->output, t->snoop_by);
-    SEND_TO_Q("%%", t->snoop_by);
-  }
+  if (t->snoop_by)
+    write_to_output(t->snoop_by, "%% %s%%%%", t->output);
+
   /*
    * if we were using a large buffer, put the large buffer on the buffer pool
    * and switch back to the small one
@@ -1516,10 +1551,8 @@ ssize_t perform_socket_write(socket_t de
  */
 int write_to_descriptor(socket_t desc, const char *txt)
 {
-  size_t total;
   ssize_t bytes_written;
-
-  total = strlen(txt);
+  size_t total = strlen(txt);
 
   while (total > 0) {
     bytes_written = perform_socket_write(desc, txt, total);
@@ -1721,19 +1754,16 @@ int process_input(struct descriptor_data
     if ((space_left <= 0) && (ptr < nl_pos)) {
       char buffer[MAX_INPUT_LENGTH + 64];
 
-      sprintf(buffer, "Line too long.  Truncated to:\r\n%s\r\n", tmp);
+      snprintf(buffer, sizeof(buffer), "Line too long.  Truncated to:\r\n%s\r\n", tmp);
       if (write_to_descriptor(t->descriptor, buffer) < 0)
 	return (-1);
     }
-    if (t->snoop_by) {
-      SEND_TO_Q("% ", t->snoop_by);
-      SEND_TO_Q(tmp, t->snoop_by);
-      SEND_TO_Q("\r\n", t->snoop_by);
-    }
+    if (t->snoop_by)
+      write_to_output(t->snoop_by, "%% %s\r\n", tmp);
     failed_subst = 0;
 
     if (*tmp == '!' && !(*(tmp + 1)))	/* Redo last command. */
-      strcpy(tmp, t->last_input);
+      strcpy(tmp, t->last_input);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
     else if (*tmp == '!' && *(tmp + 1)) {
       char *commandln = (tmp + 1);
       int starting_pos = t->history_pos,
@@ -1742,9 +1772,9 @@ int process_input(struct descriptor_data
       skip_spaces(&commandln);
       for (; cnt != starting_pos; cnt--) {
 	if (t->history[cnt] && is_abbrev(commandln, t->history[cnt])) {
-	  strcpy(tmp, t->history[cnt]);
-	  strcpy(t->last_input, tmp);
-          SEND_TO_Q(tmp, t); SEND_TO_Q("\r\n", t);
+	  strcpy(tmp, t->history[cnt]);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
+	  strcpy(t->last_input, tmp);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
+          write_to_output(t, "%s\r\n", tmp);
 	  break;
 	}
         if (cnt == 0)	/* At top, loop to bottom. */
@@ -1752,12 +1782,12 @@ int process_input(struct descriptor_data
       }
     } else if (*tmp == '^') {
       if (!(failed_subst = perform_subst(t, t->last_input, tmp)))
-	strcpy(t->last_input, tmp);
+	strcpy(t->last_input, tmp);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
     } else {
-      strcpy(t->last_input, tmp);
+      strcpy(t->last_input, tmp);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
       if (t->history[t->history_pos])
 	free(t->history[t->history_pos]);	/* Clear the old line. */
-      t->history[t->history_pos] = str_dup(tmp);	/* Save the new. */
+      t->history[t->history_pos] = strdup(tmp);	/* Save the new. */
       if (++t->history_pos >= HISTORY_SIZE)	/* Wrap to top. */
 	t->history_pos = 0;
     }
@@ -1805,7 +1835,7 @@ int perform_subst(struct descriptor_data
 
   /* now find the second '^' */
   if (!(second = strchr(first, '^'))) {
-    SEND_TO_Q("Invalid substitution.\r\n", t);
+    write_to_output(t, "Invalid substitution.\r\n");
     return (1);
   }
   /* terminate "first" at the position of the '^' and make 'second' point
@@ -1814,26 +1844,26 @@ int perform_subst(struct descriptor_data
 
   /* now, see if the contents of the first string appear in the original */
   if (!(strpos = strstr(orig, first))) {
-    SEND_TO_Q("Invalid substitution.\r\n", t);
+    write_to_output(t, "Invalid substitution.\r\n");
     return (1);
   }
   /* now, we construct the new string for output. */
 
   /* first, everything in the original, up to the string to be replaced */
-  strncpy(newsub, orig, (strpos - orig));
-  newsub[(strpos - orig)] = '\0';
+  strncpy(newsub, orig, strpos - orig);	/* strncpy: OK (newsub:MAX_INPUT_LENGTH+5 > orig:MAX_INPUT_LENGTH) */
+  newsub[strpos - orig] = '\0';
 
   /* now, the replacement string */
-  strncat(newsub, second, (MAX_INPUT_LENGTH - strlen(newsub) - 1));
+  strncat(newsub, second, MAX_INPUT_LENGTH - strlen(newsub) - 1);	/* strncpy: OK */
 
   /* now, if there's anything left in the original after the string to
    * replaced, copy that too. */
   if (((strpos - orig) + strlen(first)) < strlen(orig))
-    strncat(newsub, strpos + strlen(first), (MAX_INPUT_LENGTH - strlen(newsub) - 1));
+    strncat(newsub, strpos + strlen(first), MAX_INPUT_LENGTH - strlen(newsub) - 1);	/* strncpy: OK */
 
   /* terminate the string in case of an overflow from strncat */
   newsub[MAX_INPUT_LENGTH - 1] = '\0';
-  strcpy(subst, newsub);
+  strcpy(subst, newsub);	/* strcpy: OK (by mutual MAX_INPUT_LENGTH) */
 
   return (0);
 }
@@ -1842,7 +1872,6 @@ int perform_subst(struct descriptor_data
 
 void close_socket(struct descriptor_data *d)
 {
-  char buf[128];
   struct descriptor_data *temp;
 
   REMOVE_FROM_LIST(d, descriptor_list, next);
@@ -1854,7 +1883,7 @@ void close_socket(struct descriptor_data
     d->snooping->snoop_by = NULL;
 
   if (d->snoop_by) {
-    SEND_TO_Q("Your victim is no longer among us.\r\n", d->snoop_by);
+    write_to_output(d->snoop_by, "Your victim is no longer among us.\r\n");
     d->snoop_by->snooping = NULL;
   }
 
@@ -1875,16 +1904,13 @@ void close_socket(struct descriptor_data
       /* We are guaranteed to have a person. */
       act("$n has lost $s link.", TRUE, link_challenged, 0, 0, TO_ROOM);
       save_char(link_challenged);
-      sprintf(buf, "Closing link to: %s.", GET_NAME(link_challenged));
-      mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(link_challenged)), TRUE);
+      mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(link_challenged)), TRUE, "Closing link to: %s.", GET_NAME(link_challenged));
     } else {
-      sprintf(buf, "Losing player: %s.",
-	      GET_NAME(d->character) ? GET_NAME(d->character) : "<null>");
-      mudlog(buf, CMP, LVL_IMMORT, TRUE);
+      mudlog(CMP, LVL_IMMORT, TRUE, "Losing player: %s.", GET_NAME(d->character) ? GET_NAME(d->character) : "<null>");
       free_char(d->character);
     }
   } else
-    mudlog("Losing descriptor without char.", CMP, LVL_IMMORT, TRUE);
+    mudlog(CMP, LVL_IMMORT, TRUE, "Losing descriptor without char.");
 
   /* JE 2/22/95 -- part of my unending quest to make switch stable */
   if (d->original && d->original->desc)
@@ -1922,7 +1948,7 @@ void check_idle_passwords(void)
       continue;
     } else {
       echo_on(d);
-      SEND_TO_Q("\r\nTimed out... goodbye.\r\n", d);
+      write_to_output(d, "\r\nTimed out... goodbye.\r\n");
       STATE(d) = CON_CLOSE;
     }
   }
@@ -2062,16 +2088,16 @@ RETSIGTYPE hupsig(int sig)
 #else
 sigfunc *my_signal(int signo, sigfunc *func)
 {
-  struct sigaction act, oact;
+  struct sigaction sact, oact;
 
-  act.sa_handler = func;
-  sigemptyset(&act.sa_mask);
-  act.sa_flags = 0;
+  sact.sa_handler = func;
+  sigemptyset(&sact.sa_mask);
+  sact.sa_flags = 0;
 #ifdef SA_INTERRUPT
-  act.sa_flags |= SA_INTERRUPT;	/* SunOS */
+  sact.sa_flags |= SA_INTERRUPT;	/* SunOS */
 #endif
 
-  if (sigaction(signo, &act, &oact) < 0)
+  if (sigaction(signo, &sact, &oact) < 0)
     return (SIG_ERR);
 
   return (oact.sa_handler);
@@ -2121,27 +2147,41 @@ void signal_setup(void)
 *       Public routines for system-to-player-communication        *
 **************************************************************** */
 
-void send_to_char(const char *messg, struct char_data *ch)
+size_t send_to_char(struct char_data *ch, const char *messg, ...)
 {
-  if (ch->desc && messg)
-    SEND_TO_Q(messg, ch->desc);
+  if (ch->desc && messg && *messg) {
+    size_t left;
+    va_list args;
+
+    va_start(args, messg);
+    left = vwrite_to_output(ch->desc, messg, args);
+    va_end(args);
+    return left;
+  }
+  return 0;
 }
 
 
-void send_to_all(const char *messg)
+void send_to_all(const char *messg, ...)
 {
   struct descriptor_data *i;
+  va_list args;
 
   if (messg == NULL)
     return;
+
+  for (i = descriptor_list; i; i = i->next) {
+    if (STATE(i) != CON_PLAYING)
+      continue;
 
-  for (i = descriptor_list; i; i = i->next)
-    if (STATE(i) == CON_PLAYING)
-      SEND_TO_Q(messg, i);
+    va_start(args, messg);
+    vwrite_to_output(i, messg, args);
+    va_end(args);
+  }
 }
 
 
-void send_to_outdoor(const char *messg)
+void send_to_outdoor(const char *messg, ...)
 {
   struct descriptor_data *i;
 
@@ -2149,26 +2189,37 @@ void send_to_outdoor(const char *messg)
     return;
 
   for (i = descriptor_list; i; i = i->next) {
+    va_list args;
+
     if (STATE(i) != CON_PLAYING || i->character == NULL)
       continue;
     if (!AWAKE(i->character) || !OUTSIDE(i->character))
       continue;
-    SEND_TO_Q(messg, i);
+
+    va_start(args, messg);
+    vwrite_to_output(i, messg, args);
+    va_end(args);
   }
 }
 
 
 
-void send_to_room(const char *messg, room_rnum room)
+void send_to_room(room_rnum room, const char *messg, ...)
 {
   struct char_data *i;
+  va_list args;
 
   if (messg == NULL)
     return;
+
+  for (i = world[room].people; i; i = i->next_in_room) {
+    if (!i->desc)
+      continue;
 
-  for (i = world[room].people; i; i = i->next_in_room)
-    if (i->desc)
-      SEND_TO_Q(messg, i->desc);
+    va_start(args, messg);
+    vwrite_to_output(i->desc, messg, args);
+    va_end(args);
+  }
 }
 
 
@@ -2283,7 +2334,7 @@ void perform_act(const char *orig, struc
   *(++buf) = '\n';
   *(++buf) = '\0';
 
-  SEND_TO_Q(CAP(lbuf), to->desc);
+  write_to_output(to->desc, "%s", CAP(lbuf));
 }
 
 
@@ -2347,48 +2398,6 @@ void act(const char *str, int hide_invis
   }
 }
 
-/*
- * This function is called every 30 seconds from heartbeat().  It checks
- * the four global buffers in CircleMUD to ensure that no one has written
- * past their bounds.  If our check digit is not there (and the position
- * doesn't have a NUL which may result from snprintf) then we gripe that
- * someone has overwritten our buffer.  This could cause a false positive
- * if someone uses the buffer as a non-terminated character array but that
- * is not likely. -gg
- */
-void sanity_check(void)
-{
-  int ok = TRUE;
-
-  /*
-   * If any line is false, 'ok' will become false also.
-   */
-  ok &= (test_magic(buf)  == MAGIC_NUMBER || test_magic(buf)  == '\0');
-  ok &= (test_magic(buf1) == MAGIC_NUMBER || test_magic(buf1) == '\0');
-  ok &= (test_magic(buf2) == MAGIC_NUMBER || test_magic(buf2) == '\0');
-  ok &= (test_magic(arg)  == MAGIC_NUMBER || test_magic(arg)  == '\0');
-
-  /*
-   * This isn't exactly the safest thing to do (referencing known bad memory)
-   * but we're doomed to crash eventually, might as well try to get something
-   * useful before we go down. -gg
-   * However, lets fix the problem so we don't spam the logs. -gg 11/24/98
-   */
-  if (!ok) {
-    log("SYSERR: *** Buffer overflow! ***\n"
-	"buf: %s\nbuf1: %s\nbuf2: %s\narg: %s", buf, buf1, buf2, arg);
-
-    plant_magic(buf);
-    plant_magic(buf1);
-    plant_magic(buf2);
-    plant_magic(arg);
-  }
-
-#if 0
-  log("Statistics: buf=%d buf1=%d buf2=%d arg=%d",
-	strlen(buf), strlen(buf1), strlen(buf2), strlen(arg));
-#endif
-}
 
 /* Prefer the file over the descriptor. */
 void setup_log(const char *filename, int fd)
Index: src/comm.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/comm.h,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- src/comm.h	2001/05/18 17:44:58	1.11
+++ src/comm.h	2002/02/21 01:28:00	1.13
@@ -11,10 +11,10 @@
 #define NUM_RESERVED_DESCS	8
 
 /* comm.c */
-void	send_to_all(const char *messg);
-void	send_to_char(const char *messg, struct char_data *ch);
-void	send_to_room(const char *messg, room_rnum room);
-void	send_to_outdoor(const char *messg);
+size_t	send_to_char(struct char_data *ch, const char *messg, ...) __attribute__ ((format (printf, 2, 3)));
+void	send_to_all(const char *messg, ...) __attribute__ ((format (printf, 1, 2)));
+void	send_to_room(room_rnum room, const char *messg, ...) __attribute__ ((format (printf, 2, 3)));
+void	send_to_outdoor(const char *messg, ...) __attribute__ ((format (printf, 1, 2)));
 void	perform_to_all(const char *messg, struct char_data *ch);
 void	close_socket(struct descriptor_data *d);
 
@@ -31,17 +31,16 @@ void	act(const char *str, int hide_invis
 #define TO_SLEEP	128	/* to char, even if sleeping */
 
 /* I/O functions */
-int	write_to_descriptor(socket_t desc, const char *txt);
 void	write_to_q(const char *txt, struct txt_q *queue, int aliased);
-void	write_to_output(const char *txt, struct descriptor_data *d);
+int	write_to_descriptor(socket_t desc, const char *txt);
+size_t	write_to_output(struct descriptor_data *d, const char *txt, ...) __attribute__ ((format (printf, 2, 3)));
+size_t	vwrite_to_output(struct descriptor_data *d, const char *format, va_list args);
 void	string_add(struct descriptor_data *d, char *str);
 void	string_write(struct descriptor_data *d, char **txt, size_t len, long mailto, void *data);
 
 #define PAGE_LENGTH	22
 #define PAGE_WIDTH	80
 void	page_string(struct descriptor_data *d, char *str, int keep_internal);
-
-#define SEND_TO_Q(messg, desc)  write_to_output((messg), desc)
 
 typedef RETSIGTYPE sigfunc(int);
 
Index: src/conf.h.in
===================================================================
RCS file: /home/circledb/.cvs/circle/src/conf.h.in,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -p -r1.9 -r1.14
--- src/conf.h.in	1999/08/02 00:25:37	1.9
+++ src/conf.h.in	2002/04/16 02:22:12	1.14
@@ -3,9 +3,15 @@
 /* Define to empty if the keyword does not work.  */
 #undef const
 
+/* Define if you don't have vprintf but do have _doprnt.  */
+#undef HAVE_DOPRNT
+
 /* Define if you have <sys/wait.h> that is POSIX.1 compatible.  */
 #undef HAVE_SYS_WAIT_H
 
+/* Define if you have the vprintf function.  */
+#undef HAVE_VPRINTF
+
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef pid_t
 
@@ -39,12 +45,48 @@
 /* Define to `int' if <sys/types.h> doesn't define.  */
 #undef ssize_t
 
+/* Define if you have the gettimeofday function.  */
+#undef HAVE_GETTIMEOFDAY
+
 /* Define if you have the inet_addr function.  */
 #undef HAVE_INET_ADDR
 
 /* Define if you have the inet_aton function.  */
 #undef HAVE_INET_ATON
 
+/* Define if you have the select function.  */
+#undef HAVE_SELECT
+
+/* Define if you have the snprintf function.  */
+#undef HAVE_SNPRINTF
+
+/* Define if you have the strcasecmp function.  */
+#undef HAVE_STRCASECMP
+
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
+
+/* Define if you have the strerror function.  */
+#undef HAVE_STRERROR
+
+/* Define if you have the stricmp function.  */
+#undef HAVE_STRICMP
+
+/* Define if you have the strlcpy function.  */
+#undef HAVE_STRLCPY
+
+/* Define if you have the strncasecmp function.  */
+#undef HAVE_STRNCASECMP
+
+/* Define if you have the strnicmp function.  */
+#undef HAVE_STRNICMP
+
+/* Define if you have the strstr function.  */
+#undef HAVE_STRSTR
+
+/* Define if you have the vsnprintf function.  */
+#undef HAVE_VSNPRINTF
+
 /* Define if you have the <arpa/inet.h> header file.  */
 #undef HAVE_ARPA_INET_H
 
@@ -66,6 +108,9 @@
 /* Define if you have the <limits.h> header file.  */
 #undef HAVE_LIMITS_H
 
+/* Define if you have the <mcheck.h> header file.  */
+#undef HAVE_MCHECK_H
+
 /* Define if you have the <memory.h> header file.  */
 #undef HAVE_MEMORY_H
 
@@ -116,3 +161,172 @@
 
 /* Define if you have the malloc library (-lmalloc).  */
 #undef HAVE_LIBMALLOC
+
+/* Check for a prototype to accept. */
+#undef NEED_ACCEPT_PROTO
+
+/* Check for a prototype to atoi. */
+#undef NEED_ATOI_PROTO
+
+/* Check for a prototype to atol. */
+#undef NEED_ATOL_PROTO
+
+/* Check for a prototype to bind. */
+#undef NEED_BIND_PROTO
+
+/* Check for a prototype to bzero. */
+#undef NEED_BZERO_PROTO
+
+/* Check for a prototype to chdir. */
+#undef NEED_CHDIR_PROTO
+
+/* Check for a prototype to close. */
+#undef NEED_CLOSE_PROTO
+
+/* Check for a prototype to crypt. */
+#undef NEED_CRYPT_PROTO
+
+/* Check for a prototype to fclose. */
+#undef NEED_FCLOSE_PROTO
+
+/* Check for a prototype to fcntl. */
+#undef NEED_FCNTL_PROTO
+
+/* Check for a prototype to fflush. */
+#undef NEED_FFLUSH_PROTO
+
+/* Check for a prototype to fprintf. */
+#undef NEED_FPRINTF_PROTO
+
+/* Check for a prototype to fputc. */
+#undef NEED_FPUTC_PROTO
+
+/* Check for a prototype to fputs. */
+#undef NEED_FPUTS_PROTO
+
+/* Check for a prototype to fread. */
+#undef NEED_FREAD_PROTO
+
+/* Check for a prototype to fscanf. */
+#undef NEED_FSCANF_PROTO
+
+/* Check for a prototype to fseek. */
+#undef NEED_FSEEK_PROTO
+
+/* Check for a prototype to fwrite. */
+#undef NEED_FWRITE_PROTO
+
+/* Check for a prototype to getpeername. */
+#undef NEED_GETPEERNAME_PROTO
+
+/* Check for a prototype to getpid. */
+#undef NEED_GETPID_PROTO
+
+/* Check for a prototype to getrlimit. */
+#undef NEED_GETRLIMIT_PROTO
+
+/* Check for a prototype to getsockname. */
+#undef NEED_GETSOCKNAME_PROTO
+
+/* Check for a prototype to gettimeofday. */
+#undef NEED_GETTIMEOFDAY_PROTO
+
+/* Check for a prototype to htonl. */
+#undef NEED_HTONL_PROTO
+
+/* Check for a prototype to htons. */
+#undef NEED_HTONS_PROTO
+
+/* Check for a prototype to inet_addr. */
+#undef NEED_INET_ADDR_PROTO
+
+/* Check for a prototype to inet_aton. */
+#undef NEED_INET_ATON_PROTO
+
+/* Check for a prototype to inet_ntoa. */
+#undef NEED_INET_NTOA_PROTO
+
+/* Check for a prototype to listen. */
+#undef NEED_LISTEN_PROTO
+
+/* Check for a prototype to ntohl. */
+#undef NEED_NTOHL_PROTO
+
+/* Check for a prototype to perror. */
+#undef NEED_PERROR_PROTO
+
+/* Check for a prototype to printf. */
+#undef NEED_PRINTF_PROTO
+
+/* Check for a prototype to qsort. */
+#undef NEED_QSORT_PROTO
+
+/* Check for a prototype to read. */
+#undef NEED_READ_PROTO
+
+/* Check for a prototype to remove. */
+#undef NEED_REMOVE_PROTO
+
+/* Check for a prototype to rewind. */
+#undef NEED_REWIND_PROTO
+
+/* Check for a prototype to select. */
+#undef NEED_SELECT_PROTO
+
+/* Check for a prototype to setitimer. */
+#undef NEED_SETITIMER_PROTO
+
+/* Check for a prototype to setrlimit. */
+#undef NEED_SETRLIMIT_PROTO
+
+/* Check for a prototype to setsockopt. */
+#undef NEED_SETSOCKOPT_PROTO
+
+/* Check for a prototype to snprintf. */
+#undef NEED_SNPRINTF_PROTO
+
+/* Check for a prototype to socket. */
+#undef NEED_SOCKET_PROTO
+
+/* Check for a prototype to sprintf. */
+#undef NEED_SPRINTF_PROTO
+
+/* Check for a prototype to sscanf. */
+#undef NEED_SSCANF_PROTO
+
+/* Check for a prototype to strcasecmp. */
+#undef NEED_STRCASECMP_PROTO
+
+/* Check for a prototype to strdup. */
+#undef NEED_STRDUP_PROTO
+
+/* Check for a prototype to strerror. */
+#undef NEED_STRERROR_PROTO
+
+/* Check for a prototype to stricmp. */
+#undef NEED_STRICMP_PROTO
+
+/* Check for a prototype to strlcpy. */
+#undef NEED_STRLCPY_PROTO
+
+/* Check for a prototype to strncasecmp. */
+#undef NEED_STRNCASECMP_PROTO
+
+/* Check for a prototype to strnicmp. */
+#undef NEED_STRNICMP_PROTO
+
+/* Check for a prototype to system. */
+#undef NEED_SYSTEM_PROTO
+
+/* Check for a prototype to time. */
+#undef NEED_TIME_PROTO
+
+/* Check for a prototype to unlink. */
+#undef NEED_UNLINK_PROTO
+
+/* Check for a prototype to vsnprintf. */
+#undef NEED_VSNPRINTF_PROTO
+
+/* Check for a prototype to write. */
+#undef NEED_WRITE_PROTO
+
Index: src/db.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/db.c,v
retrieving revision 1.88
retrieving revision 1.100
diff -u -p -r1.88 -r1.100
--- src/db.c	2002/01/15 23:53:48	1.88
+++ src/db.c	2002/04/09 14:12:15	1.100
@@ -50,7 +50,6 @@ struct message_list fight_messages[MAX_M
 struct player_index_element *player_table = NULL;	/* index to plr file	 */
 FILE *player_fl = NULL;		/* file desc of player file	 */
 int top_of_p_table = 0;		/* ref to top of table		 */
-int top_of_p_file = 0;		/* ref of size of p file	 */
 long top_idnum = 0;		/* highest idnum in use		 */
 
 int no_mail = 0;		/* mail disabled?		 */
@@ -122,7 +121,7 @@ void renum_world(void);
 void renum_zone_table(void);
 void log_zone_error(zone_rnum zone, int cmd_no, const char *message);
 void reset_time(void);
-long get_ptable_by_name(char *name);
+long get_ptable_by_name(const char *name);
 
 /* external functions */
 void paginate_string(char *str, struct descriptor_data *d);
@@ -138,7 +137,6 @@ void sort_spells(void);
 void load_banned(void);
 void Read_Invalid_List(void);
 void boot_the_shops(FILE *shop_f, char *filename, int rec_count);
-int find_name(const char *name);
 int hsort(const void *a, const void *b);
 void prune_crlf(char *txt);
 void destroy_shops(void);
@@ -150,11 +148,8 @@ extern room_vnum mortal_start_room;
 extern room_vnum immort_start_room;
 extern room_vnum frozen_start_room;
 extern struct descriptor_data *descriptor_list;
-extern struct spell_info_type spell_info[];
-extern const char *unused_spellname;
+extern const char *unused_spellname;	/* spell_parser.c */
 
-#define READ_SIZE 256
-
 /*************************************************************************
 *  routines for booting the system                                       *
 *************************************************************************/
@@ -192,6 +187,8 @@ void free_text_files(void)
  */
 ACMD(do_reboot)
 {
+  char arg[MAX_INPUT_LENGTH];
+
   one_argument(argument, arg);
 
   if (!str_cmp(arg, "all") || *arg == '*') {
@@ -238,11 +235,11 @@ ACMD(do_reboot)
       free_help();
     index_boot(DB_BOOT_HLP);
   } else {
-    send_to_char("Unknown reload option.\r\n", ch);
+    send_to_char(ch, "Unknown reload option.\r\n");
     return;
   }
 
-  send_to_char(OK, ch);
+  send_to_char(ch, "%s", OK);
 }
 
 
@@ -590,7 +587,7 @@ void build_player_index(void)
     CREATE(player_table, struct player_index_element, recs);
   } else {
     player_table = NULL;
-    top_of_p_file = top_of_p_table = -1;
+    top_of_p_table = -1;
     return;
   }
 
@@ -608,7 +605,7 @@ void build_player_index(void)
     top_idnum = MAX(top_idnum, dummy.char_specials_saved.idnum);
   }
 
-  top_of_p_file = top_of_p_table = nr;
+  top_of_p_table = nr;
 }
 
 /*
@@ -674,8 +671,9 @@ int count_hash_records(FILE *fl)
 void index_boot(int mode)
 {
   const char *index_filename, *prefix = NULL;	/* NULL or egcs 1.1 complains */
-  FILE *index, *db_file;
+  FILE *db_index, *db_file;
   int rec_count = 0, size[2];
+  char buf2[PATH_MAX], buf1[MAX_STRING_LENGTH];
 
   switch (mode) {
   case DB_BOOT_WLD:
@@ -705,22 +703,21 @@ void index_boot(int mode)
     index_filename = MINDEX_FILE;
   else
     index_filename = INDEX_FILE;
-
-  sprintf(buf2, "%s%s", prefix, index_filename);
 
-  if (!(index = fopen(buf2, "r"))) {
+  snprintf(buf2, sizeof(buf2), "%s%s", prefix, index_filename);
+  if (!(db_index = fopen(buf2, "r"))) {
     log("SYSERR: opening index file '%s': %s", buf2, strerror(errno));
     exit(1);
   }
 
   /* first, count the number of records in the file so we can malloc */
-  fscanf(index, "%s\n", buf1);
+  fscanf(db_index, "%s\n", buf1);
   while (*buf1 != '$') {
-    sprintf(buf2, "%s%s", prefix, buf1);
+    snprintf(buf2, sizeof(buf2), "%s%s", prefix, buf1);
     if (!(db_file = fopen(buf2, "r"))) {
       log("SYSERR: File '%s' listed in '%s/%s': %s", buf2, prefix,
 	  index_filename, strerror(errno));
-      fscanf(index, "%s\n", buf1);
+      fscanf(db_index, "%s\n", buf1);
       continue;
     } else {
       if (mode == DB_BOOT_ZON)
@@ -732,7 +729,7 @@ void index_boot(int mode)
     }
 
     fclose(db_file);
-    fscanf(index, "%s\n", buf1);
+    fscanf(db_index, "%s\n", buf1);
   }
 
   /* Exit if 0 records, unless this is shops */
@@ -779,10 +776,10 @@ void index_boot(int mode)
     break;
   }
 
-  rewind(index);
-  fscanf(index, "%s\n", buf1);
+  rewind(db_index);
+  fscanf(db_index, "%s\n", buf1);
   while (*buf1 != '$') {
-    sprintf(buf2, "%s%s", prefix, buf1);
+    snprintf(buf2, sizeof(buf2), "%s%s", prefix, buf1);
     if (!(db_file = fopen(buf2, "r"))) {
       log("SYSERR: %s: %s", buf2, strerror(errno));
       exit(1);
@@ -809,9 +806,9 @@ void index_boot(int mode)
     }
 
     fclose(db_file);
-    fscanf(index, "%s\n", buf1);
+    fscanf(db_index, "%s\n", buf1);
   }
-  fclose(index);
+  fclose(db_index);
 
   /* sort the help index */
   if (mode == DB_BOOT_HLP) {
@@ -865,7 +862,7 @@ void discrete_load(FILE *fl, int mode, c
 	  parse_mobile(fl, nr);
 	  break;
 	case DB_BOOT_OBJ:
-	  strcpy(line, parse_object(fl, nr));
+	  strlcpy(line, parse_object(fl, nr), sizeof(line));
 	  break;
 	}
     } else {
@@ -880,7 +877,7 @@ void discrete_load(FILE *fl, int mode, c
 bitvector_t asciiflag_conv(char *flag)
 {
   bitvector_t flags = 0;
-  int is_number = 1;
+  int is_num = TRUE;
   char *p;
 
   for (p = flag; *p; p++) {
@@ -890,10 +887,10 @@ bitvector_t asciiflag_conv(char *flag)
       flags |= 1 << (26 + (*p - 'A'));
 
     if (!isdigit(*p))
-      is_number = 0;
+      is_num = FALSE;
   }
 
-  if (is_number)
+  if (is_num)
     flags = atol(flag);
 
   return (flags);
@@ -905,10 +902,11 @@ void parse_room(FILE *fl, int virtual_nr
 {
   static int room_nr = 0, zone = 0;
   int t[10], i;
-  char line[READ_SIZE], flags[128];
+  char line[READ_SIZE], flags[128], buf2[MAX_STRING_LENGTH], buf[128];
   struct extra_descr_data *new_descr;
 
-  sprintf(buf2, "room #%d", virtual_nr);
+  /* This really had better fit or there are other problems. */
+  snprintf(buf2, sizeof(buf2), "room #%d", virtual_nr);
 
   if (virtual_nr < zone_table[zone].bot) {
     log("SYSERR: Room #%d is below zone %d.", virtual_nr, zone);
@@ -938,7 +936,7 @@ void parse_room(FILE *fl, int virtual_nr
   /* t[0] is the zone number; ignored with the zone-file system */
 
   world[room_nr].room_flags = asciiflag_conv(flags);
-  sprintf(flags, "object #%d", virtual_nr);
+  sprintf(flags, "object #%d", virtual_nr);	/* sprintf: OK (until 399-bit integers) */
   check_bitvector_names(world[room_nr].room_flags, room_bits_count, flags, "room");
 
   world[room_nr].sector_type = t[2];
@@ -953,7 +951,7 @@ void parse_room(FILE *fl, int virtual_nr
 
   world[room_nr].ex_description = NULL;
 
-  sprintf(buf,"SYSERR: Format error in room #%d (expecting D/E/S)",virtual_nr);
+  snprintf(buf, sizeof(buf), "SYSERR: Format error in room #%d (expecting D/E/S)", virtual_nr);
 
   for (;;) {
     if (!get_line(fl, line)) {
@@ -987,9 +985,9 @@ void parse_room(FILE *fl, int virtual_nr
 void setup_dir(FILE *fl, int room, int dir)
 {
   int t[5];
-  char line[READ_SIZE];
+  char line[READ_SIZE], buf2[128];
 
-  sprintf(buf2, "room #%d, direction D%d", GET_ROOM_VNUM(room), dir);
+  snprintf(buf2, sizeof(buf2), "room #%d, direction D%d", GET_ROOM_VNUM(room), dir);
 
   CREATE(world[room].dir_option[dir], struct room_direction_data, 1);
   world[room].dir_option[dir]->general_description = fread_string(fl, buf2);
@@ -1105,7 +1103,7 @@ void renum_zone_table(void)
       }
       if (a == NOWHERE || b == NOWHERE || c == NOWHERE) {
 	if (!mini_mud) {
-	  sprintf(buf,  "Invalid vnum %d, cmd disabled",
+	  snprintf(buf, sizeof(buf), "Invalid vnum %d, cmd disabled",
 			 a == NOWHERE ? olda : b == NOWHERE ? oldb : oldc);
 	  log_zone_error(zone, cmd_no, buf);
 	}
@@ -1320,7 +1318,7 @@ void parse_mobile(FILE *mob_f, int nr)
   static int i = 0;
   int j, t[10];
   char line[READ_SIZE], *tmpptr, letter;
-  char f1[128], f2[128];
+  char f1[128], f2[128], buf2[128];
 
   mob_index[i].vnum = nr;
   mob_index[i].number = 0;
@@ -1334,7 +1332,7 @@ void parse_mobile(FILE *mob_f, int nr)
    * structure is to save newbie coders from themselves. -gg 2/25/98
    */
   mob_proto[i].player_specials = &dummy_mob;
-  sprintf(buf2, "mob vnum %d", nr);
+  sprintf(buf2, "mob vnum %d", nr);	/* sprintf: OK (for 'buf2 >= 19') */
 
   /***** String data *****/
   mob_proto[i].player.name = fread_string(mob_f, buf2);
@@ -1416,7 +1414,7 @@ char *parse_object(FILE *obj_f, int nr)
   static char line[READ_SIZE];
   int t[10], j, retval;
   char *tmpptr;
-  char f1[READ_SIZE], f2[READ_SIZE];
+  char f1[READ_SIZE], f2[READ_SIZE], buf2[128];
   struct extra_descr_data *new_descr;
 
   obj_index[i].vnum = nr;
@@ -1426,7 +1424,7 @@ char *parse_object(FILE *obj_f, int nr)
   clear_object(obj_proto + i);
   obj_proto[i].item_number = i;
 
-  sprintf(buf2, "object #%d", nr);
+  sprintf(buf2, "object #%d", nr);	/* sprintf: OK (for 'buf2 >= 19') */
 
   /* *** string data *** */
   if ((obj_proto[i].name = fread_string(obj_f, buf2)) == NULL) {
@@ -1497,7 +1495,7 @@ char *parse_object(FILE *obj_f, int nr)
     obj_proto[i].affected[j].modifier = 0;
   }
 
-  strcat(buf2, ", after numeric constants\n"
+  strcat(buf2, ", after numeric constants\n"	/* strcat: OK (for 'buf2 >= 87') */
 	 "...expecting 'E', 'A', '$', or next object number");
   j = 0;
 
@@ -1555,9 +1553,9 @@ void load_zones(FILE *fl, char *zonename
 {
   static zone_rnum zone = 0;
   int cmd_no, num_of_cmds = 0, line_num = 0, tmp, error;
-  char *ptr, buf[READ_SIZE], zname[READ_SIZE];
+  char *ptr, buf[READ_SIZE], zname[READ_SIZE], buf2[MAX_STRING_LENGTH];
 
-  strcpy(zname, zonename);
+  strlcpy(zname, zonename, sizeof(zname));
 
   /* Skip first 3 lines lest we mistake the zone name for a command. */
   for (tmp = 0; tmp < 3; tmp++)
@@ -1585,12 +1583,12 @@ void load_zones(FILE *fl, char *zonename
     log("SYSERR: Format error in %s, line %d", zname, line_num);
     exit(1);
   }
-  sprintf(buf2, "beginning of zone #%d", Z.number);
+  snprintf(buf2, sizeof(buf2), "beginning of zone #%d", Z.number);
 
   line_num += get_line(fl, buf);
   if ((ptr = strchr(buf, '~')) != NULL)	/* take off the '~' if it's there */
     *ptr = '\0';
-  Z.name = str_dup(buf);
+  Z.name = strdup(buf);
 
   line_num += get_line(fl, buf);
   if (sscanf(buf, " %hd %hd %d %d ", &Z.bot, &Z.top, &Z.lifespan, &Z.reset_mode) != 4) {
@@ -1687,30 +1685,52 @@ void free_help(void)
 void load_help(FILE *fl)
 {
 #if defined(CIRCLE_MACINTOSH)
-  static char key[READ_SIZE+1], next_key[READ_SIZE+1], entry[32384]; /* ? */
+  static char key[READ_SIZE + 1], next_key[READ_SIZE + 1], entry[32384]; /* too big for stack? */
 #else
-  char key[READ_SIZE+1], next_key[READ_SIZE+1], entry[32384];
+  char key[READ_SIZE + 1], next_key[READ_SIZE + 1], entry[32384];
 #endif
-  char line[READ_SIZE+1], *scan;
+  size_t entrylen;
+  char line[READ_SIZE + 1], *scan;
   struct help_index_element el;
 
   /* get the first keyword line */
   get_one_line(fl, key);
   while (*key != '$') {
+    strcat(key, "\r\n");	/* strcat: OK (READ_SIZE - "\n" + "\r\n" == READ_SIZE + 1) */
+    entrylen = strlcpy(entry, key, sizeof(entry));
+
     /* read in the corresponding help entry */
-    strcpy(entry, strcat(key, "\r\n"));
     get_one_line(fl, line);
-    while (*line != '#') {
-      strcat(entry, strcat(line, "\r\n"));
+    while (*line != '#' && entrylen < sizeof(entry) - 1) {
+      entrylen += strlcpy(entry + entrylen, line, sizeof(entry) - entrylen);
+
+      if (entrylen + 2 < sizeof(entry) - 1) {
+        strcpy(entry + entrylen, "\r\n");	/* strcpy: OK (size checked above) */
+        entrylen += 2;
+      }
       get_one_line(fl, line);
     }
 
+    if (entrylen >= sizeof(entry) - 1) {
+      int keysize;
+      const char *truncmsg = "\r\n*TRUNCATED*\r\n";
+
+      strcpy(entry + sizeof(entry) - strlen(truncmsg) - 1, truncmsg);	/* strcpy: OK (assuming sane 'entry' size) */
+
+      keysize = strlen(key) - 2;
+      log("SYSERR: Help entry exceeded buffer space: %.*s", keysize, key);
+
+      /* If we ran out of buffer space, eat the rest of the entry. */
+      while (*line != '#')
+        get_one_line(fl, line);
+    }
+
     /* now, add the entry to the index with each keyword on the keyword line */
     el.duplicate = 0;
-    el.entry = str_dup(entry);
+    el.entry = strdup(entry);
     scan = one_word(key, next_key);
     while (*next_key) {
-      el.keyword = str_dup(next_key);
+      el.keyword = strdup(next_key);
       help_table[top_of_helpt++] = el;
       el.duplicate++;
       scan = one_word(scan, next_key);
@@ -1742,14 +1762,9 @@ int vnum_mobile(char *searchname, struct
 {
   int nr, found = 0;
 
-  for (nr = 0; nr <= top_of_mobt; nr++) {
-    if (isname(searchname, mob_proto[nr].player.name)) {
-      sprintf(buf, "%3d. [%5d] %s\r\n", ++found,
-	      mob_index[nr].vnum,
-	      mob_proto[nr].player.short_descr);
-      send_to_char(buf, ch);
-    }
-  }
+  for (nr = 0; nr <= top_of_mobt; nr++)
+    if (isname(searchname, mob_proto[nr].player.name))
+      send_to_char(ch, "%3d. [%5d] %s\r\n", ++found, mob_index[nr].vnum, mob_proto[nr].player.short_descr);
 
   return (found);
 }
@@ -1760,14 +1775,10 @@ int vnum_object(char *searchname, struct
 {
   int nr, found = 0;
 
-  for (nr = 0; nr <= top_of_objt; nr++) {
-    if (isname(searchname, obj_proto[nr].name)) {
-      sprintf(buf, "%3d. [%5d] %s\r\n", ++found,
-	      obj_index[nr].vnum,
-	      obj_proto[nr].short_description);
-      send_to_char(buf, ch);
-    }
-  }
+  for (nr = 0; nr <= top_of_objt; nr++)
+    if (isname(searchname, obj_proto[nr].name))
+      send_to_char(ch, "%3d. [%5d] %s\r\n", ++found, obj_index[nr].vnum, obj_proto[nr].short_description);
+
   return (found);
 }
 
@@ -1810,7 +1821,7 @@ struct char_data *read_mobile(mob_vnum n
     mob->points.max_hit = dice(mob->points.hit, mob->points.mana) +
       mob->points.move;
   } else
-    mob->points.max_hit = number(mob->points.hit, mob->points.mana);
+    mob->points.max_hit = rand_number(mob->points.hit, mob->points.mana);
 
   mob->points.hit = mob->points.max_hit;
   mob->points.mana = mob->points.max_mana;
@@ -1872,7 +1883,6 @@ void zone_update(void)
   int i;
   struct reset_q_element *update_u, *temp;
   static int timer = 0;
-  char buf[128];
 
   /* jelson 10/22/92 */
   if (((++timer * PULSE_ZONE) / PASSES_PER_SEC) >= 60) {
@@ -1918,9 +1928,7 @@ void zone_update(void)
     if (zone_table[update_u->zone_to_reset].reset_mode == 2 ||
 	is_empty(update_u->zone_to_reset)) {
       reset_zone(update_u->zone_to_reset);
-      sprintf(buf, "Auto zone reset: %s",
-	      zone_table[update_u->zone_to_reset].name);
-      mudlog(buf, CMP, LVL_GOD, FALSE);
+      mudlog(CMP, LVL_GOD, FALSE, "Auto zone reset: %s", zone_table[update_u->zone_to_reset].name);
       /* dequeue */
       if (update_u == reset_q.head)
 	reset_q.head = reset_q.head->next;
@@ -1941,14 +1949,9 @@ void zone_update(void)
 
 void log_zone_error(zone_rnum zone, int cmd_no, const char *message)
 {
-  char buf[256];
-
-  sprintf(buf, "SYSERR: zone file: %s", message);
-  mudlog(buf, NRM, LVL_GOD, TRUE);
-
-  sprintf(buf, "SYSERR: ...offending cmd: '%c' cmd in zone #%d, line %d",
-	  ZCMD.command, zone_table[zone].number, ZCMD.line);
-  mudlog(buf, NRM, LVL_GOD, TRUE);
+  mudlog(NRM, LVL_GOD, TRUE, "SYSERR: zone file: %s", message);
+  mudlog(NRM, LVL_GOD, TRUE, "SYSERR: ...offending cmd: '%c' cmd in zone #%d, line %d",
+	ZCMD.command, zone_table[zone].number, ZCMD.line);
 }
 
 #define ZONE_ERROR(message) \
@@ -2124,26 +2127,24 @@ int is_empty(zone_rnum zone_nr)
 *************************************************************************/
 
 
-long get_ptable_by_name(char *name)
+long get_ptable_by_name(const char *name)
 {
   int i;
 
-  one_argument(name, arg);
   for (i = 0; i <= top_of_p_table; i++)
-    if (!strcmp(player_table[i].name, arg))
+    if (!str_cmp(player_table[i].name, name))
       return (i);
 
   return (-1);
 }
 
 
-long get_id_by_name(char *name)
+long get_id_by_name(const char *name)
 {
   int i;
 
-  one_argument(name, arg);
   for (i = 0; i <= top_of_p_table; i++)
-    if (!strcmp(player_table[i].name, arg))
+    if (!str_cmp(player_table[i].name, name))
       return (player_table[i].id);
 
   return (-1);
@@ -2167,7 +2168,7 @@ int load_char(const char *name, struct c
 {
   int player_i;
 
-  if ((player_i = find_name(name)) >= 0) {
+  if ((player_i = get_ptable_by_name(name)) >= 0) {
     fseek(player_fl, player_i * sizeof(struct char_file_u), SEEK_SET);
     fread(char_element, sizeof(struct char_file_u), 1, player_fl);
     return (player_i);
@@ -2194,7 +2195,7 @@ void save_char(struct char_data *ch)
 
   char_to_store(ch, &st);
 
-  strncpy(st.host, ch->desc->host, HOST_LENGTH);
+  strncpy(st.host, ch->desc->host, HOST_LENGTH);	/* strncpy: OK (s.host:HOST_LENGTH+1) */
   st.host[HOST_LENGTH] = '\0';
 
   fseek(player_fl, GET_PFILEPOS(ch) * sizeof(struct char_file_u), SEEK_SET);
@@ -2218,8 +2219,8 @@ void store_to_char(struct char_file_u *s
 
   ch->player.short_descr = NULL;
   ch->player.long_descr = NULL;
-  ch->player.title = str_dup(st->title);
-  ch->player.description = str_dup(st->description);
+  ch->player.title = strdup(st->title);
+  ch->player.description = strdup(st->description);
 
   ch->player.hometown = st->hometown;
   ch->player.time.birth = st->birth;
@@ -2247,10 +2248,10 @@ void store_to_char(struct char_file_u *s
   ch->points.hitroll = 0;
   ch->points.damroll = 0;
 
-  if (ch->player.name == NULL)
-    CREATE(ch->player.name, char, strlen(st->name) + 1);
-  strcpy(ch->player.name, st->name);
-  strcpy(ch->player.passwd, st->pwd);
+  if (ch->player.name)
+    free(ch->player.name);
+  ch->player.name = strdup(st->name);
+  strlcpy(ch->player.passwd, st->pwd, sizeof(ch->player.passwd));
 
   /* Add all spell effects */
   for (i = 0; i < MAX_AFFECT; i++) {
@@ -2343,24 +2344,24 @@ void char_to_store(struct char_data *ch,
   st->points.damroll = 0;
 
   if (GET_TITLE(ch))
-    strcpy(st->title, GET_TITLE(ch));
+    strlcpy(st->title, GET_TITLE(ch), MAX_TITLE_LENGTH);
   else
     *st->title = '\0';
 
   if (ch->player.description) {
-    if (strlen(ch->player.description) >= EXDSCR_LENGTH) {
+    if (strlen(ch->player.description) >= sizeof(st->description)) {
       log("SYSERR: char_to_store: %s's description length: %d, max: %d! "
          "Truncated.", GET_PC_NAME(ch), strlen(ch->player.description),
-         EXDSCR_LENGTH);
-      ch->player.description[EXDSCR_LENGTH - 3] = '\0';
-      strcat(ch->player.description, "\r\n");
+         sizeof(st->description));
+      ch->player.description[sizeof(st->description) - 3] = '\0';
+      strcat(ch->player.description, "\r\n");	/* strcat: OK (previous line makes room) */
     }
-    strcpy(st->description, ch->player.description);
+    strcpy(st->description, ch->player.description);	/* strcpy: OK (checked above) */
   } else
     *st->description = '\0';
 
-  strcpy(st->name, GET_NAME(ch));
-  strcpy(st->pwd, GET_PASSWD(ch));
+  strcpy(st->name, GET_NAME(ch));	/* strcpy: OK (that's what GET_NAME came from) */
+  strcpy(st->pwd, GET_PASSWD(ch));	/* strcpy: OK (that's what GET_PASSWD came from) */
 
   /* add spell and eq affections back in now */
   for (i = 0; i < MAX_AFFECT; i++) {
@@ -2421,7 +2422,7 @@ int create_entry(char *name)
 /* read and allocate space for a '~'-terminated string from a given file */
 char *fread_string(FILE *fl, const char *error)
 {
-  char buf[MAX_STRING_LENGTH], tmp[512], *rslt;
+  char buf[MAX_STRING_LENGTH], tmp[512];
   char *point;
   int done = 0, length = 0, templength;
 
@@ -2450,19 +2451,13 @@ char *fread_string(FILE *fl, const char 
       log("%s", error);
       exit(1);
     } else {
-      strcat(buf + length, tmp);
+      strcat(buf + length, tmp);	/* strcat: OK (size checked above) */
       length += templength;
     }
   } while (!done);
 
   /* allocate space for the new string and copy it */
-  if (strlen(buf) > 0) {
-    CREATE(rslt, char, length + 1);
-    strcpy(rslt, buf);
-  } else
-    rslt = NULL;
-
-  return (rslt);
+  return (strlen(buf) ? strdup(buf) : NULL);
 }
 
 
@@ -2564,7 +2559,7 @@ void free_obj(struct obj_data *obj)
  *
  * We don't want to free() the string that someone may be
  * viewing in the pager.  page_string() keeps the internal
- * str_dup()'d copy on ->showstr_head and it won't care
+ * strdup()'d copy on ->showstr_head and it won't care
  * if we delete the original.  Otherwise, strings are kept
  * on ->showstr_vector but we'll only match if the pointer
  * is to the string we're interested in and not a copy.
@@ -2575,10 +2570,14 @@ void free_obj(struct obj_data *obj)
  */
 int file_to_string_alloc(const char *name, char **buf)
 {
+  int temppage;
   char temp[MAX_STRING_LENGTH];
   struct descriptor_data *in_use;
-  int temppage;
 
+  for (in_use = descriptor_list; in_use; in_use = in_use->next)
+    if (in_use->showstr_vector && *in_use->showstr_vector == *buf)
+      return (-1);
+
   /* Lets not free() what used to be there unless we succeeded. */
   if (file_to_string(name, temp) < 0)
     return (-1);
@@ -2589,14 +2588,14 @@ int file_to_string_alloc(const char *nam
 
     /* Let's be nice and leave them at the page they were on. */
     temppage = in_use->showstr_page;
-    paginate_string((in_use->showstr_head = str_dup(*in_use->showstr_vector)), in_use);
+    paginate_string((in_use->showstr_head = strdup(*in_use->showstr_vector)), in_use);
     in_use->showstr_page = temppage;
   }
 
   if (*buf)
     free(*buf);
 
-  *buf = str_dup(temp);
+  *buf = strdup(temp);
   return (0);
 }
 
@@ -2620,7 +2619,7 @@ int file_to_string(const char *name, cha
       break;
     if ((len = strlen(tmp)) > 0)
       tmp[len - 1] = '\0'; /* take off the trailing \n */
-    strcat(tmp, "\r\n");
+    strcat(tmp, "\r\n");	/* strcat: OK (tmp:READ_SIZE+3) */
 
     if (strlen(buf) + strlen(tmp) + 1 > MAX_STRING_LENGTH) {
       log("SYSERR: %s: string too big (%d max)", name, MAX_STRING_LENGTH);
@@ -2628,7 +2627,7 @@ int file_to_string(const char *name, cha
       fclose(fl);
       return (-1);
     }
-    strcat(buf, tmp);
+    strcat(buf, tmp);	/* strcat: OK (size checked above) */
   }
 
   fclose(fl);
@@ -2701,7 +2700,10 @@ void clear_object(struct obj_data *obj)
 
 
 
-/* initialize a new character only if class is set */
+/*
+ * Called during character creation after picking character class
+ * (and then never again for that character).
+ */
 void init_char(struct char_data *ch)
 {
   int i;
@@ -2711,45 +2713,50 @@ void init_char(struct char_data *ch)
     CREATE(ch->player_specials, struct player_special_data, 1);
 
   /* *** if this is our first player --- he be God *** */
-
   if (top_of_p_table == 0) {
-    GET_EXP(ch) = 7000000;
     GET_LEVEL(ch) = LVL_IMPL;
+    GET_EXP(ch) = 7000000;
 
-    ch->points.max_hit = 500;
-    ch->points.max_mana = 100;
-    ch->points.max_move = 82;
+    /* The implementor never goes through do_start(). */
+    GET_MAX_HIT(ch) = 500;
+    GET_MAX_MANA(ch) = 100;
+    GET_MAX_MOVE(ch) = 82;
+    GET_HIT(ch) = GET_MAX_HIT(ch);
+    GET_MANA(ch) = GET_MAX_MANA(ch);
+    GET_MOVE(ch) = GET_MAX_MOVE(ch);
   }
+
   set_title(ch, NULL);
   ch->player.short_descr = NULL;
   ch->player.long_descr = NULL;
   ch->player.description = NULL;
 
-  ch->player.hometown = 1;
-
   ch->player.time.birth = time(0);
-  ch->player.time.played = 0;
   ch->player.time.logon = time(0);
+  ch->player.time.played = 0;
 
+  GET_HOME(ch) = 1;
+  GET_AC(ch) = 100;
+
   for (i = 0; i < MAX_TONGUE; i++)
     GET_TALK(ch, i) = 0;
 
-  /* make favors for sex */
-  if (ch->player.sex == SEX_MALE) {
-    ch->player.weight = number(120, 180);
-    ch->player.height = number(160, 200);
+  /*
+   * make favors for sex -- or in English, we bias the height and weight of the
+   * character depending on what gender they've chosen for themselves. While it
+   * is possible to have a tall, heavy female it's not as likely as a male.
+   *
+   * Height is in centimeters. Weight is in pounds.  The only place they're
+   * ever printed (in stock code) is SPELL_IDENTIFY.
+   */
+  if (GET_SEX(ch) == SEX_MALE) {
+    GET_WEIGHT(ch) = rand_number(120, 180);
+    GET_HEIGHT(ch) = rand_number(160, 200); /* 5'4" - 6'8" */
   } else {
-    ch->player.weight = number(100, 160);
-    ch->player.height = number(150, 180);
+    GET_WEIGHT(ch) = rand_number(100, 160);
+    GET_HEIGHT(ch) = rand_number(150, 180); /* 5'0" - 6'0" */
   }
 
-  ch->points.max_mana = 100;
-  ch->points.mana = GET_MAX_MANA(ch);
-  ch->points.hit = GET_MAX_HIT(ch);
-  ch->points.max_move = 82;
-  ch->points.move = GET_MAX_MOVE(ch);
-  ch->points.armor = 100;
-
   if ((i = get_ptable_by_name(GET_NAME(ch))) != -1)
     player_table[i].id = GET_IDNUM(ch) = ++top_idnum;
   else
@@ -2762,7 +2769,7 @@ void init_char(struct char_data *ch)
       SET_SKILL(ch, i, 100);
   }
 
-  ch->char_specials.saved.affected_by = 0;
+  AFF_FLAGS(ch) = 0;
 
   for (i = 0; i < 5; i++)
     GET_SAVE(ch, i) = 0;
@@ -2898,7 +2905,7 @@ int check_object(struct obj_data *obj)
     log("SYSERR: Object #%d (%s) has negative cost/day (%d).",
 	GET_OBJ_VNUM(obj), obj->short_description, GET_OBJ_RENT(obj));
 
-  sprintf(objname, "Object #%d (%s)", GET_OBJ_VNUM(obj), obj->short_description);
+  snprintf(objname, sizeof(objname), "Object #%d (%s)", GET_OBJ_VNUM(obj), obj->short_description);
   error |= check_bitvector_names(GET_OBJ_WEAR(obj), wear_bits_count, objname, "object wear");
   error |= check_bitvector_names(GET_OBJ_EXTRA(obj), extra_bits_count, objname, "object extra");
   error |= check_bitvector_names(GET_OBJ_AFFECT(obj), affected_bits_count, objname, "object affect");
@@ -2908,7 +2915,7 @@ int check_object(struct obj_data *obj)
   {
     char onealias[MAX_INPUT_LENGTH], *space = strrchr(obj->name, ' ');
 
-    strcpy(onealias, space ? space + 1 : obj->name);
+    strlcpy(onealias, space ? space + 1 : obj->name, sizeof(onealias));
     if (search_block(onealias, drinknames, TRUE) < 0 && (error = TRUE))
       log("SYSERR: Object #%d (%s) doesn't have drink type as last alias. (%s)",
 		GET_OBJ_VNUM(obj), obj->short_description, obj->name);
Index: src/db.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/db.h,v
retrieving revision 1.23
retrieving revision 1.25
diff -u -p -r1.23 -r1.25
--- src/db.h	2002/01/13 21:46:14	1.23
+++ src/db.h	2002/02/01 00:26:51	1.25
@@ -102,7 +102,7 @@ void	destroy_db(void);
 int	create_entry(char *name);
 void	zone_update(void);
 char	*fread_string(FILE *fl, const char *error);
-long	get_id_by_name(char *name);
+long	get_id_by_name(const char *name);
 char	*get_name_by_id(long id);
 void	save_mud_time(struct time_info_data *when);
 void	free_extra_descriptions(struct extra_descr_data *edesc);
@@ -229,12 +229,7 @@ struct ban_list_element {
 
 /* global buffering system */
 
-#ifdef __DB_C__
-char	buf[MAX_STRING_LENGTH];
-char	buf1[MAX_STRING_LENGTH];
-char	buf2[MAX_STRING_LENGTH];
-char	arg[MAX_STRING_LENGTH];
-#else
+#ifndef __DB_C__
 extern struct room_data *world;
 extern room_rnum top_of_world;
 
@@ -253,11 +248,6 @@ extern struct index_data *obj_index;
 extern struct obj_data *object_list;
 extern struct obj_data *obj_proto;
 extern obj_rnum top_of_objt;
-
-extern char	buf[MAX_STRING_LENGTH];
-extern char	buf1[MAX_STRING_LENGTH];
-extern char	buf2[MAX_STRING_LENGTH];
-extern char	arg[MAX_STRING_LENGTH];
 #endif
 
 #ifndef __CONFIG_C__
Index: src/fight.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/fight.c,v
retrieving revision 1.27
retrieving revision 1.35
diff -u -p -r1.27 -r1.35
--- src/fight.c	2002/01/10 17:24:47	1.27
+++ src/fight.c	2002/03/03 05:25:25	1.35
@@ -214,18 +214,15 @@ void update_pos(struct char_data *victim
 
 void check_killer(struct char_data *ch, struct char_data *vict)
 {
-  char buf[256];
-
   if (PLR_FLAGGED(vict, PLR_KILLER) || PLR_FLAGGED(vict, PLR_THIEF))
     return;
   if (PLR_FLAGGED(ch, PLR_KILLER) || IS_NPC(ch) || IS_NPC(vict) || ch == vict)
     return;
 
   SET_BIT(PLR_FLAGS(ch), PLR_KILLER);
-  sprintf(buf, "PC Killer bit set on %s for initiating attack on %s at %s.",
+  send_to_char(ch, "If you want to be a PLAYER KILLER, so be it...\r\n");
+  mudlog(BRF, LVL_IMMORT, TRUE, "PC Killer bit set on %s for initiating attack on %s at %s.",
 	    GET_NAME(ch), GET_NAME(vict), world[IN_ROOM(vict)].name);
-  mudlog(buf, BRF, LVL_IMMORT, TRUE);
-  send_to_char("If you want to be a PLAYER KILLER, so be it...\r\n", ch);
 }
 
 
@@ -274,6 +271,7 @@ void stop_fighting(struct char_data *ch)
 
 void make_corpse(struct char_data *ch)
 {
+  char buf2[MAX_NAME_LENGTH + 64];
   struct obj_data *corpse, *o;
   struct obj_data *money;
   int i;
@@ -282,13 +280,13 @@ void make_corpse(struct char_data *ch)
 
   corpse->item_number = NOTHING;
   IN_ROOM(corpse) = NOWHERE;
-  corpse->name = str_dup("corpse");
+  corpse->name = strdup("corpse");
 
-  sprintf(buf2, "The corpse of %s is lying here.", GET_NAME(ch));
-  corpse->description = str_dup(buf2);
+  snprintf(buf2, sizeof(buf2), "The corpse of %s is lying here.", GET_NAME(ch));
+  corpse->description = strdup(buf2);
 
-  sprintf(buf2, "the corpse of %s", GET_NAME(ch));
-  corpse->short_description = str_dup(buf2);
+  snprintf(buf2, sizeof(buf2), "the corpse of %s", GET_NAME(ch));
+  corpse->short_description = strdup(buf2);
 
   GET_OBJ_TYPE(corpse) = ITEM_CONTAINER;
   GET_OBJ_WEAR(corpse) = ITEM_WEAR_TAKE;
@@ -315,8 +313,14 @@ void make_corpse(struct char_data *ch)
 
   /* transfer gold */
   if (GET_GOLD(ch) > 0) {
-    /* following 'if' clause added to fix gold duplication loophole */
-    if (IS_NPC(ch) || (!IS_NPC(ch) && ch->desc)) {
+    /*
+     * following 'if' clause added to fix gold duplication loophole
+     * The above line apparently refers to the old "partially log in,
+     * kill the game character, then finish login sequence" duping
+     * bug. The duplication has been fixed (knock on wood) but the
+     * test below shall live on, for a while. -gg 3/3/2002
+     */
+    if (IS_NPC(ch) || ch->desc) {
       money = create_money(GET_GOLD(ch));
       obj_to_obj(money, corpse);
     }
@@ -350,8 +354,7 @@ void death_cry(struct char_data *ch)
 
   for (door = 0; door < NUM_OF_DIRS; door++)
     if (CAN_GO(ch, door))
-      send_to_room("Your blood freezes as you hear someone's death cry.\r\n",
-		world[IN_ROOM(ch)].dir_option[door]->to_room);
+      send_to_room(world[IN_ROOM(ch)].dir_option[door]->to_room, "Your blood freezes as you hear someone's death cry.\r\n");
 }
 
 
@@ -389,11 +392,10 @@ void perform_group_gain(struct char_data
 
   share = MIN(max_exp_gain, MAX(1, base));
 
-  if (share > 1) {
-    sprintf(buf2, "You receive your share of experience -- %d points.\r\n", share);
-    send_to_char(buf2, ch);
-  } else
-    send_to_char("You receive your share of experience -- one measly little point!\r\n", ch);
+  if (share > 1)
+    send_to_char(ch, "You receive your share of experience -- %d points.\r\n", share);
+  else
+    send_to_char(ch, "You receive your share of experience -- one measly little point!\r\n");
 
   gain_exp(ch, share);
   change_alignment(ch, victim);
@@ -453,11 +455,10 @@ void solo_gain(struct char_data *ch, str
 
   exp = MAX(exp, 1);
 
-  if (exp > 1) {
-    sprintf(buf2, "You receive %d experience points.\r\n", exp);
-    send_to_char(buf2, ch);
-  } else
-    send_to_char("You receive one lousy experience point.\r\n", ch);
+  if (exp > 1)
+    send_to_char(ch, "You receive %d experience points.\r\n", exp);
+  else
+    send_to_char(ch, "You receive one lousy experience point.\r\n");
 
   gain_exp(ch, exp);
   change_alignment(ch, victim);
@@ -581,18 +582,18 @@ void dam_message(int dam, struct char_da
   act(buf, FALSE, ch, NULL, victim, TO_NOTVICT);
 
   /* damage message to damager */
-  send_to_char(CCYEL(ch, C_CMP), ch);
+  send_to_char(ch, CCYEL(ch, C_CMP));
   buf = replace_string(dam_weapons[msgnum].to_char,
 	  attack_hit_text[w_type].singular, attack_hit_text[w_type].plural);
   act(buf, FALSE, ch, NULL, victim, TO_CHAR);
-  send_to_char(CCNRM(ch, C_CMP), ch);
+  send_to_char(ch, CCNRM(ch, C_CMP));
 
   /* damage message to damagee */
-  send_to_char(CCRED(victim, C_CMP), victim);
+  send_to_char(victim, CCRED(victim, C_CMP));
   buf = replace_string(dam_weapons[msgnum].to_victim,
 	  attack_hit_text[w_type].singular, attack_hit_text[w_type].plural);
   act(buf, FALSE, ch, NULL, victim, TO_VICT | TO_SLEEP);
-  send_to_char(CCNRM(victim, C_CMP), victim);
+  send_to_char(victim, CCNRM(victim, C_CMP));
 }
 
 
@@ -625,39 +626,39 @@ int skill_message(int dam, struct char_d
          */
 	if (GET_POS(vict) == POS_DEAD) {
           if (msg->die_msg.attacker_msg) {
-            send_to_char(CCYEL(ch, C_CMP), ch);
+            send_to_char(ch, CCYEL(ch, C_CMP));
             act(msg->die_msg.attacker_msg, FALSE, ch, weap, vict, TO_CHAR);
-            send_to_char(CCNRM(ch, C_CMP), ch);
+            send_to_char(ch, CCNRM(ch, C_CMP));
           }
 
-	  send_to_char(CCRED(vict, C_CMP), vict);
+	  send_to_char(vict, CCRED(vict, C_CMP));
 	  act(msg->die_msg.victim_msg, FALSE, ch, weap, vict, TO_VICT | TO_SLEEP);
-	  send_to_char(CCNRM(vict, C_CMP), vict);
+	  send_to_char(vict, CCNRM(vict, C_CMP));
 
 	  act(msg->die_msg.room_msg, FALSE, ch, weap, vict, TO_NOTVICT);
 	} else {
           if (msg->hit_msg.attacker_msg) {
-	    send_to_char(CCYEL(ch, C_CMP), ch);
+	    send_to_char(ch, CCYEL(ch, C_CMP));
 	    act(msg->hit_msg.attacker_msg, FALSE, ch, weap, vict, TO_CHAR);
-	    send_to_char(CCNRM(ch, C_CMP), ch);
+	    send_to_char(ch, CCNRM(ch, C_CMP));
           }
 
-	  send_to_char(CCRED(vict, C_CMP), vict);
+	  send_to_char(vict, CCRED(vict, C_CMP));
 	  act(msg->hit_msg.victim_msg, FALSE, ch, weap, vict, TO_VICT | TO_SLEEP);
-	  send_to_char(CCNRM(vict, C_CMP), vict);
+	  send_to_char(vict, CCNRM(vict, C_CMP));
 
 	  act(msg->hit_msg.room_msg, FALSE, ch, weap, vict, TO_NOTVICT);
 	}
       } else if (ch != vict) {	/* Dam == 0 */
         if (msg->miss_msg.attacker_msg) {
-	  send_to_char(CCYEL(ch, C_CMP), ch);
+	  send_to_char(ch, CCYEL(ch, C_CMP));
 	  act(msg->miss_msg.attacker_msg, FALSE, ch, weap, vict, TO_CHAR);
-	  send_to_char(CCNRM(ch, C_CMP), ch);
+	  send_to_char(ch, CCNRM(ch, C_CMP));
         }
 
-	send_to_char(CCRED(vict, C_CMP), vict);
+	send_to_char(vict, CCRED(vict, C_CMP));
 	act(msg->miss_msg.victim_msg, FALSE, ch, weap, vict, TO_VICT | TO_SLEEP);
-	send_to_char(CCNRM(vict, C_CMP), vict);
+	send_to_char(vict, CCNRM(vict, C_CMP));
 
 	act(msg->miss_msg.room_msg, FALSE, ch, weap, vict, TO_NOTVICT);
       }
@@ -688,7 +689,7 @@ int damage(struct char_data *ch, struct 
 
   /* peaceful rooms */
   if (ch != victim && ROOM_FLAGGED(IN_ROOM(ch), ROOM_PEACEFUL)) {
-    send_to_char("This room just has such a peaceful, easy feeling...\r\n", ch);
+    send_to_char(ch, "This room just has such a peaceful, easy feeling...\r\n");
     return (0);
   }
 
@@ -768,35 +769,34 @@ int damage(struct char_data *ch, struct 
   switch (GET_POS(victim)) {
   case POS_MORTALLYW:
     act("$n is mortally wounded, and will die soon, if not aided.", TRUE, victim, 0, 0, TO_ROOM);
-    send_to_char("You are mortally wounded, and will die soon, if not aided.\r\n", victim);
+    send_to_char(victim, "You are mortally wounded, and will die soon, if not aided.\r\n");
     break;
   case POS_INCAP:
     act("$n is incapacitated and will slowly die, if not aided.", TRUE, victim, 0, 0, TO_ROOM);
-    send_to_char("You are incapacitated an will slowly die, if not aided.\r\n", victim);
+    send_to_char(victim, "You are incapacitated an will slowly die, if not aided.\r\n");
     break;
   case POS_STUNNED:
     act("$n is stunned, but will probably regain consciousness again.", TRUE, victim, 0, 0, TO_ROOM);
-    send_to_char("You're stunned, but will probably regain consciousness again.\r\n", victim);
+    send_to_char(victim, "You're stunned, but will probably regain consciousness again.\r\n");
     break;
   case POS_DEAD:
     act("$n is dead!  R.I.P.", FALSE, victim, 0, 0, TO_ROOM);
-    send_to_char("You are dead!  Sorry...\r\n", victim);
+    send_to_char(victim, "You are dead!  Sorry...\r\n");
     break;
 
   default:			/* >= POSITION SLEEPING */
     if (dam > (GET_MAX_HIT(victim) / 4))
-      send_to_char("That really did HURT!\r\n", victim);
+      send_to_char(victim, "That really did HURT!\r\n");
 
     if (GET_HIT(victim) < (GET_MAX_HIT(victim) / 4)) {
-      sprintf(buf2, "%sYou wish that your wounds would stop BLEEDING so much!%s\r\n",
-	      CCRED(victim, C_SPR), CCNRM(victim, C_SPR));
-      send_to_char(buf2, victim);
+      send_to_char(victim, "%sYou wish that your wounds would stop BLEEDING so much!%s\r\n",
+		CCRED(victim, C_SPR), CCNRM(victim, C_SPR));
       if (ch != victim && MOB_FLAGGED(victim, MOB_WIMPY))
 	do_flee(victim, NULL, 0, 0);
     }
     if (!IS_NPC(victim) && GET_WIMP_LEV(victim) && (victim != ch) &&
 	GET_HIT(victim) < GET_WIMP_LEV(victim) && GET_HIT(victim) > 0) {
-      send_to_char("You wimp out, and attempt to flee!\r\n", victim);
+      send_to_char(victim, "You wimp out, and attempt to flee!\r\n");
       do_flee(victim, NULL, 0, 0);
     }
     break;
@@ -827,9 +827,7 @@ int damage(struct char_data *ch, struct 
     }
 
     if (!IS_NPC(victim)) {
-      sprintf(buf2, "%s killed by %s at %s", GET_NAME(victim), GET_NAME(ch),
-	      world[IN_ROOM(victim)].name);
-      mudlog(buf2, BRF, LVL_IMMORT, TRUE);
+      mudlog(BRF, LVL_IMMORT, TRUE, "%s killed by %s at %s", GET_NAME(victim), GET_NAME(ch), world[IN_ROOM(victim)].name);
       if (MOB_FLAGGED(ch, MOB_MEMORY))
 	forget(ch, victim);
     }
@@ -857,8 +855,8 @@ int compute_thaco(struct char_data *ch, 
     calc_thaco = 20;
   calc_thaco -= str_app[STRENGTH_APPLY_INDEX(ch)].tohit;
   calc_thaco -= GET_HITROLL(ch);
-  calc_thaco -= (GET_INT(ch) - 13) / 1.5;	/* Intelligence helps! */
-  calc_thaco -= (GET_WIS(ch) - 13) / 1.5;	/* So does wisdom */
+  calc_thaco -= (int) ((GET_INT(ch) - 13) / 1.5);	/* Intelligence helps! */
+  calc_thaco -= (int) ((GET_WIS(ch) - 13) / 1.5);	/* So does wisdom */
 
   return calc_thaco;
 }
@@ -893,7 +891,7 @@ void hit(struct char_data *ch, struct ch
   victim_ac = compute_armor_class(victim) / 10;
 
   /* roll the die and take your chances... */
-  diceroll = number(1, 20);
+  diceroll = rand_number(1, 20);
 
   /*
    * Decide whether this is a hit or a miss.
@@ -929,7 +927,7 @@ void hit(struct char_data *ch, struct ch
       if (IS_NPC(ch))
 	dam += dice(ch->mob_specials.damnodice, ch->mob_specials.damsizedice);
       else
-	dam += number(0, 2);	/* Max 2 bare hand damage for players */
+	dam += rand_number(0, 2);	/* Max 2 bare hand damage for players */
     }
 
     /*
@@ -986,14 +984,14 @@ void perform_violence(void)
     }
 
     if (GET_POS(ch) < POS_FIGHTING) {
-      send_to_char("You can't fight while sitting!!\r\n", ch);
+      send_to_char(ch, "You can't fight while sitting!!\r\n");
       continue;
     }
 
     hit(ch, FIGHTING(ch), TYPE_UNDEFINED);
-    if (MOB_FLAGGED(ch, MOB_SPEC) && mob_index[GET_MOB_RNUM(ch)].func != NULL) {
+    if (MOB_FLAGGED(ch, MOB_SPEC) && GET_MOB_SPEC(ch) && !MOB_FLAGGED(ch, MOB_NOTDEADYET)) {
       char actbuf[MAX_INPUT_LENGTH] = "";
-      (mob_index[GET_MOB_RNUM(ch)].func) (ch, ch, 0, actbuf);
+      (GET_MOB_SPEC(ch)) (ch, ch, 0, actbuf);
     }
   }
 }
Index: src/graph.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/graph.c,v
retrieving revision 1.20
retrieving revision 1.23
diff -u -p -r1.20 -r1.23
--- src/graph.c	2001/12/04 12:22:54	1.20
+++ src/graph.c	2002/02/01 02:04:17	1.23
@@ -158,39 +158,39 @@ int find_first_step(room_rnum src, room_
 
 ACMD(do_track)
 {
+  char arg[MAX_INPUT_LENGTH];
   struct char_data *vict;
   int dir;
 
   /* The character must have the track skill. */
   if (IS_NPC(ch) || !GET_SKILL(ch, SKILL_TRACK)) {
-    send_to_char("You have no idea how.\r\n", ch);
+    send_to_char(ch, "You have no idea how.\r\n");
     return;
   }
   one_argument(argument, arg);
   if (!*arg) {
-    send_to_char("Whom are you trying to track?\r\n", ch);
+    send_to_char(ch, "Whom are you trying to track?\r\n");
     return;
   }
   /* The person can't see the victim. */
   if (!(vict = get_char_vis(ch, arg, NULL, FIND_CHAR_WORLD))) {
-    send_to_char("No one is around by that name.\r\n", ch);
+    send_to_char(ch, "No one is around by that name.\r\n");
     return;
   }
   /* We can't track the victim. */
   if (AFF_FLAGGED(vict, AFF_NOTRACK)) {
-    send_to_char("You sense no trail.\r\n", ch);
+    send_to_char(ch, "You sense no trail.\r\n");
     return;
   }
 
   /* 101 is a complete failure, no matter what the proficiency. */
-  if (number(0, 101) >= GET_SKILL(ch, SKILL_TRACK)) {
+  if (rand_number(0, 101) >= GET_SKILL(ch, SKILL_TRACK)) {
     int tries = 10;
     /* Find a random direction. :) */
     do {
-      dir = number(0, NUM_OF_DIRS - 1);
+      dir = rand_number(0, NUM_OF_DIRS - 1);
     } while (!CAN_GO(ch, dir) && --tries);
-    sprintf(buf, "You sense a trail %s from here!\r\n", dirs[dir]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You sense a trail %s from here!\r\n", dirs[dir]);
     return;
   }
 
@@ -199,18 +199,16 @@ ACMD(do_track)
 
   switch (dir) {
   case BFS_ERROR:
-    send_to_char("Hmm.. something seems to be wrong.\r\n", ch);
+    send_to_char(ch, "Hmm.. something seems to be wrong.\r\n");
     break;
   case BFS_ALREADY_THERE:
-    send_to_char("You're already in the same room!!\r\n", ch);
+    send_to_char(ch, "You're already in the same room!!\r\n");
     break;
   case BFS_NO_PATH:
-    sprintf(buf, "You can't sense a trail to %s from here.\r\n", HMHR(vict));
-    send_to_char(buf, ch);
+    send_to_char(ch, "You can't sense a trail to %s from here.\r\n", HMHR(vict));
     break;
   default:	/* Success! */
-    sprintf(buf, "You sense a trail %s from here!\r\n", dirs[dir]);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You sense a trail %s from here!\r\n", dirs[dir]);
     break;
   }
 }
@@ -238,7 +236,9 @@ void hunt_victim(struct char_data *ch)
     return;
   }
   if ((dir = find_first_step(IN_ROOM(ch), IN_ROOM(HUNTING(ch)))) < 0) {
-    sprintf(buf, "Damn!  I lost %s!", HMHR(HUNTING(ch)));
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), "Damn!  I lost %s!", HMHR(HUNTING(ch)));
     do_say(ch, buf, 0, 0);
     HUNTING(ch) = NULL;
   } else {
Index: src/handler.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/handler.c,v
retrieving revision 1.42
retrieving revision 1.48
diff -u -p -r1.42 -r1.48
--- src/handler.c	2002/01/13 21:46:14	1.42
+++ src/handler.c	2002/04/09 12:34:36	1.48
@@ -36,7 +36,6 @@ void update_char_objects(struct char_dat
 int invalid_class(struct char_data *ch, struct obj_data *obj);
 void remove_follower(struct char_data *ch);
 void clearMemory(struct char_data *ch);
-void die_follower(struct char_data *ch);
 ACMD(do_return);
 
 char *fname(const char *namelist)
@@ -597,8 +596,8 @@ int get_number(char **name)
 
   if ((ppos = strchr(*name, '.')) != NULL) {
     *ppos++ = '\0';
-    strcpy(number, *name);
-    strcpy(*name, ppos);
+    strlcpy(number, *name, sizeof(number));
+    strcpy(*name, ppos);	/* strcpy: OK (always smaller) */
 
     for (i = 0; *(number + i); i++)
       if (!isdigit(*(number + i)))
@@ -824,10 +823,10 @@ void update_char_objects(struct char_dat
       if (GET_OBJ_VAL(GET_EQ(ch, WEAR_LIGHT), 2) > 0) {
 	i = --GET_OBJ_VAL(GET_EQ(ch, WEAR_LIGHT), 2);
 	if (i == 1) {
-	  send_to_char("Your light begins to flicker and fade.\r\n", ch);
+	  send_to_char(ch, "Your light begins to flicker and fade.\r\n");
 	  act("$n's light begins to flicker and fade.", FALSE, ch, 0, 0, TO_ROOM);
 	} else if (i == 0) {
-	  send_to_char("Your light sputters out and dies.\r\n", ch);
+	  send_to_char(ch, "Your light sputters out and dies.\r\n");
 	  act("$n's light sputters out and dies.", FALSE, ch, 0, 0, TO_ROOM);
 	  world[IN_ROOM(ch)].light--;
 	}
@@ -895,7 +894,7 @@ void extract_char_final(struct char_data
           STATE(d) = CON_CLOSE;
       }
       STATE(ch->desc) = CON_MENU;
-      SEND_TO_Q(MENU, ch->desc);
+      write_to_output(ch->desc, "%s", MENU);
     }
   }
 
@@ -1270,30 +1269,30 @@ struct obj_data *create_money(int amount
   CREATE(new_descr, struct extra_descr_data, 1);
 
   if (amount == 1) {
-    obj->name = str_dup("coin gold");
-    obj->short_description = str_dup("a gold coin");
-    obj->description = str_dup("One miserable gold coin is lying here.");
-    new_descr->keyword = str_dup("coin gold");
-    new_descr->description = str_dup("It's just one miserable little gold coin.");
+    obj->name = strdup("coin gold");
+    obj->short_description = strdup("a gold coin");
+    obj->description = strdup("One miserable gold coin is lying here.");
+    new_descr->keyword = strdup("coin gold");
+    new_descr->description = strdup("It's just one miserable little gold coin.");
   } else {
-    obj->name = str_dup("coins gold");
-    obj->short_description = str_dup(money_desc(amount));
-    sprintf(buf, "%s is lying here.", money_desc(amount));
-    obj->description = str_dup(CAP(buf));
+    obj->name = strdup("coins gold");
+    obj->short_description = strdup(money_desc(amount));
+    snprintf(buf, sizeof(buf), "%s is lying here.", money_desc(amount));
+    obj->description = strdup(CAP(buf));
 
-    new_descr->keyword = str_dup("coins gold");
+    new_descr->keyword = strdup("coins gold");
     if (amount < 10)
-      sprintf(buf, "There are %d coins.", amount);
+      snprintf(buf, sizeof(buf), "There are %d coins.", amount);
     else if (amount < 100)
-      sprintf(buf, "There are about %d coins.", 10 * (amount / 10));
+      snprintf(buf, sizeof(buf), "There are about %d coins.", 10 * (amount / 10));
     else if (amount < 1000)
-      sprintf(buf, "It looks to be about %d coins.", 100 * (amount / 100));
+      snprintf(buf, sizeof(buf), "It looks to be about %d coins.", 100 * (amount / 100));
     else if (amount < 100000)
-      sprintf(buf, "You guess there are, maybe, %d coins.",
-	      1000 * ((amount / 1000) + number(0, (amount / 1000))));
+      snprintf(buf, sizeof(buf), "You guess there are, maybe, %d coins.",
+	      1000 * ((amount / 1000) + rand_number(0, (amount / 1000))));
     else
-      strcpy(buf, "There are a LOT of coins.");
-    new_descr->description = str_dup(buf);
+      strcpy(buf, "There are a LOT of coins.");	/* strcpy: OK (is < 200) */
+    new_descr->description = strdup(buf);
   }
 
   new_descr->next = NULL;
@@ -1387,7 +1386,7 @@ int find_all_dots(char *arg)
   if (!strcmp(arg, "all"))
     return (FIND_ALL);
   else if (!strncmp(arg, "all.", 4)) {
-    strcpy(arg, arg + 4);
+    strcpy(arg, arg + 4);	/* strcpy: OK (always less) */
     return (FIND_ALLDOT);
   } else
     return (FIND_INDIV);
Index: src/house.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/house.c,v
retrieving revision 1.25
retrieving revision 1.28
diff -u -p -r1.25 -r1.28
--- src/house.c	2001/06/28 15:03:53	1.25
+++ src/house.c	2002/02/01 02:19:39	1.28
@@ -29,7 +29,7 @@ struct house_control_rec house_control[M
 int num_of_houses = 0;
 
 /* local functions */
-int House_get_filename(int vnum, char *filename);
+int House_get_filename(room_vnum vnum, char *filename, size_t maxlen);
 int House_load(room_vnum vnum);
 int House_save(struct obj_data *obj, FILE *fp);
 void House_restore_weight(struct obj_data *obj);
@@ -47,12 +47,12 @@ ACMD(do_house);
 /* First, the basics: finding the filename; loading/saving objects */
 
 /* Return a filename given a house vnum */
-int House_get_filename(int vnum, char *filename)
+int House_get_filename(room_vnum vnum, char *filename, size_t maxlen)
 {
   if (vnum == NOWHERE)
     return (0);
 
-  sprintf(filename, LIB_HOUSE"%d.house", vnum);
+  snprintf(filename, maxlen, LIB_HOUSE"%d.house", vnum);
   return (1);
 }
 
@@ -61,16 +61,16 @@ int House_get_filename(int vnum, char *f
 int House_load(room_vnum vnum)
 {
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
+  char filename[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   room_rnum rnum;
   int i;
 
   if ((rnum = real_room(vnum)) == NOWHERE)
     return (0);
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, filename, sizeof(filename)))
     return (0);
-  if (!(fl = fopen(fname, "r+b")))	/* no file found */
+  if (!(fl = fopen(filename, "r+b")))	/* no file found */
     return (0);
   while (!feof(fl)) {
     fread(&object, sizeof(struct obj_file_elem), 1, fl);
@@ -131,7 +131,7 @@ void House_crashsave(room_vnum vnum)
 
   if ((rnum = real_room(vnum)) == NOWHERE)
     return;
-  if (!House_get_filename(vnum, buf))
+  if (!House_get_filename(vnum, buf, sizeof(buf)))
     return;
   if (!(fp = fopen(buf, "wb"))) {
     perror("SYSERR: Error saving house file");
@@ -150,18 +150,18 @@ void House_crashsave(room_vnum vnum)
 /* Delete a house save file */
 void House_delete_file(int vnum)
 {
-  char fname[MAX_INPUT_LENGTH];
+  char filename[MAX_INPUT_LENGTH];
   FILE *fl;
 
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, filename, sizeof(filename)))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(filename, "rb"))) {
     if (errno != ENOENT)
       log("SYSERR: Error deleting house file #%d. (1): %s", vnum, strerror(errno));
     return;
   }
   fclose(fl);
-  if (remove(fname) < 0)
+  if (remove(filename) < 0)
     log("SYSERR: Error deleting house file #%d. (2): %s", vnum, strerror(errno));
 }
 
@@ -170,17 +170,16 @@ void House_delete_file(int vnum)
 void House_listrent(struct char_data *ch, room_vnum vnum)
 {
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
+  char filename[MAX_STRING_LENGTH];
   char buf[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   struct obj_data *obj;
   int i;
 
-  if (!House_get_filename(vnum, fname))
+  if (!House_get_filename(vnum, filename, sizeof(filename)))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
-    sprintf(buf, "No objects on file for house #%d.\r\n", vnum);
-    send_to_char(buf, ch);
+  if (!(fl = fopen(filename, "rb"))) {
+    send_to_char(ch, "No objects on file for house #%d.\r\n", vnum);
     return;
   }
   *buf = '\0';
@@ -191,14 +190,10 @@ void House_listrent(struct char_data *ch
       return;
     }
     if (!feof(fl) && (obj = Obj_from_store(object, &i)) != NULL) {
-      sprintf(buf + strlen(buf), " [%5d] (%5dau) %s\r\n",
-	      GET_OBJ_VNUM(obj), GET_OBJ_RENT(obj),
-	      obj->short_description);
+      send_to_char(ch, " [%5d] (%5dau) %s\r\n", GET_OBJ_VNUM(obj), GET_OBJ_RENT(obj), obj->short_description);
       free_obj(obj);
     }
   }
-
-  send_to_char(buf, ch);
   fclose(fl);
 }
 
@@ -304,15 +299,15 @@ void hcontrol_list_houses(struct char_da
 {
   int i;
   char *timestr, *temp;
-  char built_on[128], last_pay[128], own_name[128];
+  char built_on[128], last_pay[128], own_name[MAX_NAME_LENGTH + 1];
 
   if (!num_of_houses) {
-    send_to_char("No houses have been defined.\r\n", ch);
+    send_to_char(ch, "No houses have been defined.\r\n");
     return;
   }
-  strcpy(buf, "Address  Atrium  Build Date  Guests  Owner        Last Paymt\r\n");
-  strcat(buf, "-------  ------  ----------  ------  ------------ ----------\r\n");
-  send_to_char(buf, ch);
+  send_to_char(ch,
+	"Address  Atrium  Build Date  Guests  Owner        Last Paymt\r\n"
+	"-------  ------  ----------  ------  ------------ ----------\r\n");
 
   for (i = 0; i < num_of_houses; i++) {
     /* Avoid seeing <UNDEF> entries from self-deleted people. -gg 6/21/98 */
@@ -322,25 +317,23 @@ void hcontrol_list_houses(struct char_da
     if (house_control[i].built_on) {
       timestr = asctime(localtime(&(house_control[i].built_on)));
       *(timestr + 10) = '\0';
-      strcpy(built_on, timestr);
+      strlcpy(built_on, timestr, sizeof(built_on));
     } else
-      strcpy(built_on, "Unknown");
+      strcpy(built_on, "Unknown");	/* strcpy: OK (for 'strlen("Unknown") < 128') */
 
     if (house_control[i].last_payment) {
       timestr = asctime(localtime(&(house_control[i].last_payment)));
       *(timestr + 10) = '\0';
-      strcpy(last_pay, timestr);
+      strlcpy(last_pay, timestr, sizeof(built_on));
     } else
-      strcpy(last_pay, "None");
+      strcpy(last_pay, "None");	/* strcpy: OK (for 'strlen("None") < 128') */
 
     /* Now we need a copy of the owner's name to capitalize. -gg 6/21/98 */
-    strcpy(own_name, temp);
-
-    sprintf(buf, "%7d %7d  %-10s    %2d    %-12s %s\r\n",
+    strcpy(own_name, temp);	/* strcpy: OK (names guaranteed <= MAX_NAME_LENGTH+1) */
+    send_to_char(ch, "%7d %7d  %-10s    %2d    %-12s %s\r\n",
 	    house_control[i].vnum, house_control[i].atrium, built_on,
 	    house_control[i].num_of_guests, CAP(own_name), last_pay);
 
-    send_to_char(buf, ch);
     House_list_guests(ch, i, TRUE);
   }
 }
@@ -357,41 +350,38 @@ void hcontrol_build_house(struct char_da
   long owner;
 
   if (num_of_houses >= MAX_HOUSES) {
-    send_to_char("Max houses already defined.\r\n", ch);
+    send_to_char(ch, "Max houses already defined.\r\n");
     return;
   }
 
   /* first arg: house's vnum */
   arg = one_argument(arg, arg1);
   if (!*arg1) {
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
     return;
   }
   virt_house = atoi(arg1);
   if ((real_house = real_room(virt_house)) == NOWHERE) {
-    send_to_char("No such room exists.\r\n", ch);
+    send_to_char(ch, "No such room exists.\r\n");
     return;
   }
   if ((find_house(virt_house)) != NOWHERE) {
-    send_to_char("House already exists.\r\n", ch);
+    send_to_char(ch, "House already exists.\r\n");
     return;
   }
 
   /* second arg: direction of house's exit */
   arg = one_argument(arg, arg1);
   if (!*arg1) {
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
     return;
   }
   if ((exit_num = search_block(arg1, dirs, FALSE)) < 0) {
-    sprintf(buf, "'%s' is not a valid direction.\r\n", arg1);
-    send_to_char(buf, ch);
+    send_to_char(ch, "'%s' is not a valid direction.\r\n", arg1);
     return;
   }
   if (TOROOM(real_house, exit_num) == NOWHERE) {
-    sprintf(buf, "There is no exit %s from room %d.\r\n", dirs[exit_num],
-	    virt_house);
-    send_to_char(buf, ch);
+    send_to_char(ch, "There is no exit %s from room %d.\r\n", dirs[exit_num], virt_house);
     return;
   }
 
@@ -399,19 +389,18 @@ void hcontrol_build_house(struct char_da
   virt_atrium = GET_ROOM_VNUM(real_atrium);
 
   if (TOROOM(real_atrium, rev_dir[exit_num]) != real_house) {
-    send_to_char("A house's exit must be a two-way door.\r\n", ch);
+    send_to_char(ch, "A house's exit must be a two-way door.\r\n");
     return;
   }
 
   /* third arg: player's name */
   one_argument(arg, arg1);
   if (!*arg1) {
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
     return;
   }
   if ((owner = get_id_by_name(arg1)) < 0) {
-    sprintf(buf, "Unknown player '%s'.\r\n", arg1);
-    send_to_char(buf, ch);
+    send_to_char(ch, "Unknown player '%s'.\r\n", arg1);
     return;
   }
 
@@ -430,7 +419,7 @@ void hcontrol_build_house(struct char_da
   SET_BIT(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
   House_crashsave(virt_house);
 
-  send_to_char("House built.  Mazel tov!\r\n", ch);
+  send_to_char(ch, "House built.  Mazel tov!\r\n");
   House_save_control();
 }
 
@@ -442,24 +431,22 @@ void hcontrol_destroy_house(struct char_
   room_rnum real_atrium, real_house;
 
   if (!*arg) {
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
     return;
   }
   if ((i = find_house(atoi(arg))) == NOWHERE) {
-    send_to_char("Unknown house.\r\n", ch);
+    send_to_char(ch, "Unknown house.\r\n");
     return;
   }
   if ((real_atrium = real_room(house_control[i].atrium)) == NOWHERE)
-    log("SYSERR: House %d had invalid atrium %d!", atoi(arg),
-	house_control[i].atrium);
+    log("SYSERR: House %d had invalid atrium %d!", atoi(arg), house_control[i].atrium);
   else
     REMOVE_BIT(ROOM_FLAGS(real_atrium), ROOM_ATRIUM);
 
   if ((real_house = real_room(house_control[i].vnum)) == NOWHERE)
     log("SYSERR: House %d had invalid vnum %d!", atoi(arg), house_control[i].vnum);
   else
-    REMOVE_BIT(ROOM_FLAGS(real_house),
-	       ROOM_HOUSE | ROOM_PRIVATE | ROOM_HOUSE_CRASH);
+    REMOVE_BIT(ROOM_FLAGS(real_house), ROOM_HOUSE | ROOM_PRIVATE | ROOM_HOUSE_CRASH);
 
   House_delete_file(house_control[i].vnum);
 
@@ -468,7 +455,7 @@ void hcontrol_destroy_house(struct char_
 
   num_of_houses--;
 
-  send_to_char("House deleted.\r\n", ch);
+  send_to_char(ch, "House deleted.\r\n");
   House_save_control();
 
   /*
@@ -487,16 +474,15 @@ void hcontrol_pay_house(struct char_data
   int i;
 
   if (!*arg)
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
   else if ((i = find_house(atoi(arg))) == NOWHERE)
-    send_to_char("Unknown house.\r\n", ch);
+    send_to_char(ch, "Unknown house.\r\n");
   else {
-    sprintf(buf, "Payment for house %s collected by %s.", arg, GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "Payment for house %s collected by %s.", arg, GET_NAME(ch));
 
     house_control[i].last_payment = time(0);
     House_save_control();
-    send_to_char("Payment recorded.\r\n", ch);
+    send_to_char(ch, "Payment recorded.\r\n");
   }
 }
 
@@ -517,29 +503,30 @@ ACMD(do_hcontrol)
   else if (is_abbrev(arg1, "show"))
     hcontrol_list_houses(ch);
   else
-    send_to_char(HCONTROL_FORMAT, ch);
+    send_to_char(ch, "%s", HCONTROL_FORMAT);
 }
 
 
 /* The house command, used by mortal house owners to assign guests */
 ACMD(do_house)
 {
+  char arg[MAX_INPUT_LENGTH];
   int i, j, id;
 
   one_argument(argument, arg);
 
   if (!ROOM_FLAGGED(IN_ROOM(ch), ROOM_HOUSE))
-    send_to_char("You must be in your house to set guests.\r\n", ch);
+    send_to_char(ch, "You must be in your house to set guests.\r\n");
   else if ((i = find_house(GET_ROOM_VNUM(IN_ROOM(ch)))) == NOWHERE)
-    send_to_char("Um.. this house seems to be screwed up.\r\n", ch);
+    send_to_char(ch, "Um.. this house seems to be screwed up.\r\n");
   else if (GET_IDNUM(ch) != house_control[i].owner)
-    send_to_char("Only the primary owner can set guests.\r\n", ch);
+    send_to_char(ch, "Only the primary owner can set guests.\r\n");
   else if (!*arg)
     House_list_guests(ch, i, FALSE);
   else if ((id = get_id_by_name(arg)) < 0)
-    send_to_char("No such player.\r\n", ch);
+    send_to_char(ch, "No such player.\r\n");
   else if (id == GET_IDNUM(ch))
-    send_to_char("It's your house!\r\n", ch);
+    send_to_char(ch, "It's your house!\r\n");
   else {
     for (j = 0; j < house_control[i].num_of_guests; j++)
       if (house_control[i].guests[j] == id) {
@@ -547,17 +534,17 @@ ACMD(do_house)
 	  house_control[i].guests[j] = house_control[i].guests[j + 1];
 	house_control[i].num_of_guests--;
 	House_save_control();
-	send_to_char("Guest deleted.\r\n", ch);
+	send_to_char(ch, "Guest deleted.\r\n");
 	return;
       }
     if (house_control[i].num_of_guests == MAX_GUESTS) {
-      send_to_char("You have too many guests.\r\n", ch);
+      send_to_char(ch, "You have too many guests.\r\n");
       return;
     }
     j = house_control[i].num_of_guests++;
     house_control[i].guests[j] = id;
     House_save_control();
-    send_to_char("Guest added.\r\n", ch);
+    send_to_char(ch, "Guest added.\r\n");
   }
 }
 
@@ -603,25 +590,22 @@ void House_list_guests(struct char_data 
 {
   int j;
   char *temp;
-  char buf[MAX_STRING_LENGTH], buf2[MAX_NAME_LENGTH + 2];
 
   if (house_control[i].num_of_guests == 0) {
     if (!quiet)
-      send_to_char("  Guests: None\r\n", ch);
+      send_to_char(ch, "  Guests: None\r\n");
     return;
   }
 
-  strcpy(buf, "  Guests: ");
+  send_to_char(ch, "  Guests: ");
 
-  /* Avoid <UNDEF>. -gg 6/21/98 */
   for (j = 0; j < house_control[i].num_of_guests; j++) {
+    /* Avoid <UNDEF>. -gg 6/21/98 */
     if ((temp = get_name_by_id(house_control[i].guests[j])) == NULL)
       continue;
-    sprintf(buf2, "%s ", temp);
-    strcat(buf, CAP(buf2));
+    send_to_char(ch, "%c%s ", UPPER(*temp), temp + 1);
   }
 
-  strcat(buf, "\r\n");
-  send_to_char(buf, ch);
+  send_to_char(ch, "\r\n");
 }
 
Index: src/interpreter.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/interpreter.c,v
retrieving revision 1.32
retrieving revision 1.40
diff -u -p -r1.32 -r1.40
--- src/interpreter.c	2002/01/13 21:46:14	1.32
+++ src/interpreter.c	2002/04/09 14:12:15	1.40
@@ -56,9 +56,8 @@ int perform_dupe_check(struct descriptor
 struct alias_data *find_alias(struct alias_data *alias_list, char *str);
 void free_alias(struct alias_data *a);
 void perform_complex_alias(struct txt_q *input_q, char *orig, struct alias_data *a);
-int perform_alias(struct descriptor_data *d, char *orig);
+int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen);
 int reserved_word(char *argument);
-int find_name(const char *name);
 int _parse_name(char *arg, char *name);
 
 /* prototypes for all do_x functions. */
@@ -576,6 +575,7 @@ void command_interpreter(struct char_dat
 {
   int cmd, length;
   char *line;
+  char arg[MAX_INPUT_LENGTH];
 
   REMOVE_BIT(AFF_FLAGS(ch), AFF_HIDE);
 
@@ -603,36 +603,36 @@ void command_interpreter(struct char_dat
 	break;
 
   if (*cmd_info[cmd].command == '\n')
-    send_to_char("Huh?!?\r\n", ch);
+    send_to_char(ch, "Huh?!?\r\n");
   else if (!IS_NPC(ch) && PLR_FLAGGED(ch, PLR_FROZEN) && GET_LEVEL(ch) < LVL_IMPL)
-    send_to_char("You try, but the mind-numbing cold prevents you...\r\n", ch);
+    send_to_char(ch, "You try, but the mind-numbing cold prevents you...\r\n");
   else if (cmd_info[cmd].command_pointer == NULL)
-    send_to_char("Sorry, that command hasn't been implemented yet.\r\n", ch);
+    send_to_char(ch, "Sorry, that command hasn't been implemented yet.\r\n");
   else if (IS_NPC(ch) && cmd_info[cmd].minimum_level >= LVL_IMMORT)
-    send_to_char("You can't use immortal commands while switched.\r\n", ch);
+    send_to_char(ch, "You can't use immortal commands while switched.\r\n");
   else if (GET_POS(ch) < cmd_info[cmd].minimum_position)
     switch (GET_POS(ch)) {
     case POS_DEAD:
-      send_to_char("Lie still; you are DEAD!!! :-(\r\n", ch);
+      send_to_char(ch, "Lie still; you are DEAD!!! :-(\r\n");
       break;
     case POS_INCAP:
     case POS_MORTALLYW:
-      send_to_char("You are in a pretty bad shape, unable to do anything!\r\n", ch);
+      send_to_char(ch, "You are in a pretty bad shape, unable to do anything!\r\n");
       break;
     case POS_STUNNED:
-      send_to_char("All you can do right now is think about the stars!\r\n", ch);
+      send_to_char(ch, "All you can do right now is think about the stars!\r\n");
       break;
     case POS_SLEEPING:
-      send_to_char("In your dreams, or what?\r\n", ch);
+      send_to_char(ch, "In your dreams, or what?\r\n");
       break;
     case POS_RESTING:
-      send_to_char("Nah... You feel too relaxed to do that..\r\n", ch);
+      send_to_char(ch, "Nah... You feel too relaxed to do that..\r\n");
       break;
     case POS_SITTING:
-      send_to_char("Maybe you should get on your feet first?\r\n", ch);
+      send_to_char(ch, "Maybe you should get on your feet first?\r\n");
       break;
     case POS_FIGHTING:
-      send_to_char("No way!  You're fighting for your life!\r\n", ch);
+      send_to_char(ch, "No way!  You're fighting for your life!\r\n");
       break;
   } else if (no_specials || !special(ch, cmd, line))
     ((*cmd_info[cmd].command_pointer) (ch, line, cmd, cmd_info[cmd].subcmd));
@@ -670,6 +670,7 @@ void free_alias(struct alias_data *a)
 /* The interface to the outside world: do_alias */
 ACMD(do_alias)
 {
+  char arg[MAX_INPUT_LENGTH];
   char *repl;
   struct alias_data *a, *temp;
 
@@ -679,13 +680,12 @@ ACMD(do_alias)
   repl = any_one_arg(argument, arg);
 
   if (!*arg) {			/* no argument specified -- list currently defined aliases */
-    send_to_char("Currently defined aliases:\r\n", ch);
+    send_to_char(ch, "Currently defined aliases:\r\n");
     if ((a = GET_ALIASES(ch)) == NULL)
-      send_to_char(" None.\r\n", ch);
+      send_to_char(ch, " None.\r\n");
     else {
       while (a != NULL) {
-	sprintf(buf, "%-15s %s\r\n", a->alias, a->replacement);
-	send_to_char(buf, ch);
+	send_to_char(ch, "%-15s %s\r\n", a->alias, a->replacement);
 	a = a->next;
       }
     }
@@ -698,25 +698,25 @@ ACMD(do_alias)
     /* if no replacement string is specified, assume we want to delete */
     if (!*repl) {
       if (a == NULL)
-	send_to_char("No such alias.\r\n", ch);
+	send_to_char(ch, "No such alias.\r\n");
       else
-	send_to_char("Alias deleted.\r\n", ch);
+	send_to_char(ch, "Alias deleted.\r\n");
     } else {			/* otherwise, either add or redefine an alias */
       if (!str_cmp(arg, "alias")) {
-	send_to_char("You can't alias 'alias'.\r\n", ch);
+	send_to_char(ch, "You can't alias 'alias'.\r\n");
 	return;
       }
       CREATE(a, struct alias_data, 1);
-      a->alias = str_dup(arg);
+      a->alias = strdup(arg);
       delete_doubledollar(repl);
-      a->replacement = str_dup(repl);
+      a->replacement = strdup(repl);
       if (strchr(repl, ALIAS_SEP_CHAR) || strchr(repl, ALIAS_VAR_CHAR))
 	a->type = ALIAS_COMPLEX;
       else
 	a->type = ALIAS_SIMPLE;
       a->next = GET_ALIASES(ch);
       GET_ALIASES(ch) = a;
-      send_to_char("Alias added.\r\n", ch);
+      send_to_char(ch, "Alias added.\r\n");
     }
   }
 }
@@ -733,10 +733,12 @@ void perform_complex_alias(struct txt_q 
 {
   struct txt_q temp_queue;
   char *tokens[NUM_TOKENS], *temp, *write_point;
+  char buf2[MAX_RAW_INPUT_LENGTH], buf[MAX_RAW_INPUT_LENGTH];	/* raw? */
   int num_of_tokens = 0, num;
 
   /* First, parse the original string */
-  temp = strtok(strcpy(buf2, orig), " ");
+  strcpy(buf2, orig);	/* strcpy: OK (orig:MAX_INPUT_LENGTH < buf2:MAX_RAW_INPUT_LENGTH) */
+  temp = strtok(buf2, " ");
   while (temp != NULL && num_of_tokens < NUM_TOKENS) {
     tokens[num_of_tokens++] = temp;
     temp = strtok(NULL, " ");
@@ -756,10 +758,10 @@ void perform_complex_alias(struct txt_q 
     } else if (*temp == ALIAS_VAR_CHAR) {
       temp++;
       if ((num = *temp - '1') < num_of_tokens && num >= 0) {
-	strcpy(write_point, tokens[num]);
+	strcpy(write_point, tokens[num]);	/* strcpy: OK */
 	write_point += strlen(tokens[num]);
       } else if (*temp == ALIAS_GLOB_CHAR) {
-	strcpy(write_point, orig);
+	strcpy(write_point, orig);		/* strcpy: OK */
 	write_point += strlen(orig);
       } else if ((*(write_point++) = *temp) == '$')	/* redouble $ for act safety */
 	*(write_point++) = '$';
@@ -789,7 +791,7 @@ void perform_complex_alias(struct txt_q 
  *   1: String was _not_ modified in place; rather, the expanded aliases
  *      have been placed at the front of the character's input queue.
  */
-int perform_alias(struct descriptor_data *d, char *orig)
+int perform_alias(struct descriptor_data *d, char *orig, size_t maxlen)
 {
   char first_arg[MAX_INPUT_LENGTH], *ptr;
   struct alias_data *a, *tmp;
@@ -814,7 +816,7 @@ int perform_alias(struct descriptor_data
     return (0);
 
   if (a->type == ALIAS_SIMPLE) {
-    strcpy(orig, a->replacement);
+    strlcpy(orig, a->replacement, maxlen);
     return (0);
   } else {
     perform_complex_alias(&d->input, ptr, a);
@@ -899,22 +901,22 @@ void skip_spaces(char **string)
  */
 char *delete_doubledollar(char *string)
 {
-  char *read, *write;
+  char *ddread, *ddwrite;
 
   /* If the string has no dollar signs, return immediately */
-  if ((write = strchr(string, '$')) == NULL)
+  if ((ddwrite = strchr(string, '$')) == NULL)
     return (string);
 
   /* Start from the location of the first dollar sign */
-  read = write;
+  ddread = ddwrite;
 
 
-  while (*read)   /* Until we reach the end of the string... */
-    if ((*(write++) = *(read++)) == '$') /* copy one char */
-      if (*read == '$')
-	read++; /* skip if we saw 2 $'s in a row */
+  while (*ddread)   /* Until we reach the end of the string... */
+    if ((*(ddwrite++) = *(ddread++)) == '$') /* copy one char */
+      if (*ddread == '$')
+	ddread++; /* skip if we saw 2 $'s in a row */
 
-  *write = '\0';
+  *ddwrite = '\0';
 
   return (string);
 }
@@ -1048,14 +1050,18 @@ int is_abbrev(const char *arg1, const ch
 
 
 
-/* return first space-delimited token in arg1; remainder of string in arg2 */
+/*
+ * Return first space-delimited token in arg1; remainder of string in arg2.
+ *
+ * NOTE: Requires sizeof(arg2) >= sizeof(string)
+ */
 void half_chop(char *string, char *arg1, char *arg2)
 {
   char *temp;
 
   temp = any_one_arg(string, arg1);
   skip_spaces(&temp);
-  strcpy(arg2, temp);
+  strcpy(arg2, temp);	/* strcpy: OK (documentation) */
 }
 
 
@@ -1098,8 +1104,8 @@ int special(struct char_data *ch, int cm
 
   /* special in mobile present? */
   for (k = world[IN_ROOM(ch)].people; k; k = k->next_in_room)
-    if (GET_MOB_SPEC(k) != NULL)
-      if (GET_MOB_SPEC(k) (ch, k, cmd, arg))
+    if (!MOB_FLAGGED(k, MOB_NOTDEADYET))
+      if (GET_MOB_SPEC(k) && GET_MOB_SPEC(k) (ch, k, cmd, arg))
 	return (1);
 
   /* special in object present? */
@@ -1118,27 +1124,12 @@ int special(struct char_data *ch, int cm
 ************************************************************************* */
 
 
-/* locate entry in p_table with entry->name == name. -1 mrks failed search */
-int find_name(const char *name)
-{
-  int i;
-
-  for (i = 0; i <= top_of_p_table; i++) {
-    if (!str_cmp((player_table + i)->name, name))
-      return (i);
-  }
-
-  return (-1);
-}
-
-
+/* This function needs to die. */
 int _parse_name(char *arg, char *name)
 {
   int i;
-
-  /* skip whitespaces */
-  for (; isspace(*arg); arg++);
 
+  skip_spaces(&arg);
   for (i = 0; (*name = *arg); arg++, i++, name++)
     if (!isalpha(*arg))
       return (1);
@@ -1178,7 +1169,7 @@ int perform_dupe_check(struct descriptor
       continue;
 
     if (k->original && (GET_IDNUM(k->original) == id)) {    /* switched char */
-      SEND_TO_Q("\r\nMultiple login detected -- disconnecting.\r\n", k);
+      write_to_output(d, "\r\nMultiple login detected -- disconnecting.\r\n");
       STATE(k) = CON_CLOSE;
       if (!target) {
 	target = k->original;
@@ -1190,14 +1181,14 @@ int perform_dupe_check(struct descriptor
       k->original = NULL;
     } else if (k->character && (GET_IDNUM(k->character) == id)) {
       if (!target && STATE(k) == CON_PLAYING) {
-	SEND_TO_Q("\r\nThis body has been usurped!\r\n", k);
+	write_to_output(k, "\r\nThis body has been usurped!\r\n");
 	target = k->character;
 	mode = USURP;
       }
       k->character->desc = NULL;
       k->character = NULL;
       k->original = NULL;
-      SEND_TO_Q("\r\nMultiple login detected -- disconnecting.\r\n", k);
+      write_to_output(k, "\r\nMultiple login detected -- disconnecting.\r\n");
       STATE(k) = CON_CLOSE;
     }
   }
@@ -1257,24 +1248,21 @@ int perform_dupe_check(struct descriptor
 
   switch (mode) {
   case RECON:
-    SEND_TO_Q("Reconnecting.\r\n", d);
+    write_to_output(d, "Reconnecting.\r\n");
     act("$n has reconnected.", TRUE, d->character, 0, 0, TO_ROOM);
-    sprintf(buf, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
     break;
   case USURP:
-    SEND_TO_Q("You take over your own body, already in use!\r\n", d);
+    write_to_output(d, "You take over your own body, already in use!\r\n");
     act("$n suddenly keels over in pain, surrounded by a white aura...\r\n"
 	"$n's body has been taken over by a new spirit!",
 	TRUE, d->character, 0, 0, TO_ROOM);
-    sprintf(buf, "%s has re-logged in ... disconnecting old socket.",
-	    GET_NAME(d->character));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE,
+	"%s has re-logged in ... disconnecting old socket.", GET_NAME(d->character));
     break;
   case UNSWITCH:
-    SEND_TO_Q("Reconnecting to unswitched char.", d);
-    sprintf(buf, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
+    write_to_output(d, "Reconnecting to unswitched char.");
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
     break;
   }
 
@@ -1286,11 +1274,7 @@ int perform_dupe_check(struct descriptor
 /* deal with newcomers and other non-playing sockets */
 void nanny(struct descriptor_data *d, char *arg)
 {
-  char buf[128];
-  int player_i, load_result;
-  char tmp_name[MAX_INPUT_LENGTH];
-  struct char_file_u tmp_store;
-  room_vnum load_room;
+  int load_result;	/* Overloaded variable */
 
   skip_spaces(&arg);
 
@@ -1305,11 +1289,14 @@ void nanny(struct descriptor_data *d, ch
     if (!*arg)
       STATE(d) = CON_CLOSE;
     else {
+      char buf[MAX_INPUT_LENGTH], tmp_name[MAX_INPUT_LENGTH];
+      struct char_file_u tmp_store;
+      int player_i;
+
       if ((_parse_name(arg, tmp_name)) || strlen(tmp_name) < 2 ||
 	  strlen(tmp_name) > MAX_NAME_LENGTH || !Valid_Name(tmp_name) ||
-	  fill_word(strcpy(buf, tmp_name)) || reserved_word(buf)) {
-	SEND_TO_Q("Invalid name, please try another.\r\n"
-		  "Name: ", d);
+	  fill_word(strcpy(buf, tmp_name)) || reserved_word(buf)) {	/* strcpy: OK (mutual MAX_INPUT_LENGTH) */
+	write_to_output(d, "Invalid name, please try another.\r\nName: ");
 	return;
       }
       if ((player_i = load_char(tmp_name, &tmp_store)) > -1) {
@@ -1321,7 +1308,7 @@ void nanny(struct descriptor_data *d, ch
 	  free_char(d->character);
 	  /* Check for multiple creations... */
 	  if (!Valid_Name(tmp_name)) {
-	    SEND_TO_Q("Invalid name, please try another.\r\nName: ", d);
+	    write_to_output(d, "Invalid name, please try another.\r\nName: ");
 	    return;
 	  }
 	  CREATE(d->character, struct char_data, 1);
@@ -1329,17 +1316,16 @@ void nanny(struct descriptor_data *d, ch
 	  CREATE(d->character->player_specials, struct player_special_data, 1);
 	  d->character->desc = d;
 	  CREATE(d->character->player.name, char, strlen(tmp_name) + 1);
-	  strcpy(d->character->player.name, CAP(tmp_name));
+	  strcpy(d->character->player.name, CAP(tmp_name));	/* strcpy: OK (size checked above) */
 	  GET_PFILEPOS(d->character) = player_i;
-	  sprintf(buf, "Did I get that right, %s (Y/N)? ", tmp_name);
-	  SEND_TO_Q(buf, d);
+	  write_to_output(d, "Did I get that right, %s (Y/N)? ", tmp_name);
 	  STATE(d) = CON_NAME_CNFRM;
 	} else {
 	  /* undo it just in case they are set */
 	  REMOVE_BIT(PLR_FLAGS(d->character),
 		     PLR_WRITING | PLR_MAILING | PLR_CRYO);
 	  REMOVE_BIT(AFF_FLAGS(d->character), AFF_GROUP);
-	  SEND_TO_Q("Password: ", d);
+	  write_to_output(d, "Password: ");
 	  echo_off(d);
 	  d->idle_tics = 0;
 	  STATE(d) = CON_PASSWORD;
@@ -1349,50 +1335,44 @@ void nanny(struct descriptor_data *d, ch
 
 	/* Check for multiple creations of a character. */
 	if (!Valid_Name(tmp_name)) {
-	  SEND_TO_Q("Invalid name, please try another.\r\nName: ", d);
+	  write_to_output(d, "Invalid name, please try another.\r\nName: ");
 	  return;
 	}
 	CREATE(d->character->player.name, char, strlen(tmp_name) + 1);
-	strcpy(d->character->player.name, CAP(tmp_name));
+	strcpy(d->character->player.name, CAP(tmp_name));	/* strcpy: OK (size checked above) */
 
-	sprintf(buf, "Did I get that right, %s (Y/N)? ", tmp_name);
-	SEND_TO_Q(buf, d);
+	write_to_output(d, "Did I get that right, %s (Y/N)? ", tmp_name);
 	STATE(d) = CON_NAME_CNFRM;
       }
     }
     break;
+
   case CON_NAME_CNFRM:		/* wait for conf. of new name    */
     if (UPPER(*arg) == 'Y') {
       if (isbanned(d->host) >= BAN_NEW) {
-	sprintf(buf, "Request for new char %s denied from [%s] (siteban)",
-		GET_PC_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
-	SEND_TO_Q("Sorry, new characters are not allowed from your site!\r\n", d);
+	mudlog(NRM, LVL_GOD, TRUE, "Request for new char %s denied from [%s] (siteban)", GET_PC_NAME(d->character), d->host);
+	write_to_output(d, "Sorry, new characters are not allowed from your site!\r\n");
 	STATE(d) = CON_CLOSE;
 	return;
       }
       if (circle_restrict) {
-	SEND_TO_Q("Sorry, new players can't be created at the moment.\r\n", d);
-	sprintf(buf, "Request for new char %s denied from [%s] (wizlock)",
-		GET_PC_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	write_to_output(d, "Sorry, new players can't be created at the moment.\r\n");
+	mudlog(NRM, LVL_GOD, TRUE, "Request for new char %s denied from [%s] (wizlock)", GET_PC_NAME(d->character), d->host);
 	STATE(d) = CON_CLOSE;
 	return;
       }
-      SEND_TO_Q("New character.\r\n", d);
-      sprintf(buf, "Give me a password for %s: ", GET_PC_NAME(d->character));
-      SEND_TO_Q(buf, d);
+      write_to_output(d, "New character.\r\nGive me a password for %s: ", GET_PC_NAME(d->character));
       echo_off(d);
       STATE(d) = CON_NEWPASSWD;
     } else if (*arg == 'n' || *arg == 'N') {
-      SEND_TO_Q("Okay, what IS it, then? ", d);
+      write_to_output(d, "Okay, what IS it, then? ");
       free(d->character->player.name);
       d->character->player.name = NULL;
       STATE(d) = CON_GET_NAME;
-    } else {
-      SEND_TO_Q("Please type Yes or No: ", d);
-    }
+    } else
+      write_to_output(d, "Please type Yes or No: ");
     break;
+
   case CON_PASSWORD:		/* get pwd for known player      */
     /*
      * To really prevent duping correctly, the player's record should
@@ -1407,21 +1387,20 @@ void nanny(struct descriptor_data *d, ch
     echo_on(d);    /* turn echo back on */
 
     /* New echo_on() eats the return on telnet. Extra space better than none. */
-    SEND_TO_Q("\r\n", d);
+    write_to_output(d, "\r\n");
 
     if (!*arg)
       STATE(d) = CON_CLOSE;
     else {
       if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
-	sprintf(buf, "Bad PW: %s [%s]", GET_NAME(d->character), d->host);
-	mudlog(buf, BRF, LVL_GOD, TRUE);
+	mudlog(BRF, LVL_GOD, TRUE, "Bad PW: %s [%s]", GET_NAME(d->character), d->host);
 	GET_BAD_PWS(d->character)++;
 	save_char(d->character);
 	if (++(d->bad_pws) >= max_bad_pws) {	/* 3 strikes and you're out. */
-	  SEND_TO_Q("Wrong password... disconnecting.\r\n", d);
+	  write_to_output(d, "Wrong password... disconnecting.\r\n");
 	  STATE(d) = CON_CLOSE;
 	} else {
-	  SEND_TO_Q("Wrong password.\r\nPassword: ", d);
+	  write_to_output(d, "Wrong password.\r\nPassword: ");
 	  echo_off(d);
 	}
 	return;
@@ -1434,19 +1413,15 @@ void nanny(struct descriptor_data *d, ch
 
       if (isbanned(d->host) == BAN_SELECT &&
 	  !PLR_FLAGGED(d->character, PLR_SITEOK)) {
-	SEND_TO_Q("Sorry, this char has not been cleared for login from your site!\r\n", d);
+	write_to_output(d, "Sorry, this char has not been cleared for login from your site!\r\n");
 	STATE(d) = CON_CLOSE;
-	sprintf(buf, "Connection attempt for %s denied from %s",
-		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(NRM, LVL_GOD, TRUE, "Connection attempt for %s denied from %s", GET_NAME(d->character), d->host);
 	return;
       }
       if (GET_LEVEL(d->character) < circle_restrict) {
-	SEND_TO_Q("The game is temporarily restricted.. try again later.\r\n", d);
+	write_to_output(d, "The game is temporarily restricted.. try again later.\r\n");
 	STATE(d) = CON_CLOSE;
-	sprintf(buf, "Request for login denied for %s [%s] (wizlock)",
-		GET_NAME(d->character), d->host);
-	mudlog(buf, NRM, LVL_GOD, TRUE);
+	mudlog(NRM, LVL_GOD, TRUE, "Request for login denied for %s [%s] (wizlock)", GET_NAME(d->character), d->host);
 	return;
       }
       /* check and make sure no other copies of this player are logged in */
@@ -1454,22 +1429,20 @@ void nanny(struct descriptor_data *d, ch
 	return;
 
       if (GET_LEVEL(d->character) >= LVL_IMMORT)
-	SEND_TO_Q(imotd, d);
+	write_to_output(d, "%s", imotd);
       else
-	SEND_TO_Q(motd, d);
+	write_to_output(d, "%s", motd);
 
-      sprintf(buf, "%s [%s] has connected.", GET_NAME(d->character), d->host);
-      mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE);
+      mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has connected.", GET_NAME(d->character), d->host);
 
       if (load_result) {
-	sprintf(buf, "\r\n\r\n\007\007\007"
+        write_to_output(d, "\r\n\r\n\007\007\007"
 		"%s%d LOGIN FAILURE%s SINCE LAST SUCCESSFUL LOGIN.%s\r\n",
 		CCRED(d->character, C_SPR), load_result,
 		(load_result > 1) ? "S" : "", CCNRM(d->character, C_SPR));
-	SEND_TO_Q(buf, d);
 	GET_BAD_PWS(d->character) = 0;
       }
-      SEND_TO_Q("\r\n*** PRESS RETURN: ", d);
+      write_to_output(d, "\r\n*** PRESS RETURN: ");
       STATE(d) = CON_RMOTD;
     }
     break;
@@ -1478,27 +1451,24 @@ void nanny(struct descriptor_data *d, ch
   case CON_CHPWD_GETNEW:
     if (!*arg || strlen(arg) > MAX_PWD_LENGTH || strlen(arg) < 3 ||
 	!str_cmp(arg, GET_PC_NAME(d->character))) {
-      SEND_TO_Q("\r\nIllegal password.\r\n", d);
-      SEND_TO_Q("Password: ", d);
+      write_to_output(d, "\r\nIllegal password.\r\nPassword: ");
       return;
     }
-    strncpy(GET_PASSWD(d->character), CRYPT(arg, GET_PC_NAME(d->character)), MAX_PWD_LENGTH);
+    strncpy(GET_PASSWD(d->character), CRYPT(arg, GET_PC_NAME(d->character)), MAX_PWD_LENGTH);	/* strncpy: OK (G_P:MAX_PWD_LENGTH+1) */
     *(GET_PASSWD(d->character) + MAX_PWD_LENGTH) = '\0';
 
-    SEND_TO_Q("\r\nPlease retype password: ", d);
+    write_to_output(d, "\r\nPlease retype password: ");
     if (STATE(d) == CON_NEWPASSWD)
       STATE(d) = CON_CNFPASSWD;
     else
       STATE(d) = CON_CHPWD_VRFY;
-
     break;
 
   case CON_CNFPASSWD:
   case CON_CHPWD_VRFY:
     if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character),
 		MAX_PWD_LENGTH)) {
-      SEND_TO_Q("\r\nPasswords don't match... start over.\r\n", d);
-      SEND_TO_Q("Password: ", d);
+      write_to_output(d, "\r\nPasswords don't match... start over.\r\nPassword: ");
       if (STATE(d) == CON_CNFPASSWD)
 	STATE(d) = CON_NEWPASSWD;
       else
@@ -1508,15 +1478,13 @@ void nanny(struct descriptor_data *d, ch
     echo_on(d);
 
     if (STATE(d) == CON_CNFPASSWD) {
-      SEND_TO_Q("\r\nWhat is your sex (M/F)? ", d);
+      write_to_output(d, "\r\nWhat is your sex (M/F)? ");
       STATE(d) = CON_QSEX;
     } else {
       save_char(d->character);
-      SEND_TO_Q("\r\nDone.\r\n", d);
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "\r\nDone.\r\n%s", MENU);
       STATE(d) = CON_MENU;
     }
-
     break;
 
   case CON_QSEX:		/* query sex of new user         */
@@ -1530,20 +1498,19 @@ void nanny(struct descriptor_data *d, ch
       d->character->player.sex = SEX_FEMALE;
       break;
     default:
-      SEND_TO_Q("That is not a sex..\r\n"
-		"What IS your sex? ", d);
+      write_to_output(d, "That is not a sex..\r\n"
+		"What IS your sex? ");
       return;
     }
 
-    SEND_TO_Q(class_menu, d);
-    SEND_TO_Q("\r\nClass: ", d);
+    write_to_output(d, "%s\r\nClass: ", class_menu);
     STATE(d) = CON_QCLASS;
     break;
 
   case CON_QCLASS:
     load_result = parse_class(*arg);
     if (load_result == CLASS_UNDEFINED) {
-      SEND_TO_Q("\r\nThat's not a class.\r\nClass: ", d);
+      write_to_output(d, "\r\nThat's not a class.\r\nClass: ");
       return;
     } else
       GET_CLASS(d->character) = load_result;
@@ -1553,23 +1520,23 @@ void nanny(struct descriptor_data *d, ch
     /* Now GET_NAME() will work properly. */
     init_char(d->character);
     save_char(d->character);
-    SEND_TO_Q(motd, d);
-    SEND_TO_Q("\r\n*** PRESS RETURN: ", d);
+    write_to_output(d, "%s\r\n*** PRESS RETURN: ", motd);
     STATE(d) = CON_RMOTD;
 
-    sprintf(buf, "%s [%s] new player.", GET_NAME(d->character), d->host);
-    mudlog(buf, NRM, LVL_IMMORT, TRUE);
+    mudlog(NRM, LVL_IMMORT, TRUE, "%s [%s] new player.", GET_NAME(d->character), d->host);
     break;
 
   case CON_RMOTD:		/* read CR after printing motd   */
-    SEND_TO_Q(MENU, d);
+    write_to_output(d, "%s", MENU);
     STATE(d) = CON_MENU;
     break;
 
-  case CON_MENU:		/* get selection from main menu  */
+  case CON_MENU: {		/* get selection from main menu  */
+    room_vnum load_room;
+
     switch (*arg) {
     case '0':
-      SEND_TO_Q("Goodbye.\r\n", d);
+      write_to_output(d, "Goodbye.\r\n");
       STATE(d) = CON_CLOSE;
       break;
 
@@ -1598,7 +1565,7 @@ void nanny(struct descriptor_data *d, ch
       if (PLR_FLAGGED(d->character, PLR_FROZEN))
 	load_room = r_frozen_start_room;
 
-      send_to_char(WELC_MESSG, d->character);
+      send_to_char(d->character, "%s", WELC_MESSG);
       d->character->next = character_list;
       character_list = d->character;
       char_to_room(d->character, load_room);
@@ -1614,28 +1581,26 @@ void nanny(struct descriptor_data *d, ch
       STATE(d) = CON_PLAYING;
       if (GET_LEVEL(d->character) == 0) {
 	do_start(d->character);
-	send_to_char(START_MESSG, d->character);
+	send_to_char(d->character, "%s", START_MESSG);
       }
       look_at_room(d->character, 0);
       if (has_mail(GET_IDNUM(d->character)))
-	send_to_char("You have mail waiting.\r\n", d->character);
+	send_to_char(d->character, "You have mail waiting.\r\n");
       if (load_result == 2) {	/* rented items lost */
-	send_to_char("\r\n\007You could not afford your rent!\r\n"
-	  "Your possesions have been donated to the Salvation Army!\r\n",
-		     d->character);
+	send_to_char(d->character, "\r\n\007You could not afford your rent!\r\n"
+		"Your possesions have been donated to the Salvation Army!\r\n");
       }
       d->has_prompt = 0;
       break;
 
     case '2':
       if (d->character->player.description) {
-	SEND_TO_Q("Old description:\r\n", d);
-	SEND_TO_Q(d->character->player.description, d);
+	write_to_output(d, "Old description:\r\n%s", d->character->player.description);
 	free(d->character->player.description);
 	d->character->player.description = NULL;
       }
-      SEND_TO_Q("Enter the new text you'd like others to see when they look at you.\r\n", d);
-      SEND_TO_Q("Terminate with a '@' on a new line.\r\n", d);
+      write_to_output(d, "Enter the new text you'd like others to see when they look at you.\r\n"
+		"Terminate with a '@' on a new line.\r\n");
       d->str = &d->character->player.description;
       d->max_str = EXDSCR_LENGTH;
       STATE(d) = CON_EXDESC;
@@ -1647,33 +1612,31 @@ void nanny(struct descriptor_data *d, ch
       break;
 
     case '4':
-      SEND_TO_Q("\r\nEnter your old password: ", d);
+      write_to_output(d, "\r\nEnter your old password: ");
       echo_off(d);
       STATE(d) = CON_CHPWD_GETOLD;
       break;
 
     case '5':
-      SEND_TO_Q("\r\nEnter your password for verification: ", d);
+      write_to_output(d, "\r\nEnter your password for verification: ");
       echo_off(d);
       STATE(d) = CON_DELCNF1;
       break;
 
     default:
-      SEND_TO_Q("\r\nThat's not a menu choice!\r\n", d);
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "\r\nThat's not a menu choice!\r\n%s", MENU);
       break;
     }
-
     break;
+  }
 
   case CON_CHPWD_GETOLD:
     if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
       echo_on(d);
-      SEND_TO_Q("\r\nIncorrect password.\r\n", d);
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "\r\nIncorrect password.\r\n%s", MENU);
       STATE(d) = CON_MENU;
     } else {
-      SEND_TO_Q("\r\nEnter a new password: ", d);
+      write_to_output(d, "\r\nEnter a new password: ");
       STATE(d) = CON_CHPWD_GETNEW;
     }
     return;
@@ -1681,13 +1644,12 @@ void nanny(struct descriptor_data *d, ch
   case CON_DELCNF1:
     echo_on(d);
     if (strncmp(CRYPT(arg, GET_PASSWD(d->character)), GET_PASSWD(d->character), MAX_PWD_LENGTH)) {
-      SEND_TO_Q("\r\nIncorrect password.\r\n", d);
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "\r\nIncorrect password.\r\n%s", MENU);
       STATE(d) = CON_MENU;
     } else {
-      SEND_TO_Q("\r\nYOU ARE ABOUT TO DELETE THIS CHARACTER PERMANENTLY.\r\n"
+      write_to_output(d, "\r\nYOU ARE ABOUT TO DELETE THIS CHARACTER PERMANENTLY.\r\n"
 		"ARE YOU ABSOLUTELY SURE?\r\n\r\n"
-		"Please type \"yes\" to confirm: ", d);
+		"Please type \"yes\" to confirm: ");
       STATE(d) = CON_DELCNF2;
     }
     break;
@@ -1695,8 +1657,8 @@ void nanny(struct descriptor_data *d, ch
   case CON_DELCNF2:
     if (!strcmp(arg, "yes") || !strcmp(arg, "YES")) {
       if (PLR_FLAGGED(d->character, PLR_FROZEN)) {
-	SEND_TO_Q("You try to kill yourself, but the ice stops you.\r\n", d);
-	SEND_TO_Q("Character not deleted.\r\n\r\n", d);
+	write_to_output(d, "You try to kill yourself, but the ice stops you.\r\n"
+		"Character not deleted.\r\n\r\n");
 	STATE(d) = CON_CLOSE;
 	return;
       }
@@ -1704,17 +1666,13 @@ void nanny(struct descriptor_data *d, ch
 	SET_BIT(PLR_FLAGS(d->character), PLR_DELETED);
       save_char(d->character);
       Crash_delete_file(GET_NAME(d->character));
-      sprintf(buf, "Character '%s' deleted!\r\n"
+      write_to_output(d, "Character '%s' deleted!\r\n"
 	      "Goodbye.\r\n", GET_NAME(d->character));
-      SEND_TO_Q(buf, d);
-      sprintf(buf, "%s (lev %d) has self-deleted.", GET_NAME(d->character),
-	      GET_LEVEL(d->character));
-      mudlog(buf, NRM, LVL_GOD, TRUE);
+      mudlog(NRM, LVL_GOD, TRUE, "%s (lev %d) has self-deleted.", GET_NAME(d->character), GET_LEVEL(d->character));
       STATE(d) = CON_CLOSE;
       return;
     } else {
-      SEND_TO_Q("\r\nCharacter not deleted.\r\n", d);
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "\r\nCharacter not deleted.\r\n%s", MENU);
       STATE(d) = CON_MENU;
     }
     break;
Index: src/licheck
===================================================================
RCS file: /home/circledb/.cvs/circle/src/licheck,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- src/licheck	1997/10/29 05:16:27	1.2
+++ src/licheck	2002/01/16 21:47:46	1.3
@@ -13,7 +13,7 @@ it in the future.
 Press return to read the license.
 EOF
 read temp
-cat ../doc/license.doc | $1
+cat ../doc/license.txt | $1
 echo
 echo Press return to ACCEPT the terms of this license.
 echo Press Control-C if you DO NOT ACCEPT the terms of this license.
Index: src/limits.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/limits.c,v
retrieving revision 1.25
retrieving revision 1.31
diff -u -p -r1.25 -r1.31
--- src/limits.c	2002/01/13 21:46:14	1.25
+++ src/limits.c	2002/03/03 23:19:17	1.31
@@ -32,8 +32,8 @@ extern int min_wizlist_lev;
 extern int free_rent;
 
 /* local functions */
-int graf(int age, int p0, int p1, int p2, int p3, int p4, int p5, int p6);
-void check_autowiz(struct char_data *ch);
+int graf(int grafage, int p0, int p1, int p2, int p3, int p4, int p5, int p6);
+void run_autowiz(void);
 
 void Crash_rentsave(struct char_data *ch, int cost);
 int level_exp(int chclass, int level);
@@ -48,19 +48,19 @@ void reboot_wizlists(void);
 /* When age in 45..59 calculate the line between p3 & p4 */
 /* When age in 60..79 calculate the line between p4 & p5 */
 /* When age >= 80 return the value p6 */
-int graf(int age, int p0, int p1, int p2, int p3, int p4, int p5, int p6)
+int graf(int grafage, int p0, int p1, int p2, int p3, int p4, int p5, int p6)
 {
 
-  if (age < 15)
+  if (grafage < 15)
     return (p0);					/* < 15   */
-  else if (age <= 29)
-    return (p1 + (((age - 15) * (p2 - p1)) / 15));	/* 15..29 */
-  else if (age <= 44)
-    return (p2 + (((age - 30) * (p3 - p2)) / 15));	/* 30..44 */
-  else if (age <= 59)
-    return (p3 + (((age - 45) * (p4 - p3)) / 15));	/* 45..59 */
-  else if (age <= 79)
-    return (p4 + (((age - 60) * (p5 - p4)) / 20));	/* 60..79 */
+  else if (grafage <= 29)
+    return (p1 + (((grafage - 15) * (p2 - p1)) / 15));	/* 15..29 */
+  else if (grafage <= 44)
+    return (p2 + (((grafage - 30) * (p3 - p2)) / 15));	/* 30..44 */
+  else if (grafage <= 59)
+    return (p3 + (((grafage - 45) * (p4 - p3)) / 15));	/* 45..59 */
+  else if (grafage <= 79)
+    return (p4 + (((grafage - 60) * (p5 - p4)) / 20));	/* 60..79 */
   else
     return (p6);					/* >= 80 */
 }
@@ -218,27 +218,32 @@ void set_title(struct char_data *ch, cha
   if (GET_TITLE(ch) != NULL)
     free(GET_TITLE(ch));
 
-  GET_TITLE(ch) = str_dup(title);
+  GET_TITLE(ch) = strdup(title);
 }
 
 
-void check_autowiz(struct char_data *ch)
+void run_autowiz(void)
 {
 #if defined(CIRCLE_UNIX) || defined(CIRCLE_WINDOWS)
-  if (use_autowiz && GET_LEVEL(ch) >= LVL_IMMORT) {
-    char buf[128];
+  if (use_autowiz) {
+    size_t res;
+    char buf[256];
 
 #if defined(CIRCLE_UNIX)
-    sprintf(buf, "nice ../bin/autowiz %d %s %d %s %d &", min_wizlist_lev,
-	    WIZLIST_FILE, LVL_IMMORT, IMMLIST_FILE, (int) getpid());
+    res = snprintf(buf, sizeof(buf), "nice ../bin/autowiz %d %s %d %s %d &",
+	min_wizlist_lev, WIZLIST_FILE, LVL_IMMORT, IMMLIST_FILE, (int) getpid());
 #elif defined(CIRCLE_WINDOWS)
-    sprintf(buf, "autowiz %d %s %d %s", min_wizlist_lev,
-	    WIZLIST_FILE, LVL_IMMORT, IMMLIST_FILE);
+    res = snprintf(buf, sizeof(buf), "autowiz %d %s %d %s",
+	min_wizlist_lev, WIZLIST_FILE, LVL_IMMORT, IMMLIST_FILE);
 #endif /* CIRCLE_WINDOWS */
 
-    mudlog("Initiating autowiz.", CMP, LVL_IMMORT, FALSE);
-    system(buf);
-    reboot_wizlists();
+    /* Abusing signed -> unsigned conversion to avoid '-1' check. */
+    if (res < sizeof(buf)) {
+      mudlog(CMP, LVL_IMMORT, FALSE, "Initiating autowiz.");
+      system(buf);
+      reboot_wizlists();
+    } else
+      log("Cannot run autowiz: command-line doesn't fit in buffer.");
   }
 #endif /* CIRCLE_UNIX || CIRCLE_WINDOWS */
 }
@@ -249,7 +254,6 @@ void gain_exp(struct char_data *ch, int 
 {
   int is_altered = FALSE;
   int num_levels = 0;
-  char buf[128];
 
   if (!IS_NPC(ch) && ((GET_LEVEL(ch) < 1 || GET_LEVEL(ch) >= LVL_IMMORT)))
     return;
@@ -270,18 +274,15 @@ void gain_exp(struct char_data *ch, int 
     }
 
     if (is_altered) {
-      sprintf(buf, "%s advanced %d level%s to level %d.",
-		GET_NAME(ch), num_levels, num_levels == 1 ? "" : "s",
-		GET_LEVEL(ch));
-      mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s advanced %d level%s to level %d.",
+		GET_NAME(ch), num_levels, num_levels == 1 ? "" : "s", GET_LEVEL(ch));
       if (num_levels == 1)
-        send_to_char("You rise a level!\r\n", ch);
-      else {
-	sprintf(buf, "You rise %d levels!\r\n", num_levels);
-	send_to_char(buf, ch);
-      }
+        send_to_char(ch, "You rise a level!\r\n");
+      else
+	send_to_char(ch, "You rise %d levels!\r\n", num_levels);
       set_title(ch, NULL);
-      check_autowiz(ch);
+      if (GET_LEVEL(ch) >= LVL_IMMORT)
+        run_autowiz();
     }
   } else if (gain < 0) {
     gain = MAX(-max_exp_loss, gain);	/* Cap max exp lost per death */
@@ -311,18 +312,15 @@ void gain_exp_regardless(struct char_dat
     }
 
     if (is_altered) {
-      sprintf(buf, "%s advanced %d level%s to level %d.",
-		GET_NAME(ch), num_levels, num_levels == 1 ? "" : "s",
-		GET_LEVEL(ch));
-      mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s advanced %d level%s to level %d.",
+		GET_NAME(ch), num_levels, num_levels == 1 ? "" : "s", GET_LEVEL(ch));
       if (num_levels == 1)
-        send_to_char("You rise a level!\r\n", ch);
-      else {
-	sprintf(buf, "You rise %d levels!\r\n", num_levels);
-	send_to_char(buf, ch);
-      }
+        send_to_char(ch, "You rise a level!\r\n");
+      else
+	send_to_char(ch, "You rise %d levels!\r\n", num_levels);
       set_title(ch, NULL);
-      check_autowiz(ch);
+      if (GET_LEVEL(ch) >= LVL_IMMORT)
+        run_autowiz();
     }
   }
 }
@@ -347,14 +345,14 @@ void gain_condition(struct char_data *ch
 
   switch (condition) {
   case FULL:
-    send_to_char("You are hungry.\r\n", ch);
+    send_to_char(ch, "You are hungry.\r\n");
     return;
   case THIRST:
-    send_to_char("You are thirsty.\r\n", ch);
+    send_to_char(ch, "You are thirsty.\r\n");
     return;
   case DRUNK:
     if (intoxicated)
-      send_to_char("You are now sober.\r\n", ch);
+      send_to_char(ch, "You are now sober.\r\n");
     return;
   default:
     break;
@@ -373,7 +371,7 @@ void check_idling(struct char_data *ch)
 	stop_fighting(ch);
       }
       act("$n disappears into the void.", TRUE, ch, 0, 0, TO_ROOM);
-      send_to_char("You have been idle, and are pulled into a void.\r\n", ch);
+      send_to_char(ch, "You have been idle, and are pulled into a void.\r\n");
       save_char(ch);
       Crash_crashsave(ch);
       char_from_room(ch);
@@ -395,8 +393,7 @@ void check_idling(struct char_data *ch)
 	Crash_rentsave(ch, 0);
       else
 	Crash_idlesave(ch);
-      sprintf(buf, "%s force-rented and extracted (idle).", GET_NAME(ch));
-      mudlog(buf, CMP, LVL_GOD, TRUE);
+      mudlog(CMP, LVL_GOD, TRUE, "%s force-rented and extracted (idle).", GET_NAME(ch));
       extract_char(ch);
     }
   }
Index: src/magic.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/magic.c,v
retrieving revision 1.31
retrieving revision 1.35
diff -u -p -r1.31 -r1.35
--- src/magic.c	2001/10/02 00:20:02	1.31
+++ src/magic.c	2002/02/01 02:04:17	1.35
@@ -31,7 +31,6 @@ extern struct spell_info_type spell_info
 byte saving_throws(int class_num, int type, int level); /* class.c */
 void clearMemory(struct char_data *ch);
 void weight_change_object(struct obj_data *obj, int weight);
-void add_follower(struct char_data *ch, struct char_data *leader);
 
 /* local functions */
 int mag_materials(struct char_data *ch, int item0, int item1, int item2, int extract, int verbose);
@@ -65,7 +64,7 @@ int mag_savingthrow(struct char_data *ch
   save += modifier;
 
   /* Throwing a 0 is always a failure. */
-  if (MAX(1, save) < number(0, 99))
+  if (MAX(1, save) < rand_number(0, 99))
     return (TRUE);
 
   /* Oops, failed. Sorry. */
@@ -90,10 +89,8 @@ void affect_update(void)
 	if ((af->type > 0) && (af->type <= MAX_SPELLS))
 	  if (!af->next || (af->next->type != af->type) ||
 	      (af->next->duration > 0))
-	    if (spell_info[af->type].wear_off_msg) {
-	      send_to_char(spell_info[af->type].wear_off_msg, i);
-	      send_to_char("\r\n", i);
-	    }
+	    if (spell_info[af->type].wear_off_msg)
+	      send_to_char(i, "%s\r\n", spell_info[af->type].wear_off_msg);
 	affect_remove(i, af);
       }
     }
@@ -128,15 +125,15 @@ int mag_materials(struct char_data *ch, 
   }
   if ((item0 > 0) || (item1 > 0) || (item2 > 0)) {
     if (verbose) {
-      switch (number(0, 2)) {
+      switch (rand_number(0, 2)) {
       case 0:
-	send_to_char("A wart sprouts on your nose.\r\n", ch);
+	send_to_char(ch, "A wart sprouts on your nose.\r\n");
 	break;
       case 1:
-	send_to_char("Your hair falls out in clumps.\r\n", ch);
+	send_to_char(ch, "Your hair falls out in clumps.\r\n");
 	break;
       case 2:
-	send_to_char("A huge corn develops on your big toe.\r\n", ch);
+	send_to_char(ch, "A huge corn develops on your big toe.\r\n");
 	break;
       }
     }
@@ -151,7 +148,7 @@ int mag_materials(struct char_data *ch, 
       extract_obj(obj2);
   }
   if (verbose) {
-    send_to_char("A puff of smoke rises from your pack.\r\n", ch);
+    send_to_char(ch, "A puff of smoke rises from your pack.\r\n");
     act("A puff of smoke rises from $n's pack.", TRUE, ch, NULL, NULL, TO_ROOM);
   }
   return (TRUE);
@@ -335,7 +332,7 @@ void mag_affects(int level, struct char_
 
   case SPELL_BLINDNESS:
     if (MOB_FLAGGED(victim,MOB_NOBLIND) || mag_savingthrow(victim, savetype, 0)) {
-      send_to_char("You fail.\r\n", ch);
+      send_to_char(ch, "You fail.\r\n");
       return;
     }
 
@@ -355,7 +352,7 @@ void mag_affects(int level, struct char_
 
   case SPELL_CURSE:
     if (mag_savingthrow(victim, savetype, 0)) {
-      send_to_char(NOEFFECT, ch);
+      send_to_char(ch, "%s", NOEFFECT);
       return;
     }
 
@@ -419,7 +416,7 @@ void mag_affects(int level, struct char_
 
   case SPELL_POISON:
     if (mag_savingthrow(victim, savetype, 0)) {
-      send_to_char(NOEFFECT, ch);
+      send_to_char(ch, "%s", NOEFFECT);
       return;
     }
 
@@ -459,7 +456,7 @@ void mag_affects(int level, struct char_
     af[0].bitvector = AFF_SLEEP;
 
     if (GET_POS(victim) > POS_SLEEPING) {
-      send_to_char("You feel very sleepy...  Zzzz......\r\n", victim);
+      send_to_char(victim, "You feel very sleepy...  Zzzz......\r\n");
       act("$n goes to sleep.", TRUE, victim, 0, 0, TO_ROOM);
       GET_POS(victim) = POS_SLEEPING;
     }
@@ -500,7 +497,7 @@ void mag_affects(int level, struct char_
   if (IS_NPC(victim) && !affected_by_spell(victim, spellnum))
     for (i = 0; i < MAX_SPELL_AFFECTS; i++)
       if (AFF_FLAGGED(victim, af[i].bitvector)) {
-	send_to_char(NOEFFECT, ch);
+	send_to_char(ch, "%s", NOEFFECT);
 	return;
       }
 
@@ -509,7 +506,7 @@ void mag_affects(int level, struct char_
    * not have an accumulative effect, then fail the spell.
    */
   if (affected_by_spell(victim,spellnum) && !(accum_duration||accum_affect)) {
-    send_to_char(NOEFFECT, ch);
+    send_to_char(ch, "%s", NOEFFECT);
     return;
   }
 
@@ -738,7 +735,7 @@ void mag_summons(int level, struct char_
   switch (spellnum) {
   case SPELL_CLONE:
     msg = 10;
-    fmsg = number(2, 6);	/* Random fail message. */
+    fmsg = rand_number(2, 6);	/* Random fail message. */
     mob_num = MOB_CLONE;
     pfail = 50;	/* 50% failure, should be based on something later. */
     break;
@@ -750,7 +747,7 @@ void mag_summons(int level, struct char_
     }
     handle_corpse = TRUE;
     msg = 11;
-    fmsg = number(2, 6);	/* Random fail message. */
+    fmsg = rand_number(2, 6);	/* Random fail message. */
     mob_num = MOB_ZOMBIE;
     pfail = 10;	/* 10% failure, should vary in the future. */
     break;
@@ -760,25 +757,26 @@ void mag_summons(int level, struct char_
   }
 
   if (AFF_FLAGGED(ch, AFF_CHARM)) {
-    send_to_char("You are too giddy to have any followers!\r\n", ch);
+    send_to_char(ch, "You are too giddy to have any followers!\r\n");
     return;
   }
-  if (number(0, 101) < pfail) {
-    send_to_char(mag_summon_fail_msgs[fmsg], ch);
+  if (rand_number(0, 101) < pfail) {
+    send_to_char(ch, "%s", mag_summon_fail_msgs[fmsg]);
     return;
   }
   for (i = 0; i < num; i++) {
     if (!(mob = read_mobile(mob_num, VIRTUAL))) {
-      send_to_char("You don't quite remember how to make that creature.\r\n", ch);
+      send_to_char(ch, "You don't quite remember how to make that creature.\r\n");
       return;
     }
     char_to_room(mob, IN_ROOM(ch));
     IS_CARRYING_W(mob) = 0;
     IS_CARRYING_N(mob) = 0;
     SET_BIT(AFF_FLAGS(mob), AFF_CHARM);
-    if (spellnum == SPELL_CLONE) {	/* Don't mess up the proto with strcpy. */
-      mob->player.name = str_dup(GET_NAME(ch));
-      mob->player.short_descr = str_dup(GET_NAME(ch));
+    if (spellnum == SPELL_CLONE) {
+      /* Don't mess up the prototype; use new string copies. */
+      mob->player.name = strdup(GET_NAME(ch));
+      mob->player.short_descr = strdup(GET_NAME(ch));
     }
     act(mag_summon_msgs[msg], FALSE, ch, 0, mob, TO_ROOM);
     add_follower(mob, ch);
@@ -805,15 +803,15 @@ void mag_points(int level, struct char_d
   switch (spellnum) {
   case SPELL_CURE_LIGHT:
     healing = dice(1, 8) + 1 + (level / 4);
-    send_to_char("You feel better.\r\n", victim);
+    send_to_char(victim, "You feel better.\r\n");
     break;
   case SPELL_CURE_CRITIC:
     healing = dice(3, 8) + 3 + (level / 4);
-    send_to_char("You feel a lot better!\r\n", victim);
+    send_to_char(victim, "You feel a lot better!\r\n");
     break;
   case SPELL_HEAL:
     healing = 100 + dice(3, 8);
-    send_to_char("A warm feeling floods your body.\r\n", victim);
+    send_to_char(victim, "A warm feeling floods your body.\r\n");
     break;
   }
   GET_HIT(victim) = MIN(GET_MAX_HIT(victim), GET_HIT(victim) + healing);
@@ -854,7 +852,7 @@ void mag_unaffects(int level, struct cha
 
   if (!affected_by_spell(victim, spell)) {
     if (spellnum != SPELL_HEAL)		/* 'cure blindness' message. */
-      send_to_char(NOEFFECT, ch);
+      send_to_char(ch, "%s", NOEFFECT);
     return;
   }
 
@@ -924,7 +922,7 @@ void mag_alter_objs(int level, struct ch
   }
 
   if (to_char == NULL)
-    send_to_char(NOEFFECT, ch);
+    send_to_char(ch, "%s", NOEFFECT);
   else
     act(to_char, TRUE, ch, obj, 0, TO_CHAR);
 
@@ -951,12 +949,12 @@ void mag_creations(int level, struct cha
     z = 10;
     break;
   default:
-    send_to_char("Spell unimplemented, it would seem.\r\n", ch);
+    send_to_char(ch, "Spell unimplemented, it would seem.\r\n");
     return;
   }
 
   if (!(tobj = read_object(z, VIRTUAL))) {
-    send_to_char("I seem to have goofed.\r\n", ch);
+    send_to_char(ch, "I seem to have goofed.\r\n");
     log("SYSERR: spell_creations, spell %d, obj %d: obj not found",
 	    spellnum, z);
     return;
Index: src/mail.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/mail.c,v
retrieving revision 1.17
retrieving revision 1.21
diff -u -p -r1.17 -r1.21
--- src/mail.c	2002/01/10 17:24:47	1.17
+++ src/mail.c	2002/04/09 14:12:15	1.21
@@ -324,7 +324,7 @@ void store_mail(long to, long from, char
   header.header_data.from = from;
   header.header_data.to = to;
   header.header_data.mail_time = time(0);
-  strncpy(header.txt, msg_txt, HEADER_BLOCK_DATASIZE);
+  strncpy(header.txt, msg_txt, HEADER_BLOCK_DATASIZE);	/* strncpy: OK (h.txt:HEADER_BLOCK_DATASIZE+1) */
   header.txt[HEADER_BLOCK_DATASIZE] = '\0';
 
   target_address = pop_free_list();	/* find next free block */
@@ -349,7 +349,7 @@ void store_mail(long to, long from, char
   /* now write the current data block */
   memset((char *) &data, 0, sizeof(data));	/* clear the record */
   data.block_type = LAST_BLOCK;
-  strncpy(data.txt, msg_txt, DATA_BLOCK_DATASIZE);
+  strncpy(data.txt, msg_txt, DATA_BLOCK_DATASIZE);	/* strncpy: OK (d.txt:DATA_BLOCK_DATASIZE+1) */
   data.txt[DATA_BLOCK_DATASIZE] = '\0';
   write_to_file(&data, BLOCK_SIZE, target_address);
   bytes_written += strlen(data.txt);
@@ -377,7 +377,7 @@ void store_mail(long to, long from, char
 
     /* now write the next block, assuming it's the last.  */
     data.block_type = LAST_BLOCK;
-    strncpy(data.txt, msg_txt, DATA_BLOCK_DATASIZE);
+    strncpy(data.txt, msg_txt, DATA_BLOCK_DATASIZE);	/* strncpy: OK (d.txt:DATA_BLOCK_DATASIZE+1) */
     data.txt[DATA_BLOCK_DATASIZE] = '\0';
     write_to_file(&data, BLOCK_SIZE, target_address);
 
@@ -402,9 +402,8 @@ char *read_delete(long recipient)
   mail_index_type *mail_pointer, *prev_mail;
   position_list_type *position_pointer;
   long mail_address, following_block;
-  char *message, *tmstr, buf[200];
+  char *tmstr, buf[MAX_MAIL_SIZE + 256];	/* + header */
   char *from, *to;
-  size_t string_size;
 
   if (recipient < 0) {
     log("SYSERR: Mail system -- non-fatal error #6. (recipient: %ld)", recipient);
@@ -458,17 +457,19 @@ char *read_delete(long recipient)
   from = get_name_by_id(header.header_data.from);
   to = get_name_by_id(recipient);
 
-  sprintf(buf, " * * * * Midgaard Mail System * * * *\r\n"
-	  "Date: %s\r\n"
-	  "  To: %s\r\n"
-	  "From: %s\r\n\r\n", tmstr, to ? to : "Unknown",
-	  from ? from : "Unknown");
-
-  string_size = (sizeof(char) * (strlen(buf) + strlen(header.txt) + 1));
-  CREATE(message, char, string_size);
-  strcpy(message, buf);
-  strcat(message, header.txt);
-  message[string_size - 1] = '\0';
+  snprintf(buf, sizeof(buf),
+	" * * * * Midgaard Mail System * * * *\r\n"
+	"Date: %s\r\n"
+	"  To: %s\r\n"
+	"From: %s\r\n"
+	"\r\n"
+	"%s",
+
+	tmstr,
+	to ? to : "Unknown",
+	from ? from : "Unknown",
+	header.txt
+	);
   following_block = header.header_data.next_block;
 
   /* mark the block as deleted */
@@ -479,10 +480,7 @@ char *read_delete(long recipient)
   while (following_block != LAST_BLOCK) {
     read_from_file(&data, BLOCK_SIZE, following_block);
 
-    string_size = (sizeof(char) * (strlen(message) + strlen(data.txt) + 1));
-    RECREATE(message, char, string_size);
-    strcat(message, data.txt);
-    message[string_size - 1] = '\0';
+    strcat(buf, data.txt);	/* strcat: OK (data.txt:DATA_BLOCK_DATASIZE < buf:MAX_MAIL_SIZE) */
     mail_address = following_block;
     following_block = data.block_type;
     data.block_type = DELETED_BLOCK;
@@ -490,7 +488,7 @@ char *read_delete(long recipient)
     push_free_list(mail_address);
   }
 
-  return (message);
+  return strdup(buf);
 }
 
 
@@ -508,7 +506,7 @@ SPECIAL(postmaster)
     return (0);
 
   if (no_mail) {
-    send_to_char("Sorry, the mail system is having technical difficulties.\r\n", ch);
+    send_to_char(ch, "Sorry, the mail system is having technical difficulties.\r\n");
     return (0);
   }
 
@@ -530,11 +528,10 @@ void postmaster_send_mail(struct char_da
 			  int cmd, char *arg)
 {
   long recipient;
-  char buf[MAX_INPUT_LENGTH], **write;
+  char buf[MAX_INPUT_LENGTH], **mailwrite;
 
   if (GET_LEVEL(ch) < MIN_MAIL_LEVEL) {
-    sprintf(buf, "$n tells you, 'Sorry, you have to be level %d to send mail!'",
-	    MIN_MAIL_LEVEL);
+    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, you have to be level %d to send mail!'", MIN_MAIL_LEVEL);
     act(buf, FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
@@ -546,7 +543,7 @@ void postmaster_send_mail(struct char_da
     return;
   }
   if (GET_GOLD(ch) < STAMP_PRICE) {
-    sprintf(buf, "$n tells you, 'A stamp costs %d coin%s.'\r\n"
+    snprintf(buf, sizeof(buf), "$n tells you, 'A stamp costs %d coin%s.'\r\n"
 	    "$n tells you, '...which I see you can't afford.'", STAMP_PRICE,
             STAMP_PRICE == 1 ? "" : "s");
     act(buf, FALSE, mailman, 0, ch, TO_VICT);
@@ -558,7 +555,7 @@ void postmaster_send_mail(struct char_da
     return;
   }
   act("$n starts to write some mail.", TRUE, ch, 0, 0, TO_ROOM);
-  sprintf(buf, "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
+  snprintf(buf, sizeof(buf), "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
        "$n tells you, 'Write your message, use @ on a new line when done.'",
 	  STAMP_PRICE);
 
@@ -567,21 +564,18 @@ void postmaster_send_mail(struct char_da
   SET_BIT(PLR_FLAGS(ch), PLR_MAILING);	/* string_write() sets writing. */
 
   /* Start writing! */
-  CREATE(write, char *, 1);
-  string_write(ch->desc, write, MAX_MAIL_SIZE, recipient, NULL);
+  CREATE(mailwrite, char *, 1);
+  string_write(ch->desc, mailwrite, MAX_MAIL_SIZE, recipient, NULL);
 }
 
 
 void postmaster_check_mail(struct char_data *ch, struct char_data *mailman,
 			  int cmd, char *arg)
 {
-  char buf[256];
-
   if (has_mail(GET_IDNUM(ch)))
-    sprintf(buf, "$n tells you, 'You have mail waiting.'");
+    act("$n tells you, 'You have mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
   else
-    sprintf(buf, "$n tells you, 'Sorry, you don't have any mail waiting.'");
-  act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    act("$n tells you, 'Sorry, you don't have any mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
 }
 
 
@@ -592,16 +586,16 @@ void postmaster_receive_mail(struct char
   struct obj_data *obj;
 
   if (!has_mail(GET_IDNUM(ch))) {
-    sprintf(buf, "$n tells you, 'Sorry, you don't have any mail waiting.'");
+    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, you don't have any mail waiting.'");
     act(buf, FALSE, mailman, 0, ch, TO_VICT);
     return;
   }
   while (has_mail(GET_IDNUM(ch))) {
     obj = create_obj();
     obj->item_number = NOTHING;
-    obj->name = str_dup("mail paper letter");
-    obj->short_description = str_dup("a piece of mail");
-    obj->description = str_dup("Someone has left a piece of mail here.");
+    obj->name = strdup("mail paper letter");
+    obj->short_description = strdup("a piece of mail");
+    obj->description = strdup("Someone has left a piece of mail here.");
 
     GET_OBJ_TYPE(obj) = ITEM_NOTE;
     GET_OBJ_WEAR(obj) = ITEM_WEAR_TAKE | ITEM_WEAR_HOLD;
@@ -612,7 +606,7 @@ void postmaster_receive_mail(struct char
 
     if (obj->action_description == NULL)
       obj->action_description =
-	str_dup("Mail system error - please report.  Error #11.\r\n");
+	strdup("Mail system error - please report.  Error #11.\r\n");
 
     obj_to_char(obj, ch);
 
Index: src/mobact.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/mobact.c,v
retrieving revision 1.18
retrieving revision 1.20
diff -u -p -r1.18 -r1.20
--- src/mobact.c	2001/10/20 21:15:49	1.18
+++ src/mobact.c	2002/04/09 14:12:15	1.20
@@ -68,7 +68,7 @@ void mobile_activity(void)
 
     /* Scavenger (picking up objects) */
     if (MOB_FLAGGED(ch, MOB_SCAVENGER))
-      if (world[IN_ROOM(ch)].contents && !number(0, 10)) {
+      if (world[IN_ROOM(ch)].contents && !rand_number(0, 10)) {
 	max = 1;
 	best_obj = NULL;
 	for (obj = world[IN_ROOM(ch)].contents; obj; obj = obj->next_content)
@@ -85,7 +85,7 @@ void mobile_activity(void)
 
     /* Mob Movement */
     if (!MOB_FLAGGED(ch, MOB_SENTINEL) && (GET_POS(ch) == POS_STANDING) &&
-	((door = number(0, 18)) < NUM_OF_DIRS) && CAN_GO(ch, door) &&
+	((door = rand_number(0, 18)) < NUM_OF_DIRS) && CAN_GO(ch, door) &&
 	!ROOM_FLAGGED(EXIT(ch, door)->to_room, ROOM_NOMOB | ROOM_DEATH) &&
 	(!MOB_FLAGGED(ch, MOB_STAY_ZONE) ||
 	 (world[EXIT(ch, door)->to_room].zone == world[IN_ROOM(ch)].zone))) {
@@ -262,12 +262,12 @@ bool aggressive_mob_on_a_leash(struct ch
     snarl_cmd = find_command("snarl");
 
   /* Sit. Down boy! HEEEEeeeel! */
-  dieroll = number(1, 20);
+  dieroll = rand_number(1, 20);
   if (dieroll != 1 && (dieroll == 20 || dieroll > 10 - GET_CHA(master) + GET_INT(slave))) {
-    if (snarl_cmd > 0 && attack && !number(0, 3)) {
+    if (snarl_cmd > 0 && attack && !rand_number(0, 3)) {
       char victbuf[MAX_NAME_LENGTH + 1];
 
-      strncpy(victbuf, GET_NAME(attack), sizeof(victbuf));
+      strncpy(victbuf, GET_NAME(attack), sizeof(victbuf));	/* strncpy: OK */
       victbuf[sizeof(victbuf) - 1] = '\0';
 
       do_action(slave, victbuf, snarl_cmd, 0);
Index: src/modify.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/modify.c,v
retrieving revision 1.26
retrieving revision 1.31
diff -u -p -r1.26 -r1.31
--- src/modify.c	2001/11/14 16:25:59	1.26
+++ src/modify.c	2002/04/09 14:12:15	1.31
@@ -96,7 +96,7 @@ void string_write(struct descriptor_data
     SET_BIT(PLR_FLAGS(d->character), PLR_WRITING);
 
   if (data)
-    mudlog("SYSERR: string_write: I don't understand special data.", BRF, LVL_IMMORT, TRUE);
+    mudlog(BRF, LVL_IMMORT, TRUE, "SYSERR: string_write: I don't understand special data.");
 
   d->str = writeto;
   d->max_str = len;
@@ -120,22 +120,22 @@ void string_add(struct descriptor_data *
 
   if (!(*d->str)) {
     if (strlen(str) + 3 > d->max_str) { /* \r\n\0 */
-      send_to_char("String too long - Truncated.\r\n", d->character);
-      strcpy(&str[d->max_str - 3], "\r\n");
+      send_to_char(d->character, "String too long - Truncated.\r\n");
+      strcpy(&str[d->max_str - 3], "\r\n");	/* strcpy: OK (size checked) */
       CREATE(*d->str, char, d->max_str);
-      strcpy(*d->str, str);
+      strcpy(*d->str, str);	/* strcpy: OK (size checked) */
       terminator = 1;
     } else {
       CREATE(*d->str, char, strlen(str) + 3);
-      strcpy(*d->str, str);
+      strcpy(*d->str, str);	/* strcpy: OK (size checked) */
     }
   } else {
     if (strlen(str) + strlen(*d->str) + 3 > d->max_str) { /* \r\n\0 */
-      send_to_char("String too long.  Last line skipped.\r\n", d->character);
+      send_to_char(d->character, "String too long.  Last line skipped.\r\n");
       terminator = 1;
     } else {
       RECREATE(*d->str, char, strlen(*d->str) + strlen(str) + 3); /* \r\n\0 */
-      strcat(*d->str, str);
+      strcat(*d->str, str);	/* strcat: OK (size precalculated) */
     }
   }
 
@@ -145,7 +145,7 @@ void string_add(struct descriptor_data *
       d->mail_to = 0;
       free(*d->str);
       free(d->str);
-      SEND_TO_Q("Message sent!\r\n", d);
+      write_to_output(d, "Message sent!\r\n");
       if (!IS_NPC(d->character))
 	REMOVE_BIT(PLR_FLAGS(d->character), PLR_MAILING | PLR_WRITING);
     }
@@ -156,13 +156,13 @@ void string_add(struct descriptor_data *
       d->mail_to = 0;
     }
     if (STATE(d) == CON_EXDESC) {
-      SEND_TO_Q(MENU, d);
+      write_to_output(d, "%s", MENU);
       STATE(d) = CON_MENU;
     }
     if (STATE(d) == CON_PLAYING && d->character && !IS_NPC(d->character))
       REMOVE_BIT(PLR_FLAGS(d->character), PLR_WRITING);
   } else
-    strcat(*d->str, "\r\n");
+    strcat(*d->str, "\r\n");	/* strcat: OK (size checked) */
 }
 
 
@@ -174,44 +174,40 @@ void string_add(struct descriptor_data *
 ACMD(do_skillset)
 {
   struct char_data *vict;
-  char name[MAX_INPUT_LENGTH], buf2[128];
+  char name[MAX_INPUT_LENGTH];
   char buf[MAX_INPUT_LENGTH], help[MAX_STRING_LENGTH];
   int skill, value, i, qend;
 
   argument = one_argument(argument, name);
 
   if (!*name) {			/* no arguments. print an informative text */
-    send_to_char("Syntax: skillset <name> '<skill>' <value>\r\n", ch);
-    strcpy(help, "Skill being one of the following:\r\n");
+    send_to_char(ch, "Syntax: skillset <name> '<skill>' <value>\r\n"
+		"Skill being one of the following:\r\n");
     for (qend = 0, i = 0; i <= TOP_SPELL_DEFINE; i++) {
       if (spell_info[i].name == unused_spellname)	/* This is valid. */
 	continue;
-      sprintf(help + strlen(help), "%18s", spell_info[i].name);
-      if (qend++ % 4 == 3) {
-	strcat(help, "\r\n");
-	send_to_char(help, ch);
-	*help = '\0';
-      }
+      send_to_char(ch, "%18s", spell_info[i].name);
+      if (qend++ % 4 == 3)
+	send_to_char(ch, "\r\n");
     }
-    if (*help)
-      send_to_char(help, ch);
-    send_to_char("\r\n", ch);
+    if (qend % 4 != 0)
+      send_to_char(ch, "\r\n");
     return;
   }
 
   if (!(vict = get_char_vis(ch, name, NULL, FIND_CHAR_WORLD))) {
-    send_to_char(NOPERSON, ch);
+    send_to_char(ch, "%s", NOPERSON);
     return;
   }
   skip_spaces(&argument);
 
   /* If there is no chars in argument */
   if (!*argument) {
-    send_to_char("Skill name expected.\r\n", ch);
+    send_to_char(ch, "Skill name expected.\r\n");
     return;
   }
   if (*argument != '\'') {
-    send_to_char("Skill must be enclosed in: ''\r\n", ch);
+    send_to_char(ch, "Skill must be enclosed in: ''\r\n");
     return;
   }
   /* Locate the last quote and lowercase the magic words (if any) */
@@ -220,33 +216,33 @@ ACMD(do_skillset)
     argument[qend] = LOWER(argument[qend]);
 
   if (argument[qend] != '\'') {
-    send_to_char("Skill must be enclosed in: ''\r\n", ch);
+    send_to_char(ch, "Skill must be enclosed in: ''\r\n");
     return;
   }
-  strcpy(help, (argument + 1));
+  strcpy(help, (argument + 1));	/* strcpy: OK (MAX_INPUT_LENGTH <= MAX_STRING_LENGTH) */
   help[qend - 1] = '\0';
   if ((skill = find_skill_num(help)) <= 0) {
-    send_to_char("Unrecognized skill.\r\n", ch);
+    send_to_char(ch, "Unrecognized skill.\r\n");
     return;
   }
   argument += qend + 1;		/* skip to next parameter */
   argument = one_argument(argument, buf);
 
   if (!*buf) {
-    send_to_char("Learned value expected.\r\n", ch);
+    send_to_char(ch, "Learned value expected.\r\n");
     return;
   }
   value = atoi(buf);
   if (value < 0) {
-    send_to_char("Minimum value for learned is 0.\r\n", ch);
+    send_to_char(ch, "Minimum value for learned is 0.\r\n");
     return;
   }
   if (value > 100) {
-    send_to_char("Max value for learned is 100.\r\n", ch);
+    send_to_char(ch, "Max value for learned is 100.\r\n");
     return;
   }
   if (IS_NPC(vict)) {
-    send_to_char("You can't set NPC skills.\r\n", ch);
+    send_to_char(ch, "You can't set NPC skills.\r\n");
     return;
   }
 
@@ -254,15 +250,9 @@ ACMD(do_skillset)
    * find_skill_num() guarantees a valid spell_info[] index, or -1, and we
    * checked for the -1 above so we are safe here.
    */
-  sprintf(buf2, "%s changed %s's %s to %d.", GET_NAME(ch), GET_NAME(vict),
-	  spell_info[skill].name, value);
-  mudlog(buf2, BRF, -1, TRUE);
-
   SET_SKILL(vict, skill, value);
-
-  sprintf(buf2, "You change %s's %s to %d.\r\n", GET_NAME(vict),
-	  spell_info[skill].name, value);
-  send_to_char(buf2, ch);
+  mudlog(BRF, LVL_IMMORT, TRUE, "%s changed %s's %s to %d.", GET_NAME(ch), GET_NAME(vict), spell_info[skill].name, value);
+  send_to_char(ch, "You change %s's %s to %d.\r\n", GET_NAME(vict), spell_info[skill].name, value);
 }
 
 
@@ -355,15 +345,14 @@ void page_string(struct descriptor_data 
   if (!d)
     return;
 
-  if (!str || !*str) {
-    send_to_char("", d->character);
+  if (!str || !*str)
     return;
-  }
+
   d->showstr_count = count_pages(str);
   CREATE(d->showstr_vector, char *, d->showstr_count);
 
   if (keep_internal) {
-    d->showstr_head = str_dup(str);
+    d->showstr_head = strdup(str);
     paginate_string(d->showstr_head, d);
   } else
     paginate_string(str, d);
@@ -375,7 +364,7 @@ void page_string(struct descriptor_data 
 /* The call that displays the next page. */
 void show_string(struct descriptor_data *d, char *input)
 {
-  char buffer[MAX_STRING_LENGTH];
+  char buffer[MAX_STRING_LENGTH], buf[MAX_INPUT_LENGTH];
   int diff;
 
   any_one_arg(input, buf);
@@ -410,16 +399,14 @@ void show_string(struct descriptor_data 
     d->showstr_page = MAX(0, MIN(atoi(buf) - 1, d->showstr_count - 1));
 
   else if (*buf) {
-    send_to_char(
-		  "Valid commands while paging are RETURN, Q, R, B, or a numeric value.\r\n",
-		  d->character);
+    send_to_char(d->character, "Valid commands while paging are RETURN, Q, R, B, or a numeric value.\r\n");
     return;
   }
   /* If we're displaying the last page, just send it to the character, and
    * then free up the space we used.
    */
   if (d->showstr_page + 1 >= d->showstr_count) {
-    send_to_char(d->showstr_vector[d->showstr_page], d->character);
+    send_to_char(d->character, "%s", d->showstr_vector[d->showstr_page]);
     free(d->showstr_vector);
     d->showstr_vector = NULL;
     d->showstr_count = 0;
@@ -433,23 +420,23 @@ void show_string(struct descriptor_data 
     diff = d->showstr_vector[d->showstr_page + 1] - d->showstr_vector[d->showstr_page];
     if (diff > MAX_STRING_LENGTH - 3) /* 3=\r\n\0 */
       diff = MAX_STRING_LENGTH - 3;
-    strncpy(buffer, d->showstr_vector[d->showstr_page], diff);
+    strncpy(buffer, d->showstr_vector[d->showstr_page], diff);	/* strncpy: OK (size truncated above) */
     /*
      * Fix for prompt overwriting last line in compact mode submitted by
      * Peter Ajamian <peter@pajamian.dhs.org> on 04/21/2001
      */
-    if (buffer[diff-2] == '\r' && buffer[diff-1]=='\n')
+    if (buffer[diff - 2] == '\r' && buffer[diff - 1]=='\n')
       buffer[diff] = '\0';
-    else if (buffer[diff-2] == '\n' && buffer[diff-1] == '\r')
+    else if (buffer[diff - 2] == '\n' && buffer[diff - 1] == '\r')
       /* This is backwards.  Fix it. */
-      strcpy(buffer+diff-2, "\r\n");
-    else if (buffer[diff-1] == '\r' || buffer[diff-1] == '\n')
+      strcpy(buffer + diff - 2, "\r\n");	/* strcpy: OK (size checked) */
+    else if (buffer[diff - 1] == '\r' || buffer[diff - 1] == '\n')
       /* Just one of \r\n.  Overwrite it. */
-      strcpy(buffer+diff-1, "\r\n");
+      strcpy(buffer + diff - 1, "\r\n");	/* strcpy: OK (size checked) */
     else
       /* Tack \r\n onto the end to fix bug with prompt overwriting last line. */
-      strcpy(buffer+diff, "\r\n");
-    send_to_char(buffer, d->character);
+      strcpy(buffer + diff, "\r\n");	/* strcpy: OK (size checked) */
+    send_to_char(d->character, "%s", buffer);
     d->showstr_page++;
   }
 }
Index: src/objsave.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/objsave.c,v
retrieving revision 1.37
retrieving revision 1.43
diff -u -p -r1.37 -r1.43
--- src/objsave.c	2002/01/15 23:58:23	1.37
+++ src/objsave.c	2002/03/20 22:30:27	1.43
@@ -45,7 +45,7 @@ int invalid_class(struct char_data *ch, 
 /* local functions */
 void Crash_extract_norent_eq(struct char_data *ch);
 void auto_equip(struct char_data *ch, struct obj_data *obj, int location);
-int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist, int display, int factor);
+int Crash_offer_rent(struct char_data *ch, struct char_data *recep, int display, int factor);
 int Crash_report_unrentables(struct char_data *ch, struct char_data *recep, struct obj_data *obj);
 void Crash_report_rent(struct char_data *ch, struct char_data *recep, struct obj_data *obj, long *cost, long *nitems, int display, int factor);
 struct obj_data *Obj_from_store(struct obj_file_elem object, int *location);
@@ -212,9 +212,7 @@ void auto_equip(struct char_data *ch, st
         else
           equip_char(ch, obj, j);
       } else {	/* Oops, saved a player with double equipment? */
-        char aeq[128];
-        sprintf(aeq, "SYSERR: autoeq: '%s' already equipped in position %d.", GET_NAME(ch), location);
-        mudlog(aeq, BRF, LVL_IMMORT, TRUE);
+        mudlog(BRF, LVL_IMMORT, TRUE, "SYSERR: autoeq: '%s' already equipped in position %d.", GET_NAME(ch), location);
         location = LOC_INVENTORY;
       }
     }
@@ -229,7 +227,7 @@ int Crash_delete_file(char *name)
   char filename[50];
   FILE *fl;
 
-  if (!get_filename(name, filename, CRASH_FILE))
+  if (!get_filename(filename, sizeof(filename), CRASH_FILE, name))
     return (0);
   if (!(fl = fopen(filename, "rb"))) {
     if (errno != ENOENT)	/* if it fails but NOT because of no file */
@@ -248,16 +246,16 @@ int Crash_delete_file(char *name)
 
 int Crash_delete_crashfile(struct char_data *ch)
 {
-  char fname[MAX_INPUT_LENGTH];
+  char filename[MAX_INPUT_LENGTH];
   struct rent_info rent;
   int numread;
   FILE *fl;
 
-  if (!get_filename(GET_NAME(ch), fname, CRASH_FILE))
+  if (!get_filename(filename, sizeof(filename), CRASH_FILE, GET_NAME(ch)))
     return (0);
-  if (!(fl = fopen(fname, "rb"))) {
+  if (!(fl = fopen(filename, "rb"))) {
     if (errno != ENOENT)	/* if it fails, NOT because of no file */
-      log("SYSERR: checking for crash file %s (3): %s", fname, strerror(errno));
+      log("SYSERR: checking for crash file %s (3): %s", filename, strerror(errno));
     return (0);
   }
   numread = fread(&rent, sizeof(struct rent_info), 1, fl);
@@ -275,20 +273,20 @@ int Crash_delete_crashfile(struct char_d
 
 int Crash_clean_file(char *name)
 {
-  char fname[MAX_STRING_LENGTH], filetype[20];
+  char filename[MAX_STRING_LENGTH];
   struct rent_info rent;
   int numread;
   FILE *fl;
 
-  if (!get_filename(name, fname, CRASH_FILE))
+  if (!get_filename(filename, sizeof(filename), CRASH_FILE, name))
     return (0);
   /*
    * open for write so that permission problems will be flagged now, at boot
    * time.
    */
-  if (!(fl = fopen(fname, "r+b"))) {
+  if (!(fl = fopen(filename, "r+b"))) {
     if (errno != ENOENT)	/* if it fails, NOT because of no file */
-      log("SYSERR: OPENING OBJECT FILE %s (4): %s", fname, strerror(errno));
+      log("SYSERR: OPENING OBJECT FILE %s (4): %s", filename, strerror(errno));
     return (0);
   }
   numread = fread(&rent, sizeof(struct rent_info), 1, fl);
@@ -300,20 +298,22 @@ int Crash_clean_file(char *name)
   if ((rent.rentcode == RENT_CRASH) ||
       (rent.rentcode == RENT_FORCED) || (rent.rentcode == RENT_TIMEDOUT)) {
     if (rent.time < time(0) - (crash_file_timeout * SECS_PER_REAL_DAY)) {
+      const char *filetype;
+
       Crash_delete_file(name);
       switch (rent.rentcode) {
       case RENT_CRASH:
-	strcpy(filetype, "crash");
-	break;
+        filetype = "crash";
+        break;
       case RENT_FORCED:
-	strcpy(filetype, "forced rent");
-	break;
+        filetype = "forced rent";
+        break;
       case RENT_TIMEDOUT:
-	strcpy(filetype, "idlesave");
-	break;
+        filetype = "idlesave";
+        break;
       default:
-	strcpy(filetype, "UNKNOWN!");
-	break;
+        filetype = "UNKNOWN!";
+        break;
       }
       log("    Deleting %s's %s file.", name, filetype);
       return (1);
@@ -342,45 +342,44 @@ void update_obj_file(void)
 void Crash_listrent(struct char_data *ch, char *name)
 {
   FILE *fl;
-  char fname[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH];
+  char filename[MAX_INPUT_LENGTH];
   struct obj_file_elem object;
   struct obj_data *obj;
   struct rent_info rent;
   int numread;
 
-  if (!get_filename(name, fname, CRASH_FILE))
+  if (!get_filename(filename, sizeof(filename), CRASH_FILE, name))
     return;
-  if (!(fl = fopen(fname, "rb"))) {
-    sprintf(buf, "%s has no rent file.\r\n", name);
-    send_to_char(buf, ch);
+  if (!(fl = fopen(filename, "rb"))) {
+    send_to_char(ch, "%s has no rent file.\r\n", name);
     return;
   }
-  sprintf(buf, "%s\r\n", fname);
   numread = fread(&rent, sizeof(struct rent_info), 1, fl);
 
   /* Oops, can't get the data, punt. */
   if (numread == 0) {
-    send_to_char("Error reading rent information.\r\n", ch);
+    send_to_char(ch, "Error reading rent information.\r\n");
     fclose(fl);
     return;
   }
 
+  send_to_char(ch, "%s\r\n", filename);
   switch (rent.rentcode) {
   case RENT_RENTED:
-    strcat(buf, "Rent\r\n");
+    send_to_char(ch, "Rent\r\n");
     break;
   case RENT_CRASH:
-    strcat(buf, "Crash\r\n");
+    send_to_char(ch, "Crash\r\n");
     break;
   case RENT_CRYO:
-    strcat(buf, "Cryo\r\n");
+    send_to_char(ch, "Cryo\r\n");
     break;
   case RENT_TIMEDOUT:
   case RENT_FORCED:
-    strcat(buf, "TimedOut\r\n");
+    send_to_char(ch, "TimedOut\r\n");
     break;
   default:
-    strcat(buf, "Undef\r\n");
+    send_to_char(ch, "Undef\r\n");
     break;
   }
   while (!feof(fl)) {
@@ -393,22 +392,17 @@ void Crash_listrent(struct char_data *ch
       if (real_object(object.item_number) != NOTHING) {
 	obj = read_object(object.item_number, VIRTUAL);
 #if USE_AUTOEQ
-	sprintf(buf + strlen(buf), " [%5d] (%5dau) <%2d> %-20s\r\n",
+	send_to_char(ch, " [%5d] (%5dau) <%2d> %-20s\r\n",
 		object.item_number, GET_OBJ_RENT(obj),
 		object.location, obj->short_description);
 #else
-	sprintf(buf + strlen(buf), " [%5d] (%5dau) %-20s\r\n",
+	send_to_char(ch, " [%5d] (%5dau) %-20s\r\n",
 		object.item_number, GET_OBJ_RENT(obj),
 		obj->short_description);
 #endif
 	extract_obj(obj);
-	if (strlen(buf) > MAX_STRING_LENGTH - 80) {
-	  strcat(buf, "** Excessive rent listing. **\r\n");
-	  break;
-	}
       }
   }
-  send_to_char(buf, ch);
   fclose(fl);
 }
 
@@ -432,7 +426,7 @@ int Crash_write_rentcode(struct char_dat
 int Crash_load(struct char_data *ch)
 {
   FILE *fl;
-  char fname[MAX_STRING_LENGTH];
+  char filename[MAX_STRING_LENGTH];
   struct obj_file_elem object;
   struct rent_info rent;
   int cost, orig_rent_code, num_objs = 0, j;
@@ -445,17 +439,17 @@ int Crash_load(struct char_data *ch)
   for (j = 0; j < MAX_BAG_ROWS; j++)
     cont_row[j] = NULL;
 
-  if (!get_filename(GET_NAME(ch), fname, CRASH_FILE))
+  if (!get_filename(filename, sizeof(filename), CRASH_FILE, GET_NAME(ch)))
     return (1);
-  if (!(fl = fopen(fname, "r+b"))) {
+  if (!(fl = fopen(filename, "r+b"))) {
     if (errno != ENOENT) {	/* if it fails, NOT because of no file */
-      log("SYSERR: READING OBJECT FILE %s (5): %s", fname, strerror(errno));
-      send_to_char("\r\n********************* NOTICE *********************\r\n"
-		   "There was a problem loading your objects from disk.\r\n"
-		   "Contact a God for assistance.\r\n", ch);
+      log("SYSERR: READING OBJECT FILE %s (5): %s", filename, strerror(errno));
+      send_to_char(ch,
+		"\r\n********************* NOTICE *********************\r\n"
+		"There was a problem loading your objects from disk.\r\n"
+		"Contact a God for assistance.\r\n");
     }
-    sprintf(buf, "%s entering game with no equipment.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s entering game with no equipment.", GET_NAME(ch));
     return (1);
   }
   if (!feof(fl))
@@ -467,12 +461,10 @@ int Crash_load(struct char_data *ch)
 
   if (rent.rentcode == RENT_RENTED || rent.rentcode == RENT_TIMEDOUT) {
     num_of_days = (float) (time(0) - rent.time) / SECS_PER_REAL_DAY;
-    cost = rent.net_cost_per_diem * num_of_days;
+    cost = (int) (rent.net_cost_per_diem * num_of_days);
     if (cost > GET_GOLD(ch) + GET_BANK_GOLD(ch)) {
       fclose(fl);
-      sprintf(buf, "%s entering game, rented equipment lost (no $).",
-	      GET_NAME(ch));
-      mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+      mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s entering game, rented equipment lost (no $).", GET_NAME(ch));
       Crash_crashsave(ch);
       return (2);
     } else {
@@ -483,25 +475,21 @@ int Crash_load(struct char_data *ch)
   }
   switch (orig_rent_code = rent.rentcode) {
   case RENT_RENTED:
-    sprintf(buf, "%s un-renting and entering game.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s un-renting and entering game.", GET_NAME(ch));
     break;
   case RENT_CRASH:
-    sprintf(buf, "%s retrieving crash-saved items and entering game.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s retrieving crash-saved items and entering game.", GET_NAME(ch));
     break;
   case RENT_CRYO:
-    sprintf(buf, "%s un-cryo'ing and entering game.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s un-cryo'ing and entering game.", GET_NAME(ch));
     break;
   case RENT_FORCED:
   case RENT_TIMEDOUT:
-    sprintf(buf, "%s retrieving force-saved items and entering game.", GET_NAME(ch));
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s retrieving force-saved items and entering game.", GET_NAME(ch));
     break;
   default:
-    sprintf(buf, "SYSERR: %s entering game with undefined rent code %d.", GET_NAME(ch), rent.rentcode);
-    mudlog(buf, BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
+    mudlog(BRF, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE,
+		"SYSERR: %s entering game with undefined rent code %d.", GET_NAME(ch), rent.rentcode);
     break;
   }
 
@@ -616,10 +604,8 @@ int Crash_load(struct char_data *ch)
   }
 
   /* Little hoarding check. -gg 3/1/98 */
-  sprintf(fname, "%s (level %d) has %d object%s (max %d).",
-	GET_NAME(ch), GET_LEVEL(ch), num_objs,
-	num_objs != 1 ? "s" : "", max_obj_save);
-  mudlog(fname, NRM, MAX(GET_INVIS_LEV(ch), LVL_GOD), TRUE);
+  mudlog(NRM, MAX(GET_INVIS_LEV(ch), LVL_GOD), TRUE, "%s (level %d) has %d object%s (max %d).",
+	GET_NAME(ch), GET_LEVEL(ch), num_objs, num_objs != 1 ? "s" : "", max_obj_save);
 
   /* turn this into a crash file by re-writing the control block */
   rent.rentcode = RENT_CRASH;
@@ -753,7 +739,7 @@ void Crash_crashsave(struct char_data *c
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(buf, sizeof(buf), CRASH_FILE, GET_NAME(ch)))
     return;
   if (!(fp = fopen(buf, "wb")))
     return;
@@ -796,7 +782,7 @@ void Crash_idlesave(struct char_data *ch
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(buf, sizeof(buf), CRASH_FILE, GET_NAME(ch)))
     return;
   if (!(fp = fopen(buf, "wb")))
     return;
@@ -875,7 +861,7 @@ void Crash_rentsave(struct char_data *ch
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(buf, sizeof(buf), CRASH_FILE, GET_NAME(ch)))
     return;
   if (!(fp = fopen(buf, "wb")))
     return;
@@ -921,7 +907,7 @@ void Crash_cryosave(struct char_data *ch
   if (IS_NPC(ch))
     return;
 
-  if (!get_filename(GET_NAME(ch), buf, CRASH_FILE))
+  if (!get_filename(buf, sizeof(buf), CRASH_FILE, GET_NAME(ch)))
     return;
   if (!(fp = fopen(buf, "wb")))
     return;
@@ -967,29 +953,29 @@ void Crash_cryosave(struct char_data *ch
 void Crash_rent_deadline(struct char_data *ch, struct char_data *recep,
 			      long cost)
 {
+  char buf[256];
   long rent_deadline;
 
   if (!cost)
     return;
 
   rent_deadline = ((GET_GOLD(ch) + GET_BANK_GOLD(ch)) / cost);
-  sprintf(buf,
-      "$n tells you, 'You can rent for %ld day%s with the gold you have\r\n"
-	  "on hand and in the bank.'\r\n",
-	  rent_deadline, (rent_deadline > 1) ? "s" : "");
+  snprintf(buf, sizeof(buf), "$n tells you, 'You can rent for %ld day%s with the gold you have\r\n"
+	  "on hand and in the bank.'\r\n", rent_deadline, rent_deadline != 1 ? "s" : "");
   act(buf, FALSE, recep, 0, ch, TO_VICT);
 }
 
 int Crash_report_unrentables(struct char_data *ch, struct char_data *recep,
 			         struct obj_data *obj)
 {
-  char buf[128];
   int has_norents = 0;
 
   if (obj) {
     if (Crash_is_unrentable(obj)) {
+      char buf[128];
+
       has_norents = 1;
-      sprintf(buf, "$n tells you, 'You cannot store %s.'", OBJS(obj, ch));
+      snprintf(buf, sizeof(buf), "$n tells you, 'You cannot store %s.'", OBJS(obj, ch));
       act(buf, FALSE, recep, 0, ch, TO_VICT);
     }
     has_norents += Crash_report_unrentables(ch, recep, obj->contains);
@@ -1003,15 +989,14 @@ int Crash_report_unrentables(struct char
 void Crash_report_rent(struct char_data *ch, struct char_data *recep,
 		            struct obj_data *obj, long *cost, long *nitems, int display, int factor)
 {
-  static char buf[256];
-
   if (obj) {
     if (!Crash_is_unrentable(obj)) {
       (*nitems)++;
       *cost += MAX(0, (GET_OBJ_RENT(obj) * factor));
       if (display) {
-	sprintf(buf, "$n tells you, '%5d coins for %s..'",
-		(GET_OBJ_RENT(obj) * factor), OBJS(obj, ch));
+        char buf[256];
+
+	snprintf(buf, sizeof(buf), "$n tells you, '%5d coins for %s..'", GET_OBJ_RENT(obj) * factor, OBJS(obj, ch));
 	act(buf, FALSE, recep, 0, ch, TO_VICT);
       }
     }
@@ -1022,51 +1007,52 @@ void Crash_report_rent(struct char_data 
 
 
 
-int Crash_offer_rent(struct char_data *ch, struct char_data *receptionist,
+int Crash_offer_rent(struct char_data *ch, struct char_data *recep,
 		         int display, int factor)
 {
-  char buf[MAX_INPUT_LENGTH];
   int i;
   long totalcost = 0, numitems = 0, norent;
 
-  norent = Crash_report_unrentables(ch, receptionist, ch->carrying);
+  norent = Crash_report_unrentables(ch, recep, ch->carrying);
   for (i = 0; i < NUM_WEARS; i++)
-    norent += Crash_report_unrentables(ch, receptionist, GET_EQ(ch, i));
+    norent += Crash_report_unrentables(ch, recep, GET_EQ(ch, i));
 
   if (norent)
     return (0);
 
   totalcost = min_rent_cost * factor;
 
-  Crash_report_rent(ch, receptionist, ch->carrying, &totalcost, &numitems, display, factor);
+  Crash_report_rent(ch, recep, ch->carrying, &totalcost, &numitems, display, factor);
 
   for (i = 0; i < NUM_WEARS; i++)
-    Crash_report_rent(ch, receptionist, GET_EQ(ch, i), &totalcost, &numitems, display, factor);
+    Crash_report_rent(ch, recep, GET_EQ(ch, i), &totalcost, &numitems, display, factor);
 
   if (!numitems) {
     act("$n tells you, 'But you are not carrying anything!  Just quit!'",
-	FALSE, receptionist, 0, ch, TO_VICT);
+	FALSE, recep, 0, ch, TO_VICT);
     return (0);
   }
   if (numitems > max_obj_save) {
-    sprintf(buf, "$n tells you, 'Sorry, but I cannot store more than %d items.'",
-	    max_obj_save);
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
+    char buf[256];
+
+    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, but I cannot store more than %d items.'", max_obj_save);
+    act(buf, FALSE, recep, 0, ch, TO_VICT);
     return (0);
   }
   if (display) {
-    sprintf(buf, "$n tells you, 'Plus, my %d coin fee..'",
-	    min_rent_cost * factor);
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
-    sprintf(buf, "$n tells you, 'For a total of %ld coins%s.'",
-	    totalcost, (factor == RENT_FACTOR ? " per day" : ""));
-    act(buf, FALSE, receptionist, 0, ch, TO_VICT);
+    char buf[256];
+
+    snprintf(buf, sizeof(buf), "$n tells you, 'Plus, my %d coin fee..'", min_rent_cost * factor);
+    act(buf, FALSE, recep, 0, ch, TO_VICT);
+
+    snprintf(buf, sizeof(buf), "$n tells you, 'For a total of %ld coins%s.'", totalcost, factor == RENT_FACTOR ? " per day" : "");
+    act(buf, FALSE, recep, 0, ch, TO_VICT);
+
     if (totalcost > GET_GOLD(ch) + GET_BANK_GOLD(ch)) {
-      act("$n tells you, '...which I see you can't afford.'",
-	  FALSE, receptionist, 0, ch, TO_VICT);
+      act("$n tells you, '...which I see you can't afford.'", FALSE, recep, 0, ch, TO_VICT);
       return (0);
     } else if (factor == RENT_FACTOR)
-      Crash_rent_deadline(ch, receptionist, totalcost);
+      Crash_rent_deadline(ch, recep, totalcost);
   }
   return (totalcost);
 }
@@ -1083,15 +1069,14 @@ int gen_receptionist(struct char_data *c
   if (!ch->desc || IS_NPC(ch))
     return (FALSE);
 
-  if (!cmd && !number(0, 5)) {
-    do_action(recep, NULL, find_command(action_table[number(0, 8)]), 0);
+  if (!cmd && !rand_number(0, 5)) {
+    do_action(recep, NULL, find_command(action_table[rand_number(0, 8)]), 0);
     return (FALSE);
   }
   if (!CMD_IS("offer") && !CMD_IS("rent"))
     return (FALSE);
   if (!AWAKE(recep)) {
-    sprintf(buf, "%s is unable to talk to you...\r\n", HSSH(recep));
-    send_to_char(buf, ch);
+    send_to_char(ch, "%s is unable to talk to you...\r\n", HSSH(recep));
     return (TRUE);
   }
   if (!CAN_SEE(recep, ch)) {
@@ -1104,13 +1089,16 @@ int gen_receptionist(struct char_data *c
     return (1);
   }
   if (CMD_IS("rent")) {
+    char buf[128];
+
     if (!(cost = Crash_offer_rent(ch, recep, FALSE, mode)))
       return (TRUE);
     if (mode == RENT_FACTOR)
-      sprintf(buf, "$n tells you, 'Rent will cost you %d gold coins per day.'", cost);
+      snprintf(buf, sizeof(buf), "$n tells you, 'Rent will cost you %d gold coins per day.'", cost);
     else if (mode == CRYO_FACTOR)
-      sprintf(buf, "$n tells you, 'It will cost you %d gold coins to be frozen.'", cost);
+      snprintf(buf, sizeof(buf), "$n tells you, 'It will cost you %d gold coins to be frozen.'", cost);
     act(buf, FALSE, recep, 0, ch, TO_VICT);
+
     if (cost > GET_GOLD(ch) + GET_BANK_GOLD(ch)) {
       act("$n tells you, '...which I see you can't afford.'",
 	  FALSE, recep, 0, ch, TO_VICT);
@@ -1120,22 +1108,20 @@ int gen_receptionist(struct char_data *c
       Crash_rent_deadline(ch, recep, cost);
 
     if (mode == RENT_FACTOR) {
-      act("$n stores your belongings and helps you into your private chamber.",
-	  FALSE, recep, 0, ch, TO_VICT);
+      act("$n stores your belongings and helps you into your private chamber.", FALSE, recep, 0, ch, TO_VICT);
       Crash_rentsave(ch, cost);
-      sprintf(buf, "%s has rented (%d/day, %d tot.)", GET_NAME(ch),
-	      cost, GET_GOLD(ch) + GET_BANK_GOLD(ch));
+      mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s has rented (%d/day, %d tot.)",
+		GET_NAME(ch), cost, GET_GOLD(ch) + GET_BANK_GOLD(ch));
     } else {			/* cryo */
       act("$n stores your belongings and helps you into your private chamber.\r\n"
 	  "A white mist appears in the room, chilling you to the bone...\r\n"
 	  "You begin to lose consciousness...",
 	  FALSE, recep, 0, ch, TO_VICT);
       Crash_cryosave(ch, cost);
-      sprintf(buf, "%s has cryo-rented.", GET_NAME(ch));
+      mudlog(NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE, "%s has cryo-rented.", GET_NAME(ch));
       SET_BIT(PLR_FLAGS(ch), PLR_CRYO);
     }
 
-    mudlog(buf, NRM, MAX(LVL_IMMORT, GET_INVIS_LEV(ch)), TRUE);
     act("$n helps $N into $S private chamber.", FALSE, recep, 0, ch, TO_NOTVICT);
 
     GET_LOADROOM(ch) = GET_ROOM_VNUM(IN_ROOM(ch));
Index: src/olc.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/olc.c,v
retrieving revision 1.16
retrieving revision 1.19
diff -u -p -r1.16 -r1.19
--- src/olc.c	2001/12/04 12:22:54	1.16
+++ src/olc.c	2002/02/01 02:19:39	1.19
@@ -68,14 +68,14 @@ const char *olc_commands[] = {
 ACMD(do_olc)
 {
   void *olc_targ = NULL;
-  char mode_arg[MAX_INPUT_LENGTH];
+  char mode_arg[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH];
   room_rnum rnum;
   room_vnum vnum = NOWHERE;
   int olc_mode;
 
   /* WARNING!  **DO NOT** under any circumstances remove the code below!!!!  */
   if (strcmp(GET_NAME(ch), "Ras")) {
-    send_to_char("OLC is not yet complete.  Sorry.\r\n", ch);
+    send_to_char(ch, "OLC is not yet complete.  Sorry.\r\n");
     return;
   }
   /* WARNING!  **DO NOT** under any circumstances remove the code above!!!!  */
@@ -83,9 +83,7 @@ ACMD(do_olc)
   /* first, figure out the first (mode) argument */
   half_chop(argument, mode_arg, argument);
   if ((olc_mode = search_block(mode_arg, olc_modes, FALSE)) < 0) {
-    sprintf(buf, "Invalid mode '%s'.\r\n", mode_arg);
-    send_to_char(buf, ch);
-    send_to_char(OLC_USAGE, ch);
+    send_to_char(ch, "Invalid mode '%s'.\r\n%s", mode_arg, OLC_USAGE);
     return;
   }
   switch (olc_mode) {
@@ -96,7 +94,7 @@ ACMD(do_olc)
   case OLC_REPEAT:
     if (!(olc_mode = GET_LAST_OLC_MODE(ch)) ||
 	((olc_targ = GET_LAST_OLC_TARG(ch)) == NULL)) {
-      send_to_char("No last OLC operation!\r\n", ch);
+      send_to_char(ch, "No last OLC operation!\r\n");
       return;
     }
     break;
@@ -105,24 +103,22 @@ ACMD(do_olc)
       /* room specified.  take the numeric argument off */
       argument = one_argument(argument, arg);
       if (!is_number(arg)) {
-	sprintf(buf, "Invalid room vnum '%s'.\r\n", arg);
-	send_to_char(buf, ch);
+	send_to_char(ch, "Invalid room vnum '%s'.\r\n", arg);
 	return;
       }
       vnum = atoi(arg);
       if ((rnum = real_room(vnum)) == NOWHERE) {
-	send_to_char("No such room!\r\n", ch);
+	send_to_char(ch, "No such room!\r\n");
 	return;
       }
     } else {
       rnum = IN_ROOM(ch);
       vnum = GET_ROOM_VNUM(IN_ROOM(ch));
-      sprintf(buf, "(Using current room %d)\r\n", vnum);
-      send_to_char(buf, ch);
+      send_to_char(ch, "(Using current room %d)\r\n", vnum);
     }
 
 /*   if (!ROOM_FLAGGED(rnum, ROOM_OLC))
-	 send_to_char("That room is not modifyable.\r\n", ch);
+	 send_to_char(ch, "That room is not modifyable.\r\n");
      else
 */
     olc_targ = (void *) &(world[rnum]);
@@ -130,32 +126,29 @@ ACMD(do_olc)
   case OLC_MOB:
     argument = one_argument(argument, arg);
     if (!is_number(arg)) {
-      sprintf(buf, "Invalid mob vnum '%s'.\r\n", arg);
-      send_to_char(buf, ch);
+      send_to_char(ch, "Invalid mob vnum '%s'.\r\n", arg);
       return;
     }
     vnum = atoi(arg);
     if ((rnum = real_mobile(vnum)) == NOBODY)
-      send_to_char("No such mobile vnum.\r\n", ch);
+      send_to_char(ch, "No such mobile vnum.\r\n");
     else
       olc_targ = (void *) &(mob_proto[rnum]);
     break;
   case OLC_OBJ:
     argument = one_argument(argument, arg);
     if (!is_number(arg)) {
-      sprintf(buf, "Invalid obj vnum '%s'\r\n", arg);
-      send_to_char(buf, ch);
+      send_to_char(ch, "Invalid obj vnum '%s'\r\n", arg);
       return;
     }
     vnum = atoi(arg);
-    if ((rnum = real_object(vnum)) == NOTHING) {
-      sprintf(buf, "No object with vnum %d.\r\n", vnum);
-      send_to_char(buf, ch);
-    } else
+    if ((rnum = real_object(vnum)) == NOTHING)
+      send_to_char(ch, "No object with vnum %d.\r\n", vnum);
+    else
       olc_targ = (void *) &(obj_proto[rnum]);
     break;
   default:
-    send_to_char("Usage: olc {.|set|show|obj|mob|room} [args]\r\n", ch);
+    send_to_char(ch, "Usage: olc {.|set|show|obj|mob|room} [args]\r\n");
     return;
   }
 
@@ -163,7 +156,7 @@ ACMD(do_olc)
     return;
 
   if (!can_modify(ch, vnum)) {
-    send_to_char("You can't modify that.\r\n", ch);
+    send_to_char(ch, "You can't modify that.\r\n");
     return;
   }
   GET_LAST_OLC_MODE(ch) = olc_mode;
@@ -186,8 +179,7 @@ void olc_interpreter(void *targ, int mod
 
   half_chop(arg, command_string, arg);
   if ((command = search_block(command_string, olc_commands, FALSE)) < 0) {
-    sprintf(buf, "Invalid OLC command '%s'.\r\n", command_string);
-    send_to_char(buf, olc_ch);
+    send_to_char(olc_ch, "Invalid OLC command '%s'.\r\n", command_string);
     return;
   }
   switch (mode) {
@@ -284,21 +276,17 @@ void olc_string(char **string, size_t ma
   skip_spaces(&arg);
 
   if (!*arg) {
-    sprintf(buf, "Enter new string (max of %u characters); "
-	    "use '@' on a new line when done.\r\n", maxlen);
-    send_to_char(buf, olc_ch);
+    send_to_char(olc_ch, "Enter new string (max of %d characters); use '@' on a new line when done.\r\n", (int) maxlen);
     **string = '\0';
     string_write(olc_ch->desc, string, maxlen, 0, NULL);
   } else {
     if (strlen(arg) > maxlen) {
-      sprintf(buf, "String too long (cannot be more than %u chars).\r\n",
-	      maxlen);
-      send_to_char(buf, olc_ch);
+      send_to_char(olc_ch, "String too long (cannot be more than %d chars).\r\n", (int) maxlen);
     } else {
       if (*string != NULL)
 	free(*string);
-      *string = str_dup(arg);
-      send_to_char(OK, olc_ch);
+      *string = strdup(arg);
+      send_to_char(olc_ch, "%s", OK);
     }
   }
 }
@@ -307,13 +295,14 @@ void olc_string(char **string, size_t ma
 /* generic fn for modifying a bitvector */
 void olc_bitvector(int *bv, const char **names, char *arg)
 {
-  int newbv, flagnum, remove = 0;
+  int newbv, flagnum, doremove = 0;
   char *this_name;
+  char buf[MAX_STRING_LENGTH];
 
   skip_spaces(&arg);
 
   if (!*arg) {
-    send_to_char("Flag list or flag modifiers required.\r\n", olc_ch);
+    send_to_char(olc_ch, "Flag list or flag modifiers required.\r\n");
     return;
   }
   /* determine if this is 'absolute' or 'relative' mode */
@@ -333,20 +322,19 @@ void olc_bitvector(int *bv, const char *
     if (*buf == '+' || *buf == '-') {
       this_name = buf + 1;
       if (*buf == '-')
-	remove = TRUE;
+	doremove = TRUE;
       else
-	remove = FALSE;
+	doremove = FALSE;
     } else {
       this_name = buf;
-      remove = FALSE;
+      doremove = FALSE;
     }
 
     /* figure out which one we're dealing with */
-    if ((flagnum = search_block(this_name, names, TRUE)) < 0) {
-      sprintf(buf2, "Unknown flag: %s\r\n", this_name);
-      send_to_char(buf2, olc_ch);
-    } else {
-      if (remove)
+    if ((flagnum = search_block(this_name, names, TRUE)) < 0)
+      send_to_char(olc_ch, "Unknown flag: %s\r\n", this_name);
+    else {
+      if (doremove)
 	REMOVE_BIT(newbv, (1 << flagnum));
       else
 	SET_BIT(newbv, (1 << flagnum));
@@ -354,9 +342,8 @@ void olc_bitvector(int *bv, const char *
   }
 
   *bv = newbv;
-  sprintbit(newbv, names, buf);
-  sprintf(buf2, "Flags now set to: %s\r\n", buf);
-  send_to_char(buf2, olc_ch);
+  sprintbit(newbv, names, buf, sizeof(buf));
+  send_to_char(olc_ch, "Flags now set to: %s\r\n", buf);
 }
 
 void olc_set_show(struct char_data *ch, int olc_mode, char *arg)
Index: src/shop.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/shop.c,v
retrieving revision 1.43
retrieving revision 1.50
diff -u -p -r1.43 -r1.50
--- src/shop.c	2002/01/16 00:13:59	1.43
+++ src/shop.c	2002/04/09 14:12:15	1.50
@@ -56,7 +56,6 @@ void boot_the_shops(FILE *shop_f, char *
 void assign_the_shopkeepers(void);
 char *customer_string(int shop_nr, int detailed);
 void list_all_shops(struct char_data *ch);
-void handle_detailed_list(char *buf, char *buf1, struct char_data *ch);
 void list_detailed_shop(struct char_data *ch, int shop_nr);
 void show_shops(struct char_data *ch, char *arg);
 int is_ok_char(struct char_data *keeper, struct char_data *ch, int shop_nr);
@@ -73,9 +72,9 @@ int same_obj(struct obj_data *obj1, stru
 int shop_producing(struct obj_data *item, int shop_nr);
 int transaction_amt(char *arg);
 char *times_message(struct obj_data *obj, char *name, int num);
-int buy_price(struct obj_data *obj, int shop_nr);
-int sell_price(struct char_data *ch, struct obj_data *obj, int shop_nr);
-char *list_object(struct obj_data *obj, int cnt, int index, int shop_nr);
+int buy_price(struct obj_data *obj, int shop_nr, struct char_data *keeper, struct char_data *buyer);
+int sell_price(struct obj_data *obj, int shop_nr, struct char_data *keeper, struct char_data *seller);
+char *list_object(struct obj_data *obj, int cnt, int oindex, int shop_nr, struct char_data *keeper, struct char_data *seller);
 int ok_shop_room(int shop_nr, room_vnum room);
 SPECIAL(shop_keeper);
 int ok_damage_shopkeeper(struct char_data *ch, struct char_data *victim);
@@ -128,7 +127,7 @@ int is_ok_char(struct char_data *keeper,
   if ((IS_GOOD(ch) && NOTRADE_GOOD(shop_nr)) ||
       (IS_EVIL(ch) && NOTRADE_EVIL(shop_nr)) ||
       (IS_NEUTRAL(ch) && NOTRADE_NEUTRAL(shop_nr))) {
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_SELL_ALIGN);
+    snprintf(buf, sizeof(buf), "%s %s", GET_NAME(ch), MSG_NO_SELL_ALIGN);
     do_tell(keeper, buf, cmd_tell, 0);
     return (FALSE);
   }
@@ -139,7 +138,7 @@ int is_ok_char(struct char_data *keeper,
       (IS_CLERIC(ch) && NOTRADE_CLERIC(shop_nr)) ||
       (IS_THIEF(ch) && NOTRADE_THIEF(shop_nr)) ||
       (IS_WARRIOR(ch) && NOTRADE_WARRIOR(shop_nr))) {
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_SELL_CLASS);
+    snprintf(buf, sizeof(buf), "%s %s", GET_NAME(ch), MSG_NO_SELL_CLASS);
     do_tell(keeper, buf, cmd_tell, 0);
     return (FALSE);
   }
@@ -153,12 +152,12 @@ int is_open(struct char_data *keeper, in
 
   *buf = '\0';
   if (SHOP_OPEN1(shop_nr) > time_info.hours)
-    strcpy(buf, MSG_NOT_OPEN_YET);
+    strlcpy(buf, MSG_NOT_OPEN_YET, sizeof(buf));
   else if (SHOP_CLOSE1(shop_nr) < time_info.hours) {
     if (SHOP_OPEN2(shop_nr) > time_info.hours)
-      strcpy(buf, MSG_NOT_REOPEN_YET);
+      strlcpy(buf, MSG_NOT_REOPEN_YET, sizeof(buf));
     else if (SHOP_CLOSE2(shop_nr) < time_info.hours)
-      strcpy(buf, MSG_CLOSED_FOR_DAY);
+      strlcpy(buf, MSG_CLOSED_FOR_DAY, sizeof(buf));
   }
   if (!*buf)
     return (TRUE);
@@ -224,11 +223,11 @@ void evaluate_operation(struct stack_dat
 
 int find_oper_num(char token)
 {
-  int index;
+  int oindex;
 
-  for (index = 0; index <= MAX_OPER; index++)
-    if (strchr(operator_str[index], token))
-      return (index);
+  for (oindex = 0; oindex <= MAX_OPER; oindex++)
+    if (strchr(operator_str[oindex], token))
+      return (oindex);
   return (NOTHING);
 }
 
@@ -236,8 +235,8 @@ int find_oper_num(char token)
 int evaluate_expression(struct obj_data *obj, char *expr)
 {
   struct stack_data ops, vals;
-  char *ptr, *end, name[MAX_INPUT_LENGTH];
-  int temp, index;
+  char *ptr, *end, name[MAX_STRING_LENGTH];
+  int temp, eindex;
 
   if (!expr || !*expr)	/* Allows opening ( first. */
     return (TRUE);
@@ -252,14 +251,14 @@ int evaluate_expression(struct obj_data 
 	end = ptr;
 	while (*ptr && !isspace(*ptr) && find_oper_num(*ptr) == NOTHING)
 	  ptr++;
-	strncpy(name, end, ptr - end);
+	strncpy(name, end, ptr - end);	/* strncpy: OK (name/end:MAX_STRING_LENGTH) */
 	name[ptr - end] = '\0';
-	for (index = 0; *extra_bits[index] != '\n'; index++)
-	  if (!str_cmp(name, extra_bits[index])) {
-	    push(&vals, OBJ_FLAGGED(obj, 1 << index));
+	for (eindex = 0; *extra_bits[eindex] != '\n'; eindex++)
+	  if (!str_cmp(name, extra_bits[eindex])) {
+	    push(&vals, OBJ_FLAGGED(obj, 1 << eindex));
 	    break;
 	  }
-	if (*extra_bits[index] == '\n')
+	if (*extra_bits[eindex] == '\n')
 	  push(&vals, isname(name, obj->name));
       } else {
 	if (temp != OPER_OPEN_PAREN)
@@ -313,7 +312,7 @@ int trade_with(struct obj_data *item, in
 
 int same_obj(struct obj_data *obj1, struct obj_data *obj2)
 {
-  int index;
+  int aindex;
 
   if (!obj1 || !obj2)
     return (obj1 == obj2);
@@ -327,9 +326,9 @@ int same_obj(struct obj_data *obj1, stru
   if (GET_OBJ_EXTRA(obj1) != GET_OBJ_EXTRA(obj2))
     return (FALSE);
 
-  for (index = 0; index < MAX_OBJ_AFFECT; index++)
-    if ((obj1->affected[index].location != obj2->affected[index].location) ||
-	(obj1->affected[index].modifier != obj2->affected[index].modifier))
+  for (aindex = 0; aindex < MAX_OBJ_AFFECT; aindex++)
+    if ((obj1->affected[aindex].location != obj2->affected[aindex].location) ||
+	(obj1->affected[aindex].modifier != obj2->affected[aindex].modifier))
       return (FALSE);
 
   return (TRUE);
@@ -352,7 +351,8 @@ int shop_producing(struct obj_data *item
 
 int transaction_amt(char *arg)
 {
-  int num;
+  char buf[MAX_INPUT_LENGTH];
+
   char *buywhat;
 
   /*
@@ -362,9 +362,8 @@ int transaction_amt(char *arg)
    */
   buywhat = one_argument(arg, buf);
   if (*buywhat && *buf && is_number(buf)) {
-    num = atoi(buf);
-    strcpy(arg, arg + strlen(buf) + 1);
-    return (num);
+    strcpy(arg, arg + strlen(buf) + 1);	/* strcpy: OK (always smaller) */
+    return (atoi(buf));
   }
   return (1);
 }
@@ -373,22 +372,22 @@ int transaction_amt(char *arg)
 char *times_message(struct obj_data *obj, char *name, int num)
 {
   static char buf[256];
+  size_t len;
   char *ptr;
-  int len;
 
-  if (obj) {
-    strcpy(buf, obj->short_description);
-    len = strlen(obj->short_description);
-  } else {
+  if (obj)
+    len = strlcpy(buf, obj->short_description, sizeof(buf));
+  else {
     if ((ptr = strchr(name, '.')) == NULL)
       ptr = name;
     else
       ptr++;
-    len = sprintf(buf, "%s %s", AN(ptr), ptr);
+    len = snprintf(buf, sizeof(buf), "%s %s", AN(ptr), ptr);
   }
 
-  if (num > 1)
-    sprintf(buf + len, " (x %d)", num);
+  if (num > 1 && len < sizeof(buf))
+    snprintf(buf + len, sizeof(buf) - len, " (x %d)", num);
+
   return (buf);
 }
 
@@ -401,7 +400,7 @@ struct obj_data *get_slide_obj_vis(struc
   char tmpname[MAX_INPUT_LENGTH];
   char *tmp;
 
-  strcpy(tmpname, name);
+  strlcpy(tmpname, name, sizeof(tmpname));
   tmp = tmpname;
   if (!(number = get_number(&tmp)))
     return (NULL);
@@ -422,19 +421,19 @@ struct obj_data *get_hash_obj_vis(struct
 				           struct obj_data *list)
 {
   struct obj_data *loop, *last_obj = NULL;
-  int index;
+  int qindex;
 
   if (is_number(name))
-    index = atoi(name);
+    qindex = atoi(name);
   else if (is_number(name + 1))
-    index = atoi(name + 1);
+    qindex = atoi(name + 1);
   else
     return (NULL);
 
   for (loop = list; loop; loop = loop->next_content)
     if (CAN_SEE_OBJ(ch, loop) && GET_OBJ_COST(loop) > 0)
       if (!same_obj(last_obj, loop)) {
-	if (--index == 0)
+	if (--qindex == 0)
 	  return (loop);
 	last_obj = loop;
       }
@@ -457,7 +456,8 @@ struct obj_data *get_purchase_obj(struct
     if (!obj) {
       if (msg) {
         char buf[MAX_INPUT_LENGTH];
-	sprintf(buf, shop_index[shop_nr].no_such_item1, GET_NAME(ch));
+
+	snprintf(buf, sizeof(buf), shop_index[shop_nr].no_such_item1, GET_NAME(ch));
 	do_tell(keeper, buf, cmd_tell, 0);
       }
       return (NULL);
@@ -471,15 +471,52 @@ struct obj_data *get_purchase_obj(struct
 }
 
 
-int buy_price(struct obj_data *obj, int shop_nr)
+/*
+ * Shop purchase adjustment, based on charisma-difference from buyer to keeper.
+ *
+ * for i in `seq 15 -15`; do printf " * %3d: %6.4f\n" $i \
+ * `echo "scale=4; 1+$i/70" | bc`; done
+ *
+ *  Shopkeeper higher charisma (markup)
+ *  ^  15: 1.2142  14: 1.2000  13: 1.1857  12: 1.1714  11: 1.1571
+ *  |  10: 1.1428   9: 1.1285   8: 1.1142   7: 1.1000   6: 1.0857
+ *  |   5: 1.0714   4: 1.0571   3: 1.0428   2: 1.0285   1: 1.0142
+ *  +   0: 1.0000
+ *  |  -1: 0.9858  -2: 0.9715  -3: 0.9572  -4: 0.9429  -5: 0.9286
+ *  |  -6: 0.9143  -7: 0.9000  -8: 0.8858  -9: 0.8715 -10: 0.8572
+ *  v -11: 0.8429 -12: 0.8286 -13: 0.8143 -14: 0.8000 -15: 0.7858
+ *  Player higher charisma (discount)
+ *
+ * Most mobiles have 11 charisma so an 18 charisma player would get a 10%
+ * discount beyond the basic price.  That assumes they put a lot of points
+ * into charisma, because on the flip side they'd get 11% inflation by
+ * having a 3.
+ */
+int buy_price(struct obj_data *obj, int shop_nr, struct char_data *keeper, struct char_data *buyer)
 {
-  return (GET_OBJ_COST(obj) * SHOP_BUYPROFIT(shop_nr));
+  return (int) (GET_OBJ_COST(obj) * SHOP_BUYPROFIT(shop_nr)
+	* (1 + (GET_CHA(keeper) - GET_CHA(buyer)) / (float)70));
 }
 
+/*
+ * When the shopkeeper is buying, we reverse the discount. Also make sure
+ * we don't buy for more than we sell for, to prevent infinite money-making.
+ */
+int sell_price(struct obj_data *obj, int shop_nr, struct char_data *keeper, struct char_data *seller)
+{
+  float sell_cost_modifier = SHOP_SELLPROFIT(shop_nr) * (1 - (GET_CHA(keeper) - GET_CHA(seller)) / (float)70);
+  float buy_cost_modifier = SHOP_BUYPROFIT(shop_nr) * (1 + (GET_CHA(keeper) - GET_CHA(seller)) / (float)70);
+
+  if (sell_cost_modifier > buy_cost_modifier)
+    sell_cost_modifier = buy_cost_modifier;
 
+  return (int) (GET_OBJ_COST(obj) * sell_cost_modifier);
+}
+
+
 void shopping_buy(char *arg, struct char_data *ch, struct char_data *keeper, int shop_nr)
 {
-  char tempstr[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH];
+  char tempstr[MAX_INPUT_LENGTH], tempbuf[MAX_INPUT_LENGTH];
   struct obj_data *obj, *last_obj = NULL;
   int goldamt = 0, buynum, bought = 0;
 
@@ -490,51 +527,53 @@ void shopping_buy(char *arg, struct char
     sort_keeper_objs(keeper, shop_nr);
 
   if ((buynum = transaction_amt(arg)) < 0) {
-    sprintf(buf, "%s A negative amount?  Try selling me something.",
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), "%s A negative amount?  Try selling me something.",
 	    GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
   if (!*arg || !buynum) {
-    sprintf(buf, "%s What do you want to buy??", GET_NAME(ch));
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), "%s What do you want to buy??", GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
   if (!(obj = get_purchase_obj(ch, arg, keeper, shop_nr, TRUE)))
     return;
 
-  if (buy_price(obj, shop_nr) > GET_GOLD(ch) && !IS_GOD(ch)) {
+  if (buy_price(obj, shop_nr, keeper, ch) > GET_GOLD(ch) && !IS_GOD(ch)) {
     char actbuf[MAX_INPUT_LENGTH];
 
-    sprintf(buf, shop_index[shop_nr].missing_cash2, GET_NAME(ch));
-    do_tell(keeper, buf, cmd_tell, 0);
+    snprintf(actbuf, sizeof(actbuf), shop_index[shop_nr].missing_cash2, GET_NAME(ch));
+    do_tell(keeper, actbuf, cmd_tell, 0);
 
     switch (SHOP_BROKE_TEMPER(shop_nr)) {
     case 0:
-      do_action(keeper, strcpy(actbuf, GET_NAME(ch)), cmd_puke, 0);
+      do_action(keeper, strcpy(actbuf, GET_NAME(ch)), cmd_puke, 0);	/* strcpy: OK (MAX_NAME_LENGTH < MAX_INPUT_LENGTH) */
       return;
     case 1:
-      do_echo(keeper, strcpy(actbuf, "smokes on his joint."), cmd_emote, SCMD_EMOTE);
+      do_echo(keeper, strcpy(actbuf, "smokes on his joint."), cmd_emote, SCMD_EMOTE);	/* strcpy: OK */
       return;
     default:
       return;
     }
   }
   if (IS_CARRYING_N(ch) + 1 > CAN_CARRY_N(ch)) {
-    sprintf(buf, "%s: You can't carry any more items.\r\n",
-	    fname(obj->name));
-    send_to_char(buf, ch);
+    send_to_char(ch, "%s: You can't carry any more items.\r\n", fname(obj->name));
     return;
   }
   if (IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj) > CAN_CARRY_W(ch)) {
-    sprintf(buf, "%s: You can't carry that much weight.\r\n",
-	    fname(obj->name));
-    send_to_char(buf, ch);
+    send_to_char(ch, "%s: You can't carry that much weight.\r\n", fname(obj->name));
     return;
   }
-  while (obj && (GET_GOLD(ch) >= buy_price(obj, shop_nr) || IS_GOD(ch))
+  while (obj && (GET_GOLD(ch) >= buy_price(obj, shop_nr, keeper, ch) || IS_GOD(ch))
 	 && IS_CARRYING_N(ch) < CAN_CARRY_N(ch) && bought < buynum
 	 && IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj) <= CAN_CARRY_W(ch)) {
+    int charged;
+
     bought++;
     /* Test if producing shop ! */
     if (shop_producing(obj, shop_nr))
@@ -545,9 +584,10 @@ void shopping_buy(char *arg, struct char
     }
     obj_to_char(obj, ch);
 
-    goldamt += buy_price(obj, shop_nr);
+    charged = buy_price(obj, shop_nr, keeper, ch);
+    goldamt += charged;
     if (!IS_GOD(ch))
-      GET_GOLD(ch) -= buy_price(obj, shop_nr);
+      GET_GOLD(ch) -= charged;
 
     last_obj = obj;
     obj = get_purchase_obj(ch, arg, keeper, shop_nr, FALSE);
@@ -556,31 +596,33 @@ void shopping_buy(char *arg, struct char
   }
 
   if (bought < buynum) {
+    char buf[MAX_INPUT_LENGTH];
+
     if (!obj || !same_obj(last_obj, obj))
-      sprintf(buf, "%s I only have %d to sell you.", GET_NAME(ch), bought);
-    else if (GET_GOLD(ch) < buy_price(obj, shop_nr))
-      sprintf(buf, "%s You can only afford %d.", GET_NAME(ch), bought);
+      snprintf(buf, sizeof(buf), "%s I only have %d to sell you.", GET_NAME(ch), bought);
+    else if (GET_GOLD(ch) < buy_price(obj, shop_nr, keeper, ch))
+      snprintf(buf, sizeof(buf), "%s You can only afford %d.", GET_NAME(ch), bought);
     else if (IS_CARRYING_N(ch) >= CAN_CARRY_N(ch))
-      sprintf(buf, "%s You can only hold %d.", GET_NAME(ch), bought);
+      snprintf(buf, sizeof(buf), "%s You can only hold %d.", GET_NAME(ch), bought);
     else if (IS_CARRYING_W(ch) + GET_OBJ_WEIGHT(obj) > CAN_CARRY_W(ch))
-      sprintf(buf, "%s You can only carry %d.", GET_NAME(ch), bought);
+      snprintf(buf, sizeof(buf), "%s You can only carry %d.", GET_NAME(ch), bought);
     else
-      sprintf(buf, "%s Something screwy only gave you %d.", GET_NAME(ch),
-	      bought);
+      snprintf(buf, sizeof(buf), "%s Something screwy only gave you %d.", GET_NAME(ch), bought);
     do_tell(keeper, buf, cmd_tell, 0);
   }
   if (!IS_GOD(ch))
     GET_GOLD(keeper) += goldamt;
 
-  strcpy(tempstr, times_message(ch->carrying, 0, bought));
-  sprintf(buf, "$n buys %s.", tempstr);
-  act(buf, FALSE, ch, obj, 0, TO_ROOM);
+  strlcpy(tempstr, times_message(ch->carrying, 0, bought), sizeof(tempstr));
 
-  sprintf(buf, shop_index[shop_nr].message_buy, GET_NAME(ch), goldamt);
-  do_tell(keeper, buf, cmd_tell, 0);
-  sprintf(buf, "You now have %s.\r\n", tempstr);
-  send_to_char(buf, ch);
+  snprintf(tempbuf, sizeof(tempbuf), "$n buys %s.", tempstr);
+  act(tempbuf, FALSE, ch, obj, 0, TO_ROOM);
+
+  snprintf(tempbuf, sizeof(tempbuf), shop_index[shop_nr].message_buy, GET_NAME(ch), goldamt);
+  do_tell(keeper, tempbuf, cmd_tell, 0);
 
+  send_to_char(ch, "You now have %s.\r\n", tempstr);
+
   if (SHOP_USES_BANK(shop_nr))
     if (GET_GOLD(keeper) > MAX_OUTSIDE_BANK) {
       SHOP_BANK(shop_nr) += (GET_GOLD(keeper) - MAX_OUTSIDE_BANK);
@@ -589,52 +631,47 @@ void shopping_buy(char *arg, struct char
 }
 
 
-struct obj_data *get_selling_obj(struct char_data *ch, char *name,
-		            struct char_data *keeper, int shop_nr, int msg)
+struct obj_data *get_selling_obj(struct char_data *ch, char *name, struct char_data *keeper, int shop_nr, int msg)
 {
-  char buf[MAX_STRING_LENGTH];
+  char buf[MAX_INPUT_LENGTH];
   struct obj_data *obj;
   int result;
 
   if (!(obj = get_obj_in_list_vis(ch, name, NULL, ch->carrying))) {
     if (msg) {
-      sprintf(buf, shop_index[shop_nr].no_such_item2, GET_NAME(ch));
-      do_tell(keeper, buf, cmd_tell, 0);
+      char tbuf[MAX_INPUT_LENGTH];
+
+      snprintf(tbuf, sizeof(tbuf), shop_index[shop_nr].no_such_item2, GET_NAME(ch));
+      do_tell(keeper, tbuf, cmd_tell, 0);
     }
     return (NULL);
   }
   if ((result = trade_with(obj, shop_nr)) == OBJECT_OK)
     return (obj);
 
+  if (!msg)
+    return (0);
+
   switch (result) {
   case OBJECT_NOVAL:
-    sprintf(buf, "%s You've got to be kidding, that thing is worthless!",
-	    GET_NAME(ch));
+    snprintf(buf, sizeof(buf), "%s You've got to be kidding, that thing is worthless!", GET_NAME(ch));
     break;
   case OBJECT_NOTOK:
-    sprintf(buf, shop_index[shop_nr].do_not_buy, GET_NAME(ch));
+    snprintf(buf, sizeof(buf), shop_index[shop_nr].do_not_buy, GET_NAME(ch));
     break;
   case OBJECT_DEAD:
-    sprintf(buf, "%s %s", GET_NAME(ch), MSG_NO_USED_WANDSTAFF);
+    snprintf(buf, sizeof(buf), "%s %s", GET_NAME(ch), MSG_NO_USED_WANDSTAFF);
     break;
   default:
-    log("SYSERR: Illegal return value of %d from trade_with() (%s)",
-	    result, __FILE__);	/* Someone might rename it... */
-    sprintf(buf, "%s An error has occurred.", GET_NAME(ch));
+    log("SYSERR: Illegal return value of %d from trade_with() (%s)", result, __FILE__);	/* Someone might rename it... */
+    snprintf(buf, sizeof(buf), "%s An error has occurred.", GET_NAME(ch));
     break;
   }
-  if (msg)
-    do_tell(keeper, buf, cmd_tell, 0);
+  do_tell(keeper, buf, cmd_tell, 0);
   return (NULL);
 }
 
 
-int sell_price(struct char_data *ch, struct obj_data *obj, int shop_nr)
-{
-  return (GET_OBJ_COST(obj) * SHOP_SELLPROFIT(shop_nr));
-}
-
-
 struct obj_data *slide_obj(struct obj_data *obj, struct char_data *keeper,
 			            int shop_nr)
 /*
@@ -699,11 +736,9 @@ void sort_keeper_objs(struct char_data *
 }
 
 
-void shopping_sell(char *arg, struct char_data *ch,
-		        struct char_data *keeper, int shop_nr)
+void shopping_sell(char *arg, struct char_data *ch, struct char_data *keeper, int shop_nr)
 {
-  char	tempstr[MAX_INPUT_LENGTH], buf[MAX_STRING_LENGTH],
-	name[MAX_INPUT_LENGTH];
+  char tempstr[MAX_INPUT_LENGTH], name[MAX_INPUT_LENGTH], tempbuf[MAX_INPUT_LENGTH];
   struct obj_data *obj;
   int sellnum, sold = 0, goldamt = 0;
 
@@ -711,13 +746,16 @@ void shopping_sell(char *arg, struct cha
     return;
 
   if ((sellnum = transaction_amt(arg)) < 0) {
-    sprintf(buf, "%s A negative amount?  Try buying something.",
-	    GET_NAME(ch));
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), "%s A negative amount?  Try buying something.", GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
   if (!*arg || !sellnum) {
-    sprintf(buf, "%s What do you want to sell??", GET_NAME(ch));
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), "%s What do you want to sell??", GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
@@ -725,45 +763,47 @@ void shopping_sell(char *arg, struct cha
   if (!(obj = get_selling_obj(ch, name, keeper, shop_nr, TRUE)))
     return;
 
-  if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) < sell_price(ch, obj, shop_nr)) {
-    sprintf(buf, shop_index[shop_nr].missing_cash1, GET_NAME(ch));
+  if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) < sell_price(obj, shop_nr, keeper, ch)) {
+    char buf[MAX_INPUT_LENGTH];
+
+    snprintf(buf, sizeof(buf), shop_index[shop_nr].missing_cash1, GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
-  while (obj && GET_GOLD(keeper) + SHOP_BANK(shop_nr) >=
-		   sell_price(ch, obj, shop_nr) && sold < sellnum) {
-    sold++;
+  while (obj && GET_GOLD(keeper) + SHOP_BANK(shop_nr) >= sell_price(obj, shop_nr, keeper, ch) && sold < sellnum) {
+    int charged = sell_price(obj, shop_nr, keeper, ch);
 
-    goldamt += sell_price(ch, obj, shop_nr);
-    GET_GOLD(keeper) -= sell_price(ch, obj, shop_nr);
-	
+    goldamt += charged;
+    GET_GOLD(keeper) -= charged;
+
+    sold++;
     obj_from_char(obj);
     slide_obj(obj, keeper, shop_nr);	/* Seems we don't use return value. */
     obj = get_selling_obj(ch, name, keeper, shop_nr, FALSE);
   }
 
   if (sold < sellnum) {
+    char buf[MAX_INPUT_LENGTH];
+
     if (!obj)
-      sprintf(buf, "%s You only have %d of those.", GET_NAME(ch), sold);
-    else if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) <
-	     sell_price(ch, obj, shop_nr))
-      sprintf(buf, "%s I can only afford to buy %d of those.",
-	      GET_NAME(ch), sold);
+      snprintf(buf, sizeof(buf), "%s You only have %d of those.", GET_NAME(ch), sold);
+    else if (GET_GOLD(keeper) + SHOP_BANK(shop_nr) < sell_price(obj, shop_nr, keeper, ch))
+      snprintf(buf, sizeof(buf), "%s I can only afford to buy %d of those.", GET_NAME(ch), sold);
     else
-      sprintf(buf, "%s Something really screwy made me buy %d.",
-	      GET_NAME(ch), sold);
+      snprintf(buf, sizeof(buf), "%s Something really screwy made me buy %d.", GET_NAME(ch), sold);
 
     do_tell(keeper, buf, cmd_tell, 0);
   }
   GET_GOLD(ch) += goldamt;
-  strcpy(tempstr, times_message(0, name, sold));
-  sprintf(buf, "$n sells %s.", tempstr);
-  act(buf, FALSE, ch, obj, 0, TO_ROOM);
 
-  sprintf(buf, shop_index[shop_nr].message_sell, GET_NAME(ch), goldamt);
-  do_tell(keeper, buf, cmd_tell, 0);
-  sprintf(buf, "The shopkeeper now has %s.\r\n", tempstr);
-  send_to_char(buf, ch);
+  strlcpy(tempstr, times_message(0, name, sold), sizeof(tempstr));
+  snprintf(tempbuf, sizeof(tempbuf), "$n sells %s.", tempstr);
+  act(tempbuf, FALSE, ch, obj, 0, TO_ROOM);
+
+  snprintf(tempbuf, sizeof(tempbuf), shop_index[shop_nr].message_sell, GET_NAME(ch), goldamt);
+  do_tell(keeper, tempbuf, cmd_tell, 0);
+
+  send_to_char(ch, "The shopkeeper now has %s.\r\n", tempstr);
 
   if (GET_GOLD(keeper) < MIN_OUTSIDE_BANK) {
     goldamt = MIN(MAX_OUTSIDE_BANK - GET_GOLD(keeper), SHOP_BANK(shop_nr));
@@ -773,8 +813,7 @@ void shopping_sell(char *arg, struct cha
 }
 
 
-void shopping_value(char *arg, struct char_data *ch,
-		         struct char_data *keeper, int shop_nr)
+void shopping_value(char *arg, struct char_data *ch, struct char_data *keeper, int shop_nr)
 {
   char buf[MAX_STRING_LENGTH], name[MAX_INPUT_LENGTH];
   struct obj_data *obj;
@@ -783,7 +822,7 @@ void shopping_value(char *arg, struct ch
     return;
 
   if (!*arg) {
-    sprintf(buf, "%s What do you want me to evaluate??", GET_NAME(ch));
+    snprintf(buf, sizeof(buf), "%s What do you want me to evaluate??", GET_NAME(ch));
     do_tell(keeper, buf, cmd_tell, 0);
     return;
   }
@@ -791,49 +830,54 @@ void shopping_value(char *arg, struct ch
   if (!(obj = get_selling_obj(ch, name, keeper, shop_nr, TRUE)))
     return;
 
-  sprintf(buf, "%s I'll give you %d gold coins for that!", GET_NAME(ch),
-	  sell_price(ch, obj, shop_nr));
+  snprintf(buf, sizeof(buf), "%s I'll give you %d gold coins for that!", GET_NAME(ch), sell_price(obj, shop_nr, keeper, ch));
   do_tell(keeper, buf, cmd_tell, 0);
-
-  return;
 }
 
 
-char *list_object(struct obj_data *obj, int cnt, int index, int shop_nr)
+char *list_object(struct obj_data *obj, int cnt, int aindex, int shop_nr, struct char_data *keeper, struct char_data *ch)
 {
-  static char buf[256];
-  char buf2[300], buf3[200];
+  static char result[256];
+  char	itemname[128],
+	quantity[16];	/* "Unlimited" or "%d" */
 
   if (shop_producing(obj, shop_nr))
-    strcpy(buf2, "Unlimited   ");
+    strcpy(quantity, "Unlimited");	/* strcpy: OK (for 'quantity >= 10') */
   else
-    sprintf(buf2, "%5d       ", cnt);
-  sprintf(buf, " %2d)  %s", index, buf2);
+    sprintf(quantity, "%d", cnt);	/* sprintf: OK (for 'quantity >= 11', 32-bit int) */
+
+  switch (GET_OBJ_TYPE(obj)) {
+  case ITEM_DRINKCON:
+    if (GET_OBJ_VAL(obj, 1))
+      snprintf(itemname, sizeof(itemname), "%s of %s", obj->short_description, drinks[GET_OBJ_VAL(obj, 2)]);
+    else
+      strlcpy(itemname, obj->short_description, sizeof(itemname));
+    break;
 
-  /* Compile object name and information */
-  strcpy(buf3, obj->short_description);
-  if (GET_OBJ_TYPE(obj) == ITEM_DRINKCON && GET_OBJ_VAL(obj, 1))
-    sprintf(END_OF(buf3), " of %s", drinks[GET_OBJ_VAL(obj, 2)]);
-
-  /* FUTURE: */
-  /* Add glow/hum/etc */
-
-  if (GET_OBJ_TYPE(obj) == ITEM_WAND || GET_OBJ_TYPE(obj) == ITEM_STAFF)
-    if (GET_OBJ_VAL(obj, 2) < GET_OBJ_VAL(obj, 1))
-      strcat(buf3, " (partially used)");
+  case ITEM_WAND:
+  case ITEM_STAFF:
+    snprintf(itemname, sizeof(itemname), "%s%s", obj->short_description,
+	GET_OBJ_VAL(obj, 2) < GET_OBJ_VAL(obj, 1) ? " (partially used)" : "");
+    break;
 
-  sprintf(buf2, "%-48s %6d\r\n", buf3, buy_price(obj, shop_nr));
-  strcat(buf, CAP(buf2));
-  return (buf);
+  default:
+    strlcpy(itemname, obj->short_description, sizeof(itemname));
+    break;
+  }
+  CAP(itemname);
+
+  snprintf(result, sizeof(result), " %2d)  %9s   %-48s %6d\r\n",
+	aindex, quantity, itemname, buy_price(obj, shop_nr, keeper, ch));
+  return (result);
 }
 
 
-void shopping_list(char *arg, struct char_data *ch,
-		        struct char_data *keeper, int shop_nr)
+void shopping_list(char *arg, struct char_data *ch, struct char_data *keeper, int shop_nr)
 {
   char buf[MAX_STRING_LENGTH], name[MAX_INPUT_LENGTH];
   struct obj_data *obj, *last_obj = NULL;
-  int cnt = 0, index = 0, found = FALSE;
+  int cnt = 0, lindex = 0, found = FALSE;
+  size_t len;
   /* cnt is the number of that particular object available */
 
   if (!is_ok(keeper, ch, shop_nr))
@@ -843,8 +887,9 @@ void shopping_list(char *arg, struct cha
     sort_keeper_objs(keeper, shop_nr);
 
   one_argument(arg, name);
-  strcpy(buf, " ##   Available   Item                                               Cost\r\n");
-  strcat(buf, "-------------------------------------------------------------------------\r\n");
+
+  len = strlcpy(buf,   " ##   Available   Item                                               Cost\r\n"
+		"-------------------------------------------------------------------------\r\n", sizeof(buf));
   if (keeper->carrying)
     for (obj = keeper->carrying; obj; obj = obj->next_content)
       if (CAN_SEE_OBJ(ch, obj) && GET_OBJ_COST(obj) > 0) {
@@ -854,33 +899,38 @@ void shopping_list(char *arg, struct cha
 	} else if (same_obj(last_obj, obj))
 	  cnt++;
 	else {
-	  index++;
+	  lindex++;
 	  if (!*name || isname(name, last_obj->name)) {
-	    strcat(buf, list_object(last_obj, cnt, index, shop_nr));
+	    strncat(buf, list_object(last_obj, cnt, lindex, shop_nr, keeper, ch), sizeof(buf) - len - 1);	/* strncat: OK */
+            len = strlen(buf);
+            if (len + 1 >= sizeof(buf))
+              break;
             found = TRUE;
           }
 	  cnt = 1;
 	  last_obj = obj;
 	}
       }
-  index++;
-  if (!last_obj) /* we actually have nothing in our list for sale, period */
-    strcpy(buf, "Currently, there is nothing for sale.\r\n");
-  else if (!*name || isname(name, last_obj->name)) /* show last obj */
-    strcat(buf, list_object(last_obj, cnt, index, shop_nr));
-  else if (!found) /* nothing the char was looking for was found */
-    strcpy(buf, "Presently, none of those are for sale.\r\n");
-
-  page_string(ch->desc, buf, TRUE);
+  lindex++;
+  if (!last_obj)	/* we actually have nothing in our list for sale, period */
+    send_to_char(ch, "Currently, there is nothing for sale.\r\n");
+  else if (!found)	/* nothing the char was looking for was found */
+    send_to_char(ch, "Presently, none of those are for sale.\r\n");
+  else {
+    if (!*name || isname(name, last_obj->name))	/* show last obj */
+      if (len < sizeof(buf))
+        strncat(buf, list_object(last_obj, cnt, lindex, shop_nr, keeper, ch), sizeof(buf) - len - 1);	/* strncat: OK */
+    page_string(ch->desc, buf, TRUE);
+  }
 }
 
 
 int ok_shop_room(int shop_nr, room_vnum room)
 {
-  int index;
+  int mindex;
 
-  for (index = 0; SHOP_ROOM(shop_nr, index) != NOWHERE; index++)
-    if (SHOP_ROOM(shop_nr, index) == room)
+  for (mindex = 0; SHOP_ROOM(shop_nr, mindex) != NOWHERE; mindex++)
+    if (SHOP_ROOM(shop_nr, mindex) == room)
       return (TRUE);
   return (FALSE);
 }
@@ -888,8 +938,7 @@ int ok_shop_room(int shop_nr, room_vnum 
 
 SPECIAL(shop_keeper)
 {
-  char argm[MAX_INPUT_LENGTH];
-  struct char_data *keeper = (struct char_data *) me;
+  struct char_data *keeper = (struct char_data *)me;
   int shop_nr;
 
   for (shop_nr = 0; shop_nr <= top_shop; shop_nr++)
@@ -915,9 +964,12 @@ SPECIAL(shop_keeper)
     return (FALSE);
 
   if (CMD_IS("steal")) {
-    sprintf(argm, "$N shouts '%s'", MSG_NO_STEAL_HERE);
-    do_action(keeper, GET_NAME(ch), cmd_slap, 0);
+    char argm[MAX_INPUT_LENGTH];
+
+    snprintf(argm, sizeof(argm), "$N shouts '%s'", MSG_NO_STEAL_HERE);
     act(argm, FALSE, ch, 0, keeper, TO_CHAR);
+
+    do_action(keeper, GET_NAME(ch), cmd_slap, 0);
     return (TRUE);
   }
 
@@ -940,21 +992,26 @@ SPECIAL(shop_keeper)
 
 int ok_damage_shopkeeper(struct char_data *ch, struct char_data *victim)
 {
-  char buf[MAX_INPUT_LENGTH];
-  int index;
+  int sindex;
+
+  if (!IS_MOB(victim) || mob_index[GET_MOB_RNUM(victim)].func != shop_keeper)
+    return (TRUE);
 
   /* Prevent "invincible" shopkeepers if they're charmed. */
   if (AFF_FLAGGED(victim, AFF_CHARM))
     return (TRUE);
 
-  if (IS_MOB(victim) && mob_index[GET_MOB_RNUM(victim)].func == shop_keeper)
-    for (index = 0; index <= top_shop; index++)
-      if (GET_MOB_RNUM(victim) == SHOP_KEEPER(index) && !SHOP_KILL_CHARS(index)) {
-	do_action(victim, GET_NAME(ch), cmd_slap, 0);
-	sprintf(buf, "%s %s", GET_NAME(ch), MSG_CANT_KILL_KEEPER);
-	do_tell(victim, buf, cmd_tell, 0);
-	return (FALSE);
-      }
+  for (sindex = 0; sindex <= top_shop; sindex++)
+    if (GET_MOB_RNUM(victim) == SHOP_KEEPER(sindex) && !SHOP_KILL_CHARS(sindex)) {
+      char buf[MAX_INPUT_LENGTH];
+
+      snprintf(buf, sizeof(buf), "%s %s", GET_NAME(ch), MSG_CANT_KILL_KEEPER);
+      do_tell(victim, buf, cmd_tell, 0);
+
+      do_action(victim, GET_NAME(ch), cmd_slap, 0);
+      return (FALSE);
+    }
+
   return (TRUE);
 }
 
@@ -991,6 +1048,8 @@ int end_read_list(struct shop_buy_data *
 
 void read_line(FILE *shop_f, const char *string, void *data)
 {
+  char buf[READ_SIZE];
+
   if (!get_line(shop_f, buf) || !sscanf(buf, string, data)) {
     log("SYSERR: Error in shop #%d, near '%s' with '%s'", SHOP_NUM(top_shop), buf, string);
     exit(1);
@@ -1023,25 +1082,27 @@ int read_list(FILE *shop_f, struct shop_
 int read_type_list(FILE *shop_f, struct shop_buy_data *list,
 		       int new_format, int max)
 {
-  int index, num, len = 0, error = 0;
+  int tindex, num, len = 0, error = 0;
   char *ptr;
+  char buf[MAX_STRING_LENGTH];
 
   if (!new_format)
     return (read_list(shop_f, list, 0, max, LIST_TRADE));
 
   do {
-    fgets(buf, MAX_STRING_LENGTH - 1, shop_f);
+    fgets(buf, sizeof(buf), shop_f);
     if ((ptr = strchr(buf, ';')) != NULL)
       *ptr = '\0';
     else
       *(END_OF(buf) - 1) = '\0';
+
     num = NOTHING;
 
     if (strncmp(buf, "-1", 4) != 0)
-      for (index = 0; *item_types[index] != '\n'; index++)
-        if (!strn_cmp(item_types[index], buf, strlen(item_types[index]))) {
-          num = index;
-          strcpy(buf, buf + strlen(item_types[index]));
+      for (tindex = 0; *item_types[tindex] != '\n'; tindex++)
+        if (!strn_cmp(item_types[tindex], buf, strlen(item_types[tindex]))) {
+          num = tindex;
+          strcpy(buf, buf + strlen(item_types[tindex]));	/* strcpy: OK (always smaller) */
           break;
         }
 
@@ -1059,7 +1120,7 @@ int read_type_list(FILE *shop_f, struct 
       *(END_OF(ptr) - 1) = '\0';
     error += add_to_list(list, LIST_TRADE, &len, &num);
     if (*ptr)
-      BUY_WORD(list[len - 1]) = str_dup(ptr);
+      BUY_WORD(list[len - 1]) = strdup(ptr);
   } while (num >= 0);
   return (end_read_list(list, len, error));
 }
@@ -1111,13 +1172,13 @@ void boot_the_shops(FILE *shop_f, char *
   struct shop_buy_data list[MAX_SHOP_OBJ + 1];
   int done = FALSE;
 
-  sprintf(buf2, "beginning of shop file %s", filename);
+  snprintf(buf2, sizeof(buf2), "beginning of shop file %s", filename);
 
   while (!done) {
     buf = fread_string(shop_f, buf2);
     if (*buf == '#') {		/* New shop */
       sscanf(buf, "#%d\n", &temp);
-      sprintf(buf2, "shop #%d in shop file %s", temp, filename);
+      snprintf(buf2, sizeof(buf2), "shop #%d in shop file %s", temp, filename);
       free(buf);		/* Plug memory leak! */
       top_shop++;
       if (!top_shop)
@@ -1178,40 +1239,51 @@ void boot_the_shops(FILE *shop_f, char *
 
 void assign_the_shopkeepers(void)
 {
-  int index;
+  int cindex;
 
   cmd_say = find_command("say");
   cmd_tell = find_command("tell");
   cmd_emote = find_command("emote");
   cmd_slap = find_command("slap");
   cmd_puke = find_command("puke");
-  for (index = 0; index <= top_shop; index++) {
-    if (SHOP_KEEPER(index) == NOBODY)
+  for (cindex = 0; cindex <= top_shop; cindex++) {
+    if (SHOP_KEEPER(cindex) == NOBODY)
       continue;
-    if (mob_index[SHOP_KEEPER(index)].func)
-      SHOP_FUNC(index) = mob_index[SHOP_KEEPER(index)].func;
-    mob_index[SHOP_KEEPER(index)].func = shop_keeper;
+    if (mob_index[SHOP_KEEPER(cindex)].func)
+      SHOP_FUNC(cindex) = mob_index[SHOP_KEEPER(cindex)].func;
+    mob_index[SHOP_KEEPER(cindex)].func = shop_keeper;
   }
 }
 
 
 char *customer_string(int shop_nr, int detailed)
 {
-  int index, cnt = 1;
+  int sindex, cnt = 1, nlen;
+  size_t len = 0;
   static char buf[256];
 
-  *buf = 0;
-  for (index = 0; *trade_letters[index] != '\n'; index++, cnt *= 2)
-    if (!(SHOP_TRADE_WITH(shop_nr) & cnt)) {
+  for (sindex = 0; *trade_letters[sindex] != '\n' && len + 1 < sizeof(buf); sindex++, cnt <<= 1)
+    if (SHOP_TRADE_WITH(shop_nr) & cnt) {
+      if (!detailed) {
+        strlcpy(buf + len, "_", sizeof(buf) - len);
+        len++;
+        if (len >= sizeof(buf))
+          break;
+      }
+    } else {
       if (detailed) {
-	if (*buf)
-	  strcat(buf, ", ");
-	strcat(buf, trade_letters[index]);
+	nlen = snprintf(buf + len, sizeof(buf) - len, "%s%s", len > 0 ? ", " : "", trade_letters[sindex]);
+        if (len + nlen >= sizeof(buf) || nlen < 0)
+          break;
+        len += nlen;
+      } else if (len + 2 <= sizeof(buf)) {
+        buf[len++] = *trade_letters[sindex];
+        buf[len++] = '\0';
       } else
-	sprintf(END_OF(buf), "%c", *trade_letters[index]);
-    } else if (!detailed)
-      strcat(buf, "_");
+        break;
+    }
 
+  buf[sizeof(buf) - 1] = '\0';
   return (buf);
 }
 
@@ -1219,131 +1291,169 @@ char *customer_string(int shop_nr, int d
 /* END_OF inefficient */
 void list_all_shops(struct char_data *ch)
 {
-  int shop_nr;
+  const char *list_all_shops_header =
+	" ##   Virtual   Where    Keeper    Buy   Sell   Customers\r\n"
+	"---------------------------------------------------------\r\n";
+  int shop_nr, headerlen = strlen(list_all_shops_header);
+  size_t len = 0;
+  char buf[MAX_STRING_LENGTH], buf1[16];
 
   *buf = '\0';
-  for (shop_nr = 0; shop_nr <= top_shop; shop_nr++) {
+  for (shop_nr = 0; shop_nr <= top_shop && len < sizeof(buf); shop_nr++) {
+    /* New page in page_string() mechanism, print the header again. */
     if (!(shop_nr % (PAGE_LENGTH - 2))) {
-      strcat(buf, " ##   Virtual   Where    Keeper    Buy   Sell   Customers\r\n");
-      strcat(buf, "---------------------------------------------------------\r\n");
+      /*
+       * If we don't have enough room for the header, or all we have room left
+       * for is the header, then don't add it and just quit now.
+       */
+      if (len + headerlen + 1 >= sizeof(buf))
+        break;
+      strcpy(buf + len, list_all_shops_header);	/* strcpy: OK (length checked above) */
+      len += headerlen;
     }
-    sprintf(buf2, "%3d   %6d   %6d    ", shop_nr + 1, SHOP_NUM(shop_nr),
-	    SHOP_ROOM(shop_nr, 0));
+
     if (SHOP_KEEPER(shop_nr) == NOBODY)
-      strcpy(buf1, "<NONE>");
+      strcpy(buf1, "<NONE>");	/* strcpy: OK (for 'buf1 >= 7') */
     else
-      sprintf(buf1, "%6d", mob_index[SHOP_KEEPER(shop_nr)].vnum);
-    sprintf(END_OF(buf2), "%s   %3.2f   %3.2f    ", buf1,
-	    SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr));
-    strcat(buf2, customer_string(shop_nr, FALSE));
-    sprintf(END_OF(buf), "%s\r\n", buf2);
+      sprintf(buf1, "%6d", mob_index[SHOP_KEEPER(shop_nr)].vnum);	/* sprintf: OK (for 'buf1 >= 11', 32-bit int) */
+
+    snprintf(buf + len, sizeof(buf) - len, "%3d   %6d   %6d    %s   %3.2f   %3.2f    %s\r\n",
+	shop_nr + 1, SHOP_NUM(shop_nr), SHOP_ROOM(shop_nr, 0), buf1,
+	SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr), customer_string(shop_nr, FALSE));
   }
 
   page_string(ch->desc, buf, TRUE);
 }
 
 
-void handle_detailed_list(char *buf, char *buf1, struct char_data *ch)
-{
-  if (strlen(buf1) + strlen(buf) < 78 || strlen(buf) < 20)
-    strcat(buf, buf1);
-  else {
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
-    sprintf(buf, "            %s", buf1);
-  }
-}
-
-
 void list_detailed_shop(struct char_data *ch, int shop_nr)
 {
-  struct obj_data *obj;
   struct char_data *k;
-  int index, temp;
+  int sindex, column;
+  char *ptrsave;
 
-  sprintf(buf, "Vnum:       [%5d], Rnum: [%5d]\r\n", SHOP_NUM(shop_nr),
-	  shop_nr + 1);
-  send_to_char(buf, ch);
-
-  strcpy(buf, "Rooms:      ");
-  for (index = 0; SHOP_ROOM(shop_nr, index) != NOWHERE; index++) {
-    if (index)
-      strcat(buf, ", ");
-    if ((temp = real_room(SHOP_ROOM(shop_nr, index))) != NOWHERE)
-      sprintf(buf1, "%s (#%d)", world[temp].name, GET_ROOM_VNUM(temp));
+  send_to_char(ch, "Vnum:       [%5d], Rnum: [%5d]\r\n", SHOP_NUM(shop_nr), shop_nr + 1);
+
+
+  send_to_char(ch, "Rooms:      ");
+  column = 12;	/* ^^^ strlen ^^^ */
+  for (sindex = 0; SHOP_ROOM(shop_nr, sindex) != NOWHERE; sindex++) {
+    char buf1[128];
+    int linelen, temp;
+
+    if (sindex) {
+      send_to_char(ch, ", ");
+      column += 2;
+    }
+
+    if ((temp = real_room(SHOP_ROOM(shop_nr, sindex))) != NOWHERE)
+      linelen = snprintf(buf1, sizeof(buf1), "%s (#%d)", world[temp].name, GET_ROOM_VNUM(temp));
     else
-      sprintf(buf1, "<UNKNOWN> (#%d)", SHOP_ROOM(shop_nr, index));
-    handle_detailed_list(buf, buf1, ch);
-  }
-  if (!index)
-    send_to_char("Rooms:      None!\r\n", ch);
-  else {
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
+      linelen = snprintf(buf1, sizeof(buf1), "<UNKNOWN> (#%d)", SHOP_ROOM(shop_nr, sindex));
+
+    /* Implementing word-wrapping: assumes screen-size == 80 */
+    if (linelen + column >= 78 && column >= 20) {
+      send_to_char(ch, "\r\n            ");
+      /* 12 is to line up with "Rooms:" printed first, and spaces above. */
+      column = 12;
+    }
+
+    if (!send_to_char(ch, "%s", buf1))
+      return;
+    column += linelen;
   }
+  if (!sindex)
+    send_to_char(ch, "Rooms:      None!\r\n");
+
 
-  strcpy(buf, "Shopkeeper: ");
-  if (SHOP_KEEPER(shop_nr) != NOBODY) {
-    sprintf(END_OF(buf), "%s (#%d), Special Function: %s\r\n",
-	    GET_NAME(&mob_proto[SHOP_KEEPER(shop_nr)]),
-	mob_index[SHOP_KEEPER(shop_nr)].vnum, YESNO(SHOP_FUNC(shop_nr)));
-    if ((k = get_char_num(SHOP_KEEPER(shop_nr)))) {
-      send_to_char(buf, ch);
-      sprintf(buf, "Coins:      [%9d], Bank: [%9d] (Total: %d)\r\n",
+  send_to_char(ch, "Shopkeeper: ");
+  if (SHOP_KEEPER(shop_nr) >= 0) {
+    send_to_char(ch, "%s (#%d), Special Function: %s\r\n",
+	GET_NAME(&mob_proto[SHOP_KEEPER(shop_nr)]),
+	mob_index[SHOP_KEEPER(shop_nr)].vnum,
+	YESNO(SHOP_FUNC(shop_nr)));
+
+    if ((k = get_char_num(SHOP_KEEPER(shop_nr))))
+      send_to_char(ch, "Coins:      [%9d], Bank: [%9d] (Total: %d)\r\n",
 	 GET_GOLD(k), SHOP_BANK(shop_nr), GET_GOLD(k) + SHOP_BANK(shop_nr));
-    }
   } else
-    strcat(buf, "<NONE>\r\n");
-  send_to_char(buf, ch);
+    send_to_char(ch, "<NONE>\r\n");
 
-  strcpy(buf1, customer_string(shop_nr, TRUE));
-  sprintf(buf, "Customers:  %s\r\n", (*buf1) ? buf1 : "None");
-  send_to_char(buf, ch);
-
-  strcpy(buf, "Produces:   ");
-  for (index = 0; SHOP_PRODUCT(shop_nr, index) != NOTHING; index++) {
-    obj = &obj_proto[SHOP_PRODUCT(shop_nr, index)];
-    if (index)
-      strcat(buf, ", ");
-    sprintf(buf1, "%s (#%d)", obj->short_description,
-	    obj_index[SHOP_PRODUCT(shop_nr, index)].vnum);
-    handle_detailed_list(buf, buf1, ch);
-  }
-  if (!index)
-    send_to_char("Produces:   Nothing!\r\n", ch);
-  else {
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
-  }
 
-  strcpy(buf, "Buys:       ");
-  for (index = 0; SHOP_BUYTYPE(shop_nr, index) != NOTHING; index++) {
-    if (index)
-      strcat(buf, ", ");
-    sprintf(buf1, "%s (#%d) ", item_types[SHOP_BUYTYPE(shop_nr, index)],
-	    SHOP_BUYTYPE(shop_nr, index));
-    if (SHOP_BUYWORD(shop_nr, index))
-      sprintf(END_OF(buf1), "[%s]", SHOP_BUYWORD(shop_nr, index));
-    else
-      strcat(buf1, "[all]");
-    handle_detailed_list(buf, buf1, ch);
+  send_to_char(ch, "Customers:  %s\r\n", (ptrsave = customer_string(shop_nr, TRUE)) ? ptrsave : "None");
+
+
+  send_to_char(ch, "Produces:   ");
+  column = 12;	/* ^^^ strlen ^^^ */
+  for (sindex = 0; SHOP_PRODUCT(shop_nr, sindex) != NOTHING; sindex++) {
+    char buf1[128];
+    int linelen;
+
+    if (sindex) {
+      send_to_char(ch, ", ");
+      column += 2;
+    }
+    linelen = snprintf(buf1, sizeof(buf1), "%s (#%d)",
+		obj_proto[SHOP_PRODUCT(shop_nr, sindex)].short_description,
+		obj_index[SHOP_PRODUCT(shop_nr, sindex)].vnum);
+
+    /* Implementing word-wrapping: assumes screen-size == 80 */
+    if (linelen + column >= 78 && column >= 20) {
+      send_to_char(ch, "\r\n            ");
+      /* 12 is to line up with "Produces:" printed first, and spaces above. */
+      column = 12;
+    }
+
+    if (!send_to_char(ch, "%s", buf1))
+      return;
+    column += linelen;
   }
-  if (!index)
-    send_to_char("Buys:       Nothing!\r\n", ch);
-  else {
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
+  if (!sindex)
+    send_to_char(ch, "Produces:   Nothing!\r\n");
+
+
+  send_to_char(ch, "Buys:       ");
+  column = 12;	/* ^^^ strlen ^^^ */
+  for (sindex = 0; SHOP_BUYTYPE(shop_nr, sindex) != NOTHING; sindex++) {
+    char buf1[128];
+    size_t linelen;
+
+    if (sindex) {
+      send_to_char(ch, ", ");
+      column += 2;
+    }
+
+    linelen = snprintf(buf1, sizeof(buf1), "%s (#%d) [%s]",
+		item_types[SHOP_BUYTYPE(shop_nr, sindex)],
+		SHOP_BUYTYPE(shop_nr, sindex),
+		SHOP_BUYWORD(shop_nr, sindex) ? SHOP_BUYWORD(shop_nr, sindex) : "all");
+
+    /* Implementing word-wrapping: assumes screen-size == 80 */
+    if (linelen + column >= 78 && column >= 20) {
+      send_to_char(ch, "\r\n            ");
+      /* 12 is to line up with "Buys:" printed first, and spaces above. */
+      column = 12;
+    }
+
+    if (!send_to_char(ch, "%s", buf1))
+      return;
+    column += linelen;
   }
+  if (!sindex)
+    send_to_char(ch, "Buys:       Nothing!\r\n");
 
-  sprintf(buf, "Buy at:     [%4.2f], Sell at: [%4.2f], Open: [%d-%d, %d-%d]%s",
-     SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr), SHOP_OPEN1(shop_nr),
-   SHOP_CLOSE1(shop_nr), SHOP_OPEN2(shop_nr), SHOP_CLOSE2(shop_nr), "\r\n");
 
-  send_to_char(buf, ch);
+  send_to_char(ch, "Buy at:     [%4.2f], Sell at: [%4.2f], Open: [%d-%d, %d-%d]\r\n",
+	SHOP_SELLPROFIT(shop_nr), SHOP_BUYPROFIT(shop_nr), SHOP_OPEN1(shop_nr),
+	SHOP_CLOSE1(shop_nr), SHOP_OPEN2(shop_nr), SHOP_CLOSE2(shop_nr));
 
-  sprintbit(SHOP_BITVECTOR(shop_nr), shop_bits, buf1);
-  sprintf(buf, "Bits:       %s\r\n", buf1);
-  send_to_char(buf, ch);
+
+  /* Need a local buffer. */
+  {
+    char buf1[128];
+    sprintbit(SHOP_BITVECTOR(shop_nr), shop_bits, buf1, sizeof(buf1));
+    send_to_char(ch, "Bits:       %s\r\n", buf1);
+  }
 }
 
 
@@ -1360,7 +1470,7 @@ void show_shops(struct char_data *ch, ch
 	  break;
 
       if (shop_nr > top_shop) {
-	send_to_char("This isn't a shop!\r\n", ch);
+	send_to_char(ch, "This isn't a shop!\r\n");
 	return;
       }
     } else if (is_number(arg))
@@ -1369,7 +1479,7 @@ void show_shops(struct char_data *ch, ch
       shop_nr = -1;
 
     if (shop_nr < 0 || shop_nr > top_shop) {
-      send_to_char("Illegal shop number.\r\n", ch);
+      send_to_char(ch, "Illegal shop number.\r\n");
       return;
     }
     list_detailed_shop(ch, shop_nr);
Index: src/spec_procs.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/spec_procs.c,v
retrieving revision 1.31
retrieving revision 1.40
diff -u -p -r1.31 -r1.40
--- src/spec_procs.c	2001/12/10 13:54:38	1.31
+++ src/spec_procs.c	2002/04/09 14:33:12	1.40
@@ -23,10 +23,9 @@
 /*   external vars  */
 extern struct time_info_data time_info;
 extern struct spell_info_type spell_info[];
-extern int guild_info[][3];
+extern struct guild_info_type guild_info[];
 
 /* extern functions */
-void add_follower(struct char_data *ch, struct char_data *leader);
 ACMD(do_drop);
 ACMD(do_gen_door);
 ACMD(do_say);
@@ -122,31 +121,33 @@ extern int prac_params[4][NUM_CLASSES];
 
 void list_skills(struct char_data *ch)
 {
+  const char *overflow = "\r\n**OVERFLOW**\r\n";
   int i, sortpos;
+  size_t len = 0, nlen;
+  char buf2[MAX_STRING_LENGTH];
 
-  if (!GET_PRACTICES(ch))
-    strcpy(buf, "You have no practice sessions remaining.\r\n");
-  else
-    sprintf(buf, "You have %d practice session%s remaining.\r\n",
-	    GET_PRACTICES(ch), (GET_PRACTICES(ch) == 1 ? "" : "s"));
-
-  sprintf(buf + strlen(buf), "You know of the following %ss:\r\n", SPLSKL(ch));
-
-  strcpy(buf2, buf);
+  if (!GET_PRACTICES(ch)) {
+    send_to_char(ch, "You have no practice sessions remaining.\r\n");
+    return;
+  }
 
+  len = snprintf(buf2, sizeof(buf2), "You have %d practice session%s remaining.\r\n"
+	"You know of the following %ss:\r\n", GET_PRACTICES(ch),
+	GET_PRACTICES(ch) == 1 ? "" : "s", SPLSKL(ch));
+  
   for (sortpos = 1; sortpos <= MAX_SKILLS; sortpos++) {
     i = spell_sort_info[sortpos];
-    if (strlen(buf2) >= MAX_STRING_LENGTH - 32) {
-      strcat(buf2, "**OVERFLOW**\r\n");
-      break;
-    }
     if (GET_LEVEL(ch) >= spell_info[i].min_level[(int) GET_CLASS(ch)]) {
-      sprintf(buf, "%-20s %s\r\n", spell_info[i].name, how_good(GET_SKILL(ch, i)));
-      strcat(buf2, buf);	/* The above, ^ should always be safe to do. */
+      nlen = snprintf(buf2 + len, sizeof(buf2) - len, "%-20s %s\r\n", spell_info[i].name, how_good(GET_SKILL(ch, i)));
+      if (len + nlen >= sizeof(buf2) || nlen < 0)
+        break;
+      len += nlen;
     }
   }
+  if (len >= sizeof(buf2))
+    strcpy(buf2 + sizeof(buf2) - strlen(overflow) - 1, overflow); /* strcpy: OK */
 
-  page_string(ch->desc, buf2, 1);
+  page_string(ch->desc, buf2, TRUE);
 }
 
 
@@ -164,7 +165,7 @@ SPECIAL(guild)
     return (TRUE);
   }
   if (GET_PRACTICES(ch) <= 0) {
-    send_to_char("You do not seem to be able to practice now.\r\n", ch);
+    send_to_char(ch, "You do not seem to be able to practice now.\r\n");
     return (TRUE);
   }
 
@@ -172,15 +173,14 @@ SPECIAL(guild)
 
   if (skill_num < 1 ||
       GET_LEVEL(ch) < spell_info[skill_num].min_level[(int) GET_CLASS(ch)]) {
-    sprintf(buf, "You do not know of that %s.\r\n", SPLSKL(ch));
-    send_to_char(buf, ch);
+    send_to_char(ch, "You do not know of that %s.\r\n", SPLSKL(ch));
     return (TRUE);
   }
   if (GET_SKILL(ch, skill_num) >= LEARNED(ch)) {
-    send_to_char("You are already learned in that area.\r\n", ch);
+    send_to_char(ch, "You are already learned in that area.\r\n");
     return (TRUE);
   }
-  send_to_char("You practice for a while...\r\n", ch);
+  send_to_char(ch, "You practice for a while...\r\n");
   GET_PRACTICES(ch)--;
 
   percent = GET_SKILL(ch, skill_num);
@@ -189,7 +189,7 @@ SPECIAL(guild)
   SET_SKILL(ch, skill_num, MIN(LEARNED(ch), percent));
 
   if (GET_SKILL(ch, skill_num) >= LEARNED(ch))
-    send_to_char("You are now learned in that area.\r\n", ch);
+    send_to_char(ch, "You are now learned in that area.\r\n");
 
   return (TRUE);
 }
@@ -209,7 +209,7 @@ SPECIAL(dump)
   if (!CMD_IS("drop"))
     return (FALSE);
 
-  do_drop(ch, argument, cmd, 0);
+  do_drop(ch, argument, cmd, SCMD_DROP);
 
   for (k = world[IN_ROOM(ch)].contents; k; k = world[IN_ROOM(ch)].contents) {
     act("$p vanishes in a puff of smoke!", FALSE, 0, k, 0, TO_ROOM);
@@ -218,7 +218,7 @@ SPECIAL(dump)
   }
 
   if (value) {
-    send_to_char("You are awarded for outstanding performance.\r\n", ch);
+    send_to_char(ch, "You are awarded for outstanding performance.\r\n");
     act("$n has been awarded for being a good citizen.", TRUE, ch, 0, 0, TO_ROOM);
 
     if (GET_LEVEL(ch) < 3)
@@ -240,30 +240,30 @@ SPECIAL(mayor)
 	"W3a3003b33000c111d0d111CE333333CE22c222112212111a1S.";
 
   static const char *path = NULL;
-  static int index;
+  static int path_index;
   static bool move = FALSE;
 
   if (!move) {
     if (time_info.hours == 6) {
       move = TRUE;
       path = open_path;
-      index = 0;
+      path_index = 0;
     } else if (time_info.hours == 20) {
       move = TRUE;
       path = close_path;
-      index = 0;
+      path_index = 0;
     }
   }
   if (cmd || !move || (GET_POS(ch) < POS_SLEEPING) ||
       (GET_POS(ch) == POS_FIGHTING))
     return (FALSE);
 
-  switch (path[index]) {
+  switch (path[path_index]) {
   case '0':
   case '1':
   case '2':
   case '3':
-    perform_move(ch, path[index] - '0', 1);
+    perform_move(ch, path[path_index] - '0', 1);
     break;
 
   case 'W':
@@ -304,13 +304,13 @@ SPECIAL(mayor)
     break;
 
   case 'O':
-    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_UNLOCK);
-    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_OPEN);
+    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_UNLOCK);	/* strcpy: OK */
+    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_OPEN);	/* strcpy: OK */
     break;
 
   case 'C':
-    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_CLOSE);
-    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_LOCK);
+    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_CLOSE);	/* strcpy: OK */
+    do_gen_door(ch, strcpy(actbuf, "gate"), 0, SCMD_LOCK);	/* strcpy: OK */
     break;
 
   case '.':
@@ -319,7 +319,7 @@ SPECIAL(mayor)
 
   }
 
-  index++;
+  path_index++;
   return (FALSE);
 }
 
@@ -340,12 +340,12 @@ void npc_steal(struct char_data *ch, str
   if (!CAN_SEE(ch, victim))
     return;
 
-  if (AWAKE(victim) && (number(0, GET_LEVEL(ch)) == 0)) {
+  if (AWAKE(victim) && (rand_number(0, GET_LEVEL(ch)) == 0)) {
     act("You discover that $n has $s hands in your wallet.", FALSE, ch, 0, victim, TO_VICT);
     act("$n tries to steal gold from $N.", TRUE, ch, 0, victim, TO_NOTVICT);
   } else {
     /* Steal some gold coins */
-    gold = (GET_GOLD(victim) * number(1, 10)) / 100;
+    gold = (GET_GOLD(victim) * rand_number(1, 10)) / 100;
     if (gold > 0) {
       GET_GOLD(ch) += gold;
       GET_GOLD(victim) -= gold;
@@ -362,7 +362,7 @@ SPECIAL(snake)
   if (cmd || GET_POS(ch) != POS_FIGHTING || !FIGHTING(ch))
     return (FALSE);
 
-  if (IN_ROOM(FIGHTING(ch)) != IN_ROOM(ch) || number(0, GET_LEVEL(ch)) != 0)
+  if (IN_ROOM(FIGHTING(ch)) != IN_ROOM(ch) || rand_number(0, GET_LEVEL(ch)) != 0)
     return (FALSE);
 
   act("$n bites $N!", 1, ch, 0, FIGHTING(ch), TO_NOTVICT);
@@ -380,7 +380,7 @@ SPECIAL(thief)
     return (FALSE);
 
   for (cons = world[IN_ROOM(ch)].people; cons; cons = cons->next_in_room)
-    if (!IS_NPC(cons) && GET_LEVEL(cons) < LVL_IMMORT && !number(0, 4)) {
+    if (!IS_NPC(cons) && GET_LEVEL(cons) < LVL_IMMORT && !rand_number(0, 4)) {
       npc_steal(ch, cons);
       return (TRUE);
     }
@@ -398,7 +398,7 @@ SPECIAL(magic_user)
 
   /* pseudo-randomly choose someone in the room who is fighting me */
   for (vict = world[IN_ROOM(ch)].people; vict; vict = vict->next_in_room)
-    if (FIGHTING(vict) == ch && !number(0, 4))
+    if (FIGHTING(vict) == ch && !rand_number(0, 4))
       break;
 
   /* if I didn't pick any of those, then just slam the guy I'm fighting */
@@ -409,20 +409,20 @@ SPECIAL(magic_user)
   if (vict == NULL)
     return (TRUE);
 
-  if (GET_LEVEL(ch) > 13 && number(0, 10) == 0)
+  if (GET_LEVEL(ch) > 13 && rand_number(0, 10) == 0)
     cast_spell(ch, vict, NULL, SPELL_POISON);
 
-  if (GET_LEVEL(ch) > 7 && number(0, 8) == 0)
+  if (GET_LEVEL(ch) > 7 && rand_number(0, 8) == 0)
     cast_spell(ch, vict, NULL, SPELL_BLINDNESS);
 
-  if (GET_LEVEL(ch) > 12 && number(0, 12) == 0) {
+  if (GET_LEVEL(ch) > 12 && rand_number(0, 12) == 0) {
     if (IS_EVIL(ch))
       cast_spell(ch, vict, NULL, SPELL_ENERGY_DRAIN);
     else if (IS_GOOD(ch))
       cast_spell(ch, vict, NULL, SPELL_DISPEL_EVIL);
   }
 
-  if (number(0, 4))
+  if (rand_number(0, 4))
     return (TRUE);
 
   switch (GET_LEVEL(ch)) {
@@ -478,16 +478,16 @@ SPECIAL(guild_guard)
   if (GET_LEVEL(ch) >= LVL_IMMORT)
     return (FALSE);
 
-  for (i = 0; guild_info[i][0] != NOWHERE; i++) {
+  for (i = 0; guild_info[i].guild_room != NOWHERE; i++) {
     /* Wrong guild or not trying to enter. */
-    if (GET_ROOM_VNUM(IN_ROOM(ch)) != guild_info[i][1] || cmd != guild_info[i][2])
+    if (GET_ROOM_VNUM(IN_ROOM(ch)) != guild_info[i].guild_room || cmd != guild_info[i].direction)
       continue;
 
     /* Allow the people of the guild through. */
-    if (!IS_NPC(ch) && GET_CLASS(ch) == guild_info[i][0])
+    if (!IS_NPC(ch) && GET_CLASS(ch) == guild_info[i].pc_class)
       continue;
 
-    send_to_char(buf, ch);
+    send_to_char(ch, "%s", buf);
     act(buf2, FALSE, ch, 0, 0, TO_ROOM);
     return (TRUE);
   }
@@ -504,18 +504,18 @@ SPECIAL(puff)
   if (cmd)
     return (FALSE);
 
-  switch (number(0, 60)) {
+  switch (rand_number(0, 60)) {
   case 0:
-    do_say(ch, strcpy(actbuf, "My god!  It's full of stars!"), 0, 0);
+    do_say(ch, strcpy(actbuf, "My god!  It's full of stars!"), 0, 0);	/* strcpy: OK */
     return (TRUE);
   case 1:
-    do_say(ch, strcpy(actbuf, "How'd all those fish get up here?"), 0, 0);
+    do_say(ch, strcpy(actbuf, "How'd all those fish get up here?"), 0, 0);	/* strcpy: OK */
     return (TRUE);
   case 2:
-    do_say(ch, strcpy(actbuf, "I'm a very female dragon."), 0, 0);
+    do_say(ch, strcpy(actbuf, "I'm a very female dragon."), 0, 0);	/* strcpy: OK */
     return (TRUE);
   case 3:
-    do_say(ch, strcpy(actbuf, "I've got a peaceful, easy feeling."), 0, 0);
+    do_say(ch, strcpy(actbuf, "I've got a peaceful, easy feeling."), 0, 0);	/* strcpy: OK */
     return (TRUE);
   default:
     return (FALSE);
@@ -618,7 +618,7 @@ SPECIAL(cityguard)
   }
 
   /* Reward the socially inept. */
-  if (spittle && !number(0, 1)) {
+  if (spittle && !rand_number(0, 9)) {
     static int spit_social;
 
     if (!spit_social)
@@ -627,7 +627,7 @@ SPECIAL(cityguard)
     if (spit_social > 0) {
       char spitbuf[MAX_NAME_LENGTH + 1];
 
-      strncpy(spitbuf, GET_NAME(spittle), sizeof(spitbuf));
+      strncpy(spitbuf, GET_NAME(spittle), sizeof(spitbuf));	/* strncpy: OK */
       spitbuf[sizeof(spitbuf) - 1] = '\0';
 
       do_action(ch, spitbuf, spit_social, 0);
@@ -651,13 +651,12 @@ SPECIAL(pet_shops)
   pet_room = IN_ROOM(ch) + 1;
 
   if (CMD_IS("list")) {
-    send_to_char("Available pets are:\r\n", ch);
+    send_to_char(ch, "Available pets are:\r\n");
     for (pet = world[pet_room].people; pet; pet = pet->next_in_room) {
       /* No, you can't have the Implementor as a pet if he's in there. */
       if (!IS_NPC(pet))
         continue;
-      sprintf(buf, "%8d - %s\r\n", PET_PRICE(pet), GET_NAME(pet));
-      send_to_char(buf, ch);
+      send_to_char(ch, "%8d - %s\r\n", PET_PRICE(pet), GET_NAME(pet));
     }
     return (TRUE);
   } else if (CMD_IS("buy")) {
@@ -665,11 +664,11 @@ SPECIAL(pet_shops)
     two_arguments(argument, buf, pet_name);
 
     if (!(pet = get_char_room(buf, NULL, pet_room)) || !IS_NPC(pet)) {
-      send_to_char("There is no such pet!\r\n", ch);
+      send_to_char(ch, "There is no such pet!\r\n");
       return (TRUE);
     }
     if (GET_GOLD(ch) < PET_PRICE(pet)) {
-      send_to_char("You don't have enough gold!\r\n", ch);
+      send_to_char(ch, "You don't have enough gold!\r\n");
       return (TRUE);
     }
     GET_GOLD(ch) -= PET_PRICE(pet);
@@ -679,14 +678,14 @@ SPECIAL(pet_shops)
     SET_BIT(AFF_FLAGS(pet), AFF_CHARM);
 
     if (*pet_name) {
-      sprintf(buf, "%s %s", pet->player.name, pet_name);
+      snprintf(buf, sizeof(buf), "%s %s", pet->player.name, pet_name);
       /* free(pet->player.name); don't free the prototype! */
-      pet->player.name = str_dup(buf);
+      pet->player.name = strdup(buf);
 
-      sprintf(buf, "%sA small sign on a chain around the neck says 'My name is %s'\r\n",
+      snprintf(buf, sizeof(buf), "%sA small sign on a chain around the neck says 'My name is %s'\r\n",
 	      pet->player.description, pet_name);
       /* free(pet->player.description); don't free the prototype! */
-      pet->player.description = str_dup(buf);
+      pet->player.description = strdup(buf);
     }
     char_to_room(pet, IN_ROOM(ch));
     add_follower(pet, ch);
@@ -695,7 +694,7 @@ SPECIAL(pet_shops)
     IS_CARRYING_W(pet) = 1000;
     IS_CARRYING_N(pet) = 100;
 
-    send_to_char("May you enjoy your pet.\r\n", ch);
+    send_to_char(ch, "May you enjoy your pet.\r\n");
     act("$n buys $N as a pet.", FALSE, ch, 0, pet, TO_ROOM);
 
     return (TRUE);
@@ -718,40 +717,36 @@ SPECIAL(bank)
 
   if (CMD_IS("balance")) {
     if (GET_BANK_GOLD(ch) > 0)
-      sprintf(buf, "Your current balance is %d coins.\r\n",
-	      GET_BANK_GOLD(ch));
+      send_to_char(ch, "Your current balance is %d coins.\r\n", GET_BANK_GOLD(ch));
     else
-      sprintf(buf, "You currently have no money deposited.\r\n");
-    send_to_char(buf, ch);
+      send_to_char(ch, "You currently have no money deposited.\r\n");
     return (TRUE);
   } else if (CMD_IS("deposit")) {
     if ((amount = atoi(argument)) <= 0) {
-      send_to_char("How much do you want to deposit?\r\n", ch);
+      send_to_char(ch, "How much do you want to deposit?\r\n");
       return (TRUE);
     }
     if (GET_GOLD(ch) < amount) {
-      send_to_char("You don't have that many coins!\r\n", ch);
+      send_to_char(ch, "You don't have that many coins!\r\n");
       return (TRUE);
     }
     GET_GOLD(ch) -= amount;
     GET_BANK_GOLD(ch) += amount;
-    sprintf(buf, "You deposit %d coins.\r\n", amount);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You deposit %d coins.\r\n", amount);
     act("$n makes a bank transaction.", TRUE, ch, 0, FALSE, TO_ROOM);
     return (TRUE);
   } else if (CMD_IS("withdraw")) {
     if ((amount = atoi(argument)) <= 0) {
-      send_to_char("How much do you want to withdraw?\r\n", ch);
+      send_to_char(ch, "How much do you want to withdraw?\r\n");
       return (TRUE);
     }
     if (GET_BANK_GOLD(ch) < amount) {
-      send_to_char("You don't have that many coins deposited!\r\n", ch);
+      send_to_char(ch, "You don't have that many coins deposited!\r\n");
       return (TRUE);
     }
     GET_GOLD(ch) += amount;
     GET_BANK_GOLD(ch) -= amount;
-    sprintf(buf, "You withdraw %d coins.\r\n", amount);
-    send_to_char(buf, ch);
+    send_to_char(ch, "You withdraw %d coins.\r\n", amount);
     act("$n makes a bank transaction.", TRUE, ch, 0, FALSE, TO_ROOM);
     return (TRUE);
   } else
Index: src/spell_parser.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/spell_parser.c,v
retrieving revision 1.29
retrieving revision 1.33
diff -u -p -r1.29 -r1.33
--- src/spell_parser.c	2001/12/11 13:45:49	1.29
+++ src/spell_parser.c	2002/04/09 14:12:15	1.33
@@ -93,23 +93,22 @@ int mag_manacost(struct char_data *ch, i
 }
 
 
-/* say_spell erodes buf, buf1, buf2 */
 void say_spell(struct char_data *ch, int spellnum, struct char_data *tch,
 	            struct obj_data *tobj)
 {
-  char lbuf[256];
+  char lbuf[256], buf[256], buf1[256], buf2[256];	/* FIXME */
   const char *format;
 
   struct char_data *i;
   int j, ofs = 0;
 
   *buf = '\0';
-  strcpy(lbuf, skill_name(spellnum));
+  strlcpy(lbuf, skill_name(spellnum), sizeof(lbuf));
 
   while (lbuf[ofs]) {
     for (j = 0; *(syls[j].org); j++) {
       if (!strncmp(syls[j].org, lbuf + ofs, strlen(syls[j].org))) {
-	strcat(buf, syls[j].news);
+	strcat(buf, syls[j].news);	/* strcat: BAD */
 	ofs += strlen(syls[j].org);
         break;
       }
@@ -132,8 +131,8 @@ void say_spell(struct char_data *ch, int
   else
     format = "$n utters the words, '%s'.";
 
-  sprintf(buf1, format, skill_name(spellnum));
-  sprintf(buf2, format, buf);
+  snprintf(buf1, sizeof(buf1), format, skill_name(spellnum));
+  snprintf(buf2, sizeof(buf2), format, buf);
 
   for (i = world[IN_ROOM(ch)].people; i; i = i->next_in_room) {
     if (i == ch || i == tch || !i->desc || !AWAKE(i))
@@ -145,7 +144,7 @@ void say_spell(struct char_data *ch, int
   }
 
   if (tch != NULL && tch != ch && IN_ROOM(tch) == IN_ROOM(ch)) {
-    sprintf(buf1, "$n stares at you and utters the words, '%s'.",
+    snprintf(buf1, sizeof(buf1), "$n stares at you and utters the words, '%s'.",
 	    GET_CLASS(ch) == GET_CLASS(tch) ? skill_name(spellnum) : buf);
     act(buf1, FALSE, ch, NULL, tch, TO_VICT);
   }
@@ -169,16 +168,17 @@ const char *skill_name(int num)
 	 
 int find_skill_num(char *name)
 {
-  int index, ok;
+  int skindex, ok;
   char *temp, *temp2;
   char first[256], first2[256], tempbuf[256];
 
-  for (index = 1; index <= TOP_SPELL_DEFINE; index++) {
-    if (is_abbrev(name, spell_info[index].name))
-      return (index);
+  for (skindex = 1; skindex <= TOP_SPELL_DEFINE; skindex++) {
+    if (is_abbrev(name, spell_info[skindex].name))
+      return (skindex);
 
     ok = TRUE;
-    temp = any_one_arg(strcpy(tempbuf, spell_info[index].name), first);
+    strlcpy(tempbuf, spell_info[skindex].name, sizeof(tempbuf));	/* strlcpy: OK */
+    temp = any_one_arg(tempbuf, first);
     temp2 = any_one_arg(name, first2);
     while (*first && *first2 && ok) {
       if (!is_abbrev(first2, first))
@@ -188,7 +188,7 @@ int find_skill_num(char *name)
     }
 
     if (ok && !*first2)
-      return (index);
+      return (skindex);
   }
 
   return (-1);
@@ -212,16 +212,14 @@ int call_magic(struct char_data *caster,
     return (0);
 
   if (ROOM_FLAGGED(IN_ROOM(caster), ROOM_NOMAGIC)) {
-    send_to_char("Your magic fizzles out and dies.\r\n", caster);
+    send_to_char(caster, "Your magic fizzles out and dies.\r\n");
     act("$n's magic fizzles out and dies.", FALSE, caster, 0, 0, TO_ROOM);
     return (0);
   }
   if (ROOM_FLAGGED(IN_ROOM(caster), ROOM_PEACEFUL) &&
       (SINFO.violent || IS_SET(SINFO.routines, MAG_DAMAGE))) {
-    send_to_char("A flash of white light fills the room, dispelling your "
-		 "violent magic!\r\n", caster);
-    act("White light from no particular source suddenly fills the room, "
-	"then vanishes.", FALSE, caster, 0, 0, TO_ROOM);
+    send_to_char(caster, "A flash of white light fills the room, dispelling your violent magic!\r\n");
+    act("White light from no particular source suddenly fills the room, then vanishes.", FALSE, caster, 0, 0, TO_ROOM);
     return (0);
   }
   /* determine the type of saving throw */
@@ -305,6 +303,7 @@ int call_magic(struct char_data *caster,
 void mag_objectmagic(struct char_data *ch, struct obj_data *obj,
 		          char *argument)
 {
+  char arg[MAX_INPUT_LENGTH];
   int i, k;
   struct char_data *tch = NULL, *next_tch;
   struct obj_data *tobj = NULL;
@@ -323,7 +322,7 @@ void mag_objectmagic(struct char_data *c
       act("$n taps $p three times on the ground.", FALSE, ch, obj, 0, TO_ROOM);
 
     if (GET_OBJ_VAL(obj, 2) <= 0) {
-      send_to_char("It seems powerless.\r\n", ch);
+      send_to_char(ch, "It seems powerless.\r\n");
       act("Nothing seems to happen.", FALSE, ch, obj, 0, TO_ROOM);
     } else {
       GET_OBJ_VAL(obj, 2)--;
@@ -379,7 +378,7 @@ void mag_objectmagic(struct char_data *c
     }
 
     if (GET_OBJ_VAL(obj, 2) <= 0) {
-      send_to_char("It seems powerless.\r\n", ch);
+      send_to_char(ch, "It seems powerless.\r\n");
       act("Nothing seems to happen.", FALSE, ch, obj, 0, TO_ROOM);
       return;
     }
@@ -462,40 +461,40 @@ int cast_spell(struct char_data *ch, str
   if (GET_POS(ch) < SINFO.min_position) {
     switch (GET_POS(ch)) {
       case POS_SLEEPING:
-      send_to_char("You dream about great magical powers.\r\n", ch);
+      send_to_char(ch, "You dream about great magical powers.\r\n");
       break;
     case POS_RESTING:
-      send_to_char("You cannot concentrate while resting.\r\n", ch);
+      send_to_char(ch, "You cannot concentrate while resting.\r\n");
       break;
     case POS_SITTING:
-      send_to_char("You can't do this sitting!\r\n", ch);
+      send_to_char(ch, "You can't do this sitting!\r\n");
       break;
     case POS_FIGHTING:
-      send_to_char("Impossible!  You can't concentrate enough!\r\n", ch);
+      send_to_char(ch, "Impossible!  You can't concentrate enough!\r\n");
       break;
     default:
-      send_to_char("You can't do much of anything like this!\r\n", ch);
+      send_to_char(ch, "You can't do much of anything like this!\r\n");
       break;
     }
     return (0);
   }
   if (AFF_FLAGGED(ch, AFF_CHARM) && (ch->master == tch)) {
-    send_to_char("You are afraid you might hurt your master!\r\n", ch);
+    send_to_char(ch, "You are afraid you might hurt your master!\r\n");
     return (0);
   }
   if ((tch != ch) && IS_SET(SINFO.targets, TAR_SELF_ONLY)) {
-    send_to_char("You can only cast this spell upon yourself!\r\n", ch);
+    send_to_char(ch, "You can only cast this spell upon yourself!\r\n");
     return (0);
   }
   if ((tch == ch) && IS_SET(SINFO.targets, TAR_NOT_SELF)) {
-    send_to_char("You cannot cast this spell upon yourself!\r\n", ch);
+    send_to_char(ch, "You cannot cast this spell upon yourself!\r\n");
     return (0);
   }
   if (IS_SET(SINFO.routines, MAG_GROUPS) && !AFF_FLAGGED(ch, AFF_GROUP)) {
-    send_to_char("You can't cast this spell if you're not in a group!\r\n",ch);
+    send_to_char(ch, "You can't cast this spell if you're not in a group!\r\n");
     return (0);
   }
-  send_to_char(OK, ch);
+  send_to_char(ch, "%s", OK);
   say_spell(ch, spellnum, tch, tobj);
 
   return (call_magic(ch, tch, tobj, spellnum, GET_LEVEL(ch), CAST_SPELL));
@@ -522,12 +521,12 @@ ACMD(do_cast)
   s = strtok(argument, "'");
 
   if (s == NULL) {
-    send_to_char("Cast what where?\r\n", ch);
+    send_to_char(ch, "Cast what where?\r\n");
     return;
   }
   s = strtok(NULL, "'");
   if (s == NULL) {
-    send_to_char("Spell names must be enclosed in the Holy Magic Symbols: '\r\n", ch);
+    send_to_char(ch, "Spell names must be enclosed in the Holy Magic Symbols: '\r\n");
     return;
   }
   t = strtok(NULL, "\0");
@@ -536,20 +535,23 @@ ACMD(do_cast)
   spellnum = find_skill_num(s);
 
   if ((spellnum < 1) || (spellnum > MAX_SPELLS)) {
-    send_to_char("Cast what?!?\r\n", ch);
+    send_to_char(ch, "Cast what?!?\r\n");
     return;
   }
   if (GET_LEVEL(ch) < SINFO.min_level[(int) GET_CLASS(ch)]) {
-    send_to_char("You do not know that spell!\r\n", ch);
+    send_to_char(ch, "You do not know that spell!\r\n");
     return;
   }
   if (GET_SKILL(ch, spellnum) == 0) {
-    send_to_char("You are unfamiliar with that spell.\r\n", ch);
+    send_to_char(ch, "You are unfamiliar with that spell.\r\n");
     return;
   }
   /* Find the target */
   if (t != NULL) {
-    one_argument(strcpy(arg, t), t);
+    char arg[MAX_INPUT_LENGTH];
+
+    strlcpy(arg, t, sizeof(arg));
+    one_argument(arg, t);
     skip_spaces(&t);
   }
   if (IS_SET(SINFO.targets, TAR_IGNORE)) {
@@ -600,32 +602,31 @@ ACMD(do_cast)
       target = TRUE;
     }
     if (!target) {
-      sprintf(buf, "Upon %s should the spell be cast?\r\n",
-	 IS_SET(SINFO.targets, TAR_OBJ_ROOM | TAR_OBJ_INV | TAR_OBJ_WORLD | TAR_OBJ_EQUIP) ? "what" : "who");
-      send_to_char(buf, ch);
+      send_to_char(ch, "Upon %s should the spell be cast?\r\n",
+		IS_SET(SINFO.targets, TAR_OBJ_ROOM | TAR_OBJ_INV | TAR_OBJ_WORLD | TAR_OBJ_EQUIP) ? "what" : "who");
       return;
     }
   }
 
   if (target && (tch == ch) && SINFO.violent) {
-    send_to_char("You shouldn't cast that on yourself -- could be bad for your health!\r\n", ch);
+    send_to_char(ch, "You shouldn't cast that on yourself -- could be bad for your health!\r\n");
     return;
   }
   if (!target) {
-    send_to_char("Cannot find the target of your spell!\r\n", ch);
+    send_to_char(ch, "Cannot find the target of your spell!\r\n");
     return;
   }
   mana = mag_manacost(ch, spellnum);
   if ((mana > 0) && (GET_MANA(ch) < mana) && (GET_LEVEL(ch) < LVL_IMMORT)) {
-    send_to_char("You haven't the energy to cast that spell!\r\n", ch);
+    send_to_char(ch, "You haven't the energy to cast that spell!\r\n");
     return;
   }
 
   /* You throws the dice and you takes your chances.. 101% is total failure */
-  if (number(0, 101) > GET_SKILL(ch, spellnum)) {
+  if (rand_number(0, 101) > GET_SKILL(ch, spellnum)) {
     WAIT_STATE(ch, PULSE_VIOLENCE);
     if (!tch || !skill_message(0, ch, tch, spellnum))
-      send_to_char("You lost your concentration!\r\n", ch);
+      send_to_char(ch, "You lost your concentration!\r\n");
     if (mana > 0)
       GET_MANA(ch) = MAX(0, MIN(GET_MAX_MANA(ch), GET_MANA(ch) - (mana / 2)));
     if (SINFO.violent && tch && IS_NPC(tch))
Index: src/spells.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/spells.c,v
retrieving revision 1.23
retrieving revision 1.28
diff -u -p -r1.23 -r1.28
--- src/spells.c	2001/10/18 02:18:06	1.23
+++ src/spells.c	2002/02/01 02:04:17	1.28
@@ -30,7 +30,6 @@ extern int pk_allowed;
 /* external functions */
 void clearMemory(struct char_data *ch);
 void weight_change_object(struct obj_data *obj, int weight);
-void add_follower(struct char_data *ch, struct char_data *leader);
 int mag_savingthrow(struct char_data *ch, int type, int modifier);
 void name_to_drinkcon(struct obj_data *obj, int type);
 void name_from_drinkcon(struct obj_data *obj);
@@ -90,7 +89,7 @@ ASPELL(spell_teleport)
     return;
 
   do {
-    to_room = number(0, top_of_world);
+    to_room = rand_number(0, top_of_world);
   } while (ROOM_FLAGGED(to_room, ROOM_PRIVATE | ROOM_DEATH | ROOM_GODROOM));
 
   act("$n slowly fades out of existence and is gone.",
@@ -109,7 +108,7 @@ ASPELL(spell_summon)
     return;
 
   if (GET_LEVEL(victim) > MIN(LVL_IMMORT - 1, level + 3)) {
-    send_to_char(SUMMON_FAIL, ch);
+    send_to_char(ch, "%s", SUMMON_FAIL);
     return;
   }
 
@@ -123,27 +122,21 @@ ASPELL(spell_summon)
     }
     if (!IS_NPC(victim) && !PRF_FLAGGED(victim, PRF_SUMMONABLE) &&
 	!PLR_FLAGGED(victim, PLR_KILLER)) {
-      sprintf(buf, "%s just tried to summon you to: %s.\r\n"
+      send_to_char(victim, "%s just tried to summon you to: %s.\r\n"
 	      "%s failed because you have summon protection on.\r\n"
 	      "Type NOSUMMON to allow other players to summon you.\r\n",
 	      GET_NAME(ch), world[IN_ROOM(ch)].name,
 	      (ch->player.sex == SEX_MALE) ? "He" : "She");
-      send_to_char(buf, victim);
 
-      sprintf(buf, "You failed because %s has summon protection on.\r\n",
-	      GET_NAME(victim));
-      send_to_char(buf, ch);
-
-      sprintf(buf, "%s failed summoning %s to %s.",
-	      GET_NAME(ch), GET_NAME(victim), world[IN_ROOM(ch)].name);
-      mudlog(buf, BRF, LVL_IMMORT, TRUE);
+      send_to_char(ch, "You failed because %s has summon protection on.\r\n", GET_NAME(victim));
+      mudlog(BRF, LVL_IMMORT, TRUE, "%s failed summoning %s to %s.", GET_NAME(ch), GET_NAME(victim), world[IN_ROOM(ch)].name);
       return;
     }
   }
 
   if (MOB_FLAGGED(victim, MOB_NOSUMMON) ||
       (IS_NPC(victim) && mag_savingthrow(victim, SAVING_SPELL, 0))) {
-    send_to_char(SUMMON_FAIL, ch);
+    send_to_char(ch, "%s", SUMMON_FAIL);
     return;
   }
 
@@ -171,36 +164,31 @@ ASPELL(spell_locate_object)
    * Since we're passed the object and not the keyword we can only guess
    * at what the player originally meant to search for. -gg
    */
-  strcpy(name, fname(obj->name));
+  strlcpy(name, fname(obj->name), sizeof(name));
   j = level / 2;
 
   for (i = object_list; i && (j > 0); i = i->next) {
     if (!isname(name, i->name))
       continue;
 
+    send_to_char(ch, "%c%s", UPPER(*i->short_description), i->short_description);
+
     if (i->carried_by)
-      sprintf(buf, "%s is being carried by %s.\r\n",
-	      i->short_description, PERS(i->carried_by, ch));
+      send_to_char(ch, " is being carried by %s.\r\n", PERS(i->carried_by, ch));
     else if (IN_ROOM(i) != NOWHERE)
-      sprintf(buf, "%s is in %s.\r\n", i->short_description,
-	      world[IN_ROOM(i)].name);
+      send_to_char(ch, " is in %s.\r\n", world[IN_ROOM(i)].name);
     else if (i->in_obj)
-      sprintf(buf, "%s is in %s.\r\n", i->short_description,
-	      i->in_obj->short_description);
+      send_to_char(ch, " is in %s.\r\n", i->in_obj->short_description);
     else if (i->worn_by)
-      sprintf(buf, "%s is being worn by %s.\r\n",
-	      i->short_description, PERS(i->worn_by, ch));
+      send_to_char(ch, " is being worn by %s.\r\n", PERS(i->worn_by, ch));
     else
-      sprintf(buf, "%s's location is uncertain.\r\n",
-	      i->short_description);
+      send_to_char(ch, "'s location is uncertain.\r\n");
 
-    CAP(buf);
-    send_to_char(buf, ch);
     j--;
   }
 
   if (j == level / 2)
-    send_to_char("You sense nothing.\r\n", ch);
+    send_to_char(ch, "You sense nothing.\r\n");
 }
 
 
@@ -213,24 +201,24 @@ ASPELL(spell_charm)
     return;
 
   if (victim == ch)
-    send_to_char("You like yourself even better!\r\n", ch);
+    send_to_char(ch, "You like yourself even better!\r\n");
   else if (!IS_NPC(victim) && !PRF_FLAGGED(victim, PRF_SUMMONABLE))
-    send_to_char("You fail because SUMMON protection is on!\r\n", ch);
+    send_to_char(ch, "You fail because SUMMON protection is on!\r\n");
   else if (AFF_FLAGGED(victim, AFF_SANCTUARY))
-    send_to_char("Your victim is protected by sanctuary!\r\n", ch);
+    send_to_char(ch, "Your victim is protected by sanctuary!\r\n");
   else if (MOB_FLAGGED(victim, MOB_NOCHARM))
-    send_to_char("Your victim resists!\r\n", ch);
+    send_to_char(ch, "Your victim resists!\r\n");
   else if (AFF_FLAGGED(ch, AFF_CHARM))
-    send_to_char("You can't have any followers of your own!\r\n", ch);
+    send_to_char(ch, "You can't have any followers of your own!\r\n");
   else if (AFF_FLAGGED(victim, AFF_CHARM) || level < GET_LEVEL(victim))
-    send_to_char("You fail.\r\n", ch);
+    send_to_char(ch, "You fail.\r\n");
   /* player charming another player - no legal reason for this */
   else if (!pk_allowed && !IS_NPC(victim))
-    send_to_char("You fail - shouldn't be doing it anyway.\r\n", ch);
+    send_to_char(ch, "You fail - shouldn't be doing it anyway.\r\n");
   else if (circle_follow(victim, ch))
-    send_to_char("Sorry, following in circles can not be allowed.\r\n", ch);
+    send_to_char(ch, "Sorry, following in circles can not be allowed.\r\n");
   else if (mag_savingthrow(victim, SAVING_PARA, 0))
-    send_to_char("Your victim resists!\r\n", ch);
+    send_to_char(ch, "Your victim resists!\r\n");
   else {
     if (victim->master)
       stop_follower(victim);
@@ -258,65 +246,62 @@ ASPELL(spell_charm)
 
 ASPELL(spell_identify)
 {
-  int i;
-  int found;
+  int i, found;
+  size_t len;
 
   if (obj) {
-    send_to_char("You feel informed:\r\n", ch);
-    sprintf(buf, "Object '%s', Item type: ", obj->short_description);
-    sprinttype(GET_OBJ_TYPE(obj), item_types, buf2);
-    strcat(buf, buf2);
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
+    char bitbuf[MAX_STRING_LENGTH];
 
+    sprinttype(GET_OBJ_TYPE(obj), item_types, bitbuf, sizeof(bitbuf));
+    send_to_char(ch, "You feel informed:\r\nObject '%s', Item type: %s\r\n", obj->short_description, bitbuf);
+
     if (GET_OBJ_AFFECT(obj)) {
-      send_to_char("Item will give you following abilities:  ", ch);
-      sprintbit(GET_OBJ_AFFECT(obj), affected_bits, buf);
-      strcat(buf, "\r\n");
-      send_to_char(buf, ch);
+      sprintbit(GET_OBJ_AFFECT(obj), affected_bits, bitbuf, sizeof(bitbuf));
+      send_to_char(ch, "Item will give you following abilities:  %s\r\n", bitbuf);
     }
-    send_to_char("Item is: ", ch);
-    sprintbit(GET_OBJ_EXTRA(obj), extra_bits, buf);
-    strcat(buf, "\r\n");
-    send_to_char(buf, ch);
-
-    sprintf(buf, "Weight: %d, Value: %d, Rent: %d\r\n",
-	    GET_OBJ_WEIGHT(obj), GET_OBJ_COST(obj), GET_OBJ_RENT(obj));
-    send_to_char(buf, ch);
 
+    sprintbit(GET_OBJ_EXTRA(obj), extra_bits, bitbuf, sizeof(bitbuf));
+    send_to_char(ch, "Item is: %s\r\n", bitbuf);
+
+    send_to_char(ch, "Weight: %d, Value: %d, Rent: %d\r\n", GET_OBJ_WEIGHT(obj), GET_OBJ_COST(obj), GET_OBJ_RENT(obj));
+
     switch (GET_OBJ_TYPE(obj)) {
     case ITEM_SCROLL:
     case ITEM_POTION:
-      sprintf(buf, "This %s casts: ", item_types[(int) GET_OBJ_TYPE(obj)]);
+      len = i = 0;
+
+      if (GET_OBJ_VAL(obj, 1) >= 1) {
+	i = snprintf(bitbuf + len, sizeof(bitbuf) - len, " %s", skill_name(GET_OBJ_VAL(obj, 1)));
+        if (i >= 0)
+          len += i;
+      }
 
-      if (GET_OBJ_VAL(obj, 1) >= 1)
-	sprintf(buf + strlen(buf), " %s", skill_name(GET_OBJ_VAL(obj, 1)));
-      if (GET_OBJ_VAL(obj, 2) >= 1)
-	sprintf(buf + strlen(buf), " %s", skill_name(GET_OBJ_VAL(obj, 2)));
-      if (GET_OBJ_VAL(obj, 3) >= 1)
-	sprintf(buf + strlen(buf), " %s", skill_name(GET_OBJ_VAL(obj, 3)));
-      strcat(buf, "\r\n");
-      send_to_char(buf, ch);
+      if (GET_OBJ_VAL(obj, 2) >= 1 && len < sizeof(bitbuf)) {
+	i = snprintf(bitbuf + len, sizeof(bitbuf) - len, " %s", skill_name(GET_OBJ_VAL(obj, 2)));
+        if (i >= 0)
+          len += i;
+      }
+
+      if (GET_OBJ_VAL(obj, 3) >= 1 && len < sizeof(bitbuf)) {
+	i = snprintf(bitbuf + len, sizeof(bitbuf) - len, " %s", skill_name(GET_OBJ_VAL(obj, 3)));
+        if (i >= 0)
+          len += i;
+      }
+
+      send_to_char(ch, "This %s casts: %s\r\n", item_types[(int) GET_OBJ_TYPE(obj)], bitbuf);
       break;
     case ITEM_WAND:
     case ITEM_STAFF:
-      sprintf(buf, "This %s casts: ", item_types[(int) GET_OBJ_TYPE(obj)]);
-      sprintf(buf + strlen(buf), " %s\r\n", skill_name(GET_OBJ_VAL(obj, 3)));
-      sprintf(buf + strlen(buf), "It has %d maximum charge%s and %d remaining.\r\n",
-	      GET_OBJ_VAL(obj, 1), GET_OBJ_VAL(obj, 1) == 1 ? "" : "s",
-	      GET_OBJ_VAL(obj, 2));
-      send_to_char(buf, ch);
+      send_to_char(ch, "This %s casts: %s\r\nIt has %d maximum charge%s and %d remaining.\r\n",
+		item_types[(int) GET_OBJ_TYPE(obj)], skill_name(GET_OBJ_VAL(obj, 3)),
+		GET_OBJ_VAL(obj, 1), GET_OBJ_VAL(obj, 1) == 1 ? "" : "s", GET_OBJ_VAL(obj, 2));
       break;
     case ITEM_WEAPON:
-      sprintf(buf, "Damage Dice is '%dD%d'", GET_OBJ_VAL(obj, 1),
-	      GET_OBJ_VAL(obj, 2));
-      sprintf(buf + strlen(buf), " for an average per-round damage of %.1f.\r\n",
-	      (((GET_OBJ_VAL(obj, 2) + 1) / 2.0) * GET_OBJ_VAL(obj, 1)));
-      send_to_char(buf, ch);
+      send_to_char(ch, "Damage Dice is '%dD%d' for an average per-round damage of %.1f.\r\n",
+		GET_OBJ_VAL(obj, 1), GET_OBJ_VAL(obj, 2), ((GET_OBJ_VAL(obj, 2) + 1) / 2.0) * GET_OBJ_VAL(obj, 1));
       break;
     case ITEM_ARMOR:
-      sprintf(buf, "AC-apply is %d\r\n", GET_OBJ_VAL(obj, 0));
-      send_to_char(buf, ch);
+      send_to_char(ch, "AC-apply is %d\r\n", GET_OBJ_VAL(obj, 0));
       break;
     }
     found = FALSE;
@@ -324,34 +309,25 @@ ASPELL(spell_identify)
       if ((obj->affected[i].location != APPLY_NONE) &&
 	  (obj->affected[i].modifier != 0)) {
 	if (!found) {
-	  send_to_char("Can affect you as :\r\n", ch);
+	  send_to_char(ch, "Can affect you as :\r\n");
 	  found = TRUE;
 	}
-	sprinttype(obj->affected[i].location, apply_types, buf2);
-	sprintf(buf, "   Affects: %s By %d\r\n", buf2, obj->affected[i].modifier);
-	send_to_char(buf, ch);
+	sprinttype(obj->affected[i].location, apply_types, bitbuf, sizeof(bitbuf));
+	send_to_char(ch, "   Affects: %s By %d\r\n", bitbuf, obj->affected[i].modifier);
       }
     }
   } else if (victim) {		/* victim */
-    sprintf(buf, "Name: %s\r\n", GET_NAME(victim));
-    send_to_char(buf, ch);
-    if (!IS_NPC(victim)) {
-      sprintf(buf, "%s is %d years, %d months, %d days and %d hours old.\r\n",
+    send_to_char(ch, "Name: %s\r\n", GET_NAME(victim));
+    if (!IS_NPC(victim))
+      send_to_char(ch, "%s is %d years, %d months, %d days and %d hours old.\r\n",
 	      GET_NAME(victim), age(victim)->year, age(victim)->month,
 	      age(victim)->day, age(victim)->hours);
-      send_to_char(buf, ch);
-    }
-    sprintf(buf, "Height %d cm, Weight %d pounds\r\n",
-	    GET_HEIGHT(victim), GET_WEIGHT(victim));
-    sprintf(buf + strlen(buf), "Level: %d, Hits: %d, Mana: %d\r\n",
-	    GET_LEVEL(victim), GET_HIT(victim), GET_MANA(victim));
-    sprintf(buf + strlen(buf), "AC: %d, Hitroll: %d, Damroll: %d\r\n",
-	    compute_armor_class(victim), GET_HITROLL(victim), GET_DAMROLL(victim));
-    sprintf(buf + strlen(buf), "Str: %d/%d, Int: %d, Wis: %d, Dex: %d, Con: %d, Cha: %d\r\n",
+    send_to_char(ch, "Height %d cm, Weight %d pounds\r\n", GET_HEIGHT(victim), GET_WEIGHT(victim));
+    send_to_char(ch, "Level: %d, Hits: %d, Mana: %d\r\n", GET_LEVEL(victim), GET_HIT(victim), GET_MANA(victim));
+    send_to_char(ch, "AC: %d, Hitroll: %d, Damroll: %d\r\n", compute_armor_class(victim), GET_HITROLL(victim), GET_DAMROLL(victim));
+    send_to_char(ch, "Str: %d/%d, Int: %d, Wis: %d, Dex: %d, Con: %d, Cha: %d\r\n",
 	GET_STR(victim), GET_ADD(victim), GET_INT(victim),
 	GET_WIS(victim), GET_DEX(victim), GET_CON(victim), GET_CHA(victim));
-    send_to_char(buf, ch);
-
   }
 }
 
@@ -401,9 +377,9 @@ ASPELL(spell_detect_poison)
   if (victim) {
     if (victim == ch) {
       if (AFF_FLAGGED(victim, AFF_POISON))
-        send_to_char("You can sense poison in your blood.\r\n", ch);
+        send_to_char(ch, "You can sense poison in your blood.\r\n");
       else
-        send_to_char("You feel healthy.\r\n", ch);
+        send_to_char(ch, "You feel healthy.\r\n");
     } else {
       if (AFF_FLAGGED(victim, AFF_POISON))
         act("You sense that $E is poisoned.", FALSE, ch, 0, victim, TO_CHAR);
@@ -424,7 +400,7 @@ ASPELL(spell_detect_poison)
 	    TO_CHAR);
       break;
     default:
-      send_to_char("You sense that it should not be consumed.\r\n", ch);
+      send_to_char(ch, "You sense that it should not be consumed.\r\n");
     }
   }
 }
Index: src/spells.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/spells.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- src/spells.h	2001/11/27 06:42:22	1.10
+++ src/spells.h	2002/04/09 14:12:15	1.11
@@ -175,8 +175,8 @@ struct spell_info_type {
    int routines;
    byte violent;
    int targets;         /* See below for use with TAR_XXX  */
-   const char *name;
-   const char *wear_off_msg;
+   const char *name;	/* Input size not limited. Originates from string constants. */
+   const char *wear_off_msg;	/* Input size not limited. Originates from string constants. */
 };
 
 /* Possible Targets:
Index: src/structs.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/structs.h,v
retrieving revision 1.44
retrieving revision 1.51
diff -u -p -r1.44 -r1.51
--- src/structs.h	2002/01/13 20:09:10	1.44
+++ src/structs.h	2002/04/14 18:24:24	1.51
@@ -17,7 +17,7 @@
  * You are supposed to compare this with the macro CIRCLEMUD_VERSION()
  * in utils.h.  See there for usage.
  */
-#define _CIRCLEMUD	0x030014 /* Major/Minor/Patchlevel - MMmmPP */
+#define _CIRCLEMUD	0x030015 /* Major/Minor/Patchlevel - MMmmPP */
 
 /*
  * If you want equipment to be automatically equipped to the same place
@@ -358,7 +358,7 @@
 #define APPLY_NONE              0	/* No effect			*/
 #define APPLY_STR               1	/* Apply to strength		*/
 #define APPLY_DEX               2	/* Apply to dexterity		*/
-#define APPLY_INT               3	/* Apply to constitution	*/
+#define APPLY_INT               3	/* Apply to intelligence	*/
 #define APPLY_WIS               4	/* Apply to wisdom		*/
 #define APPLY_CON               5	/* Apply to constitution	*/
 #define APPLY_CHA		6	/* Apply to charisma		*/
@@ -732,7 +732,7 @@ struct char_player_data {
    byte sex;           /* PC / NPC's sex                       */
    byte chclass;       /* PC / NPC's class		       */
    byte level;         /* PC / NPC's level                     */
-   int	hometown;      /* PC s Hometown (zone)                 */
+   sh_int hometown;    /* PC s Hometown (zone)                 */
    struct time_data time;  /* PC's AGE in days                 */
    ubyte weight;       /* PC / NPC's weight                    */
    ubyte height;       /* PC / NPC's height                    */
@@ -872,10 +872,9 @@ struct player_special_data {
 
 /* Specials used by NPCs, not PCs */
 struct mob_special_data {
-   byte last_direction;     /* The last direction the monster went     */
-   int	attack_type;        /* The Attack Type Bitvector for NPC's     */
-   byte default_pos;        /* Default position for NPC                */
    memory_rec *memory;	    /* List of attackers to remember	       */
+   byte	attack_type;        /* The Attack Type Bitvector for NPC's     */
+   byte default_pos;        /* Default position for NPC                */
    byte damnodice;          /* The number of damage dice's	       */
    byte damsizedice;        /* The size of the damage dice's           */
 };
@@ -1085,17 +1084,20 @@ struct weather_data {
    int	sunlight;	/* And how much sun. */
 };
 
-
-struct title_type {
-   char	*title_m;
-   char	*title_f;
-   int	exp;
-};
-
 
-/* element in monster and object index-tables   */
+/*
+ * Element in monster and object index-tables.
+ *
+ * NOTE: Assumes sizeof(mob_vnum) >= sizeof(obj_vnum)
+ */
 struct index_data {
-   sh_int	vnum;	/* virtual number of this mob/obj		*/
-   int	number;		/* number of existing units of this mob/obj	*/
+   mob_vnum	vnum;	/* virtual number of this mob/obj		*/
+   int		number;	/* number of existing units of this mob/obj	*/
    SPECIAL(*func);
+};
+
+struct guild_info_type {
+  int pc_class;
+  room_vnum guild_room;
+  int direction;
 };
Index: src/sysdep.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/sysdep.h,v
retrieving revision 1.36
retrieving revision 1.40
diff -u -p -r1.36 -r1.40
--- src/sysdep.h	2002/01/10 17:41:20	1.36
+++ src/sysdep.h	2002/04/16 02:22:12	1.40
@@ -317,8 +317,26 @@ struct in_addr {
 
 /* Basic system dependencies *******************************************/
 
+#if CIRCLE_GNU_LIBC_MEMORY_TRACK && !defined(HAVE_MCHECK_H)
+#error "Cannot use GNU C library memory tracking without <mcheck.h>"
+#endif
+
+/* strcasecmp -> stricmp -> str_cmp */
+#if defined(HAVE_STRCASECMP)
+# define str_cmp strcasecmp
+#elif defined(HAVE_STRICMP)
+# define str_cmp stricmp
+#endif
+
+/* strncasecmp -> strnicmp -> strn_cmp */
+#if defined(HAVE_STRNCASECMP)
+# define strn_cmp strncasecmp
+#elif defined(HAVE_STRNICMP)
+# define strn_cmp strnicmp
+#endif
+
 #if !defined(__GNUC__)
-#define __attribute__(x)	/* nothing */
+# define __attribute__(x)	/* nothing */
 #endif
 
 #if defined(__MWERKS__)
@@ -399,6 +417,9 @@ struct in_addr {
 #define STDOUT_FILENO 1
 #endif
 
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
+# include "bsd-snprintf.h"
+#endif
 
 /* Function prototypes ************************************************/
 
@@ -524,10 +545,18 @@ struct in_addr {
    int sscanf(const char *s, const char *format, ...);
 #endif
 
+#ifdef NEED_STRDUP_PROTO
+   char *strdup(const char *txt);
+#endif
+
 #ifdef NEED_STRERROR_PROTO
    char *strerror(int errnum);
 #endif
 
+#ifdef NEED_STRLCPY_PROTO
+   size_t strlcpy(char *dest, const char *src, size_t copylen);
+#endif
+
 #ifdef NEED_SYSTEM_PROTO
    int system(const char *string);
 #endif
@@ -659,5 +688,3 @@ struct in_addr {
 
 
 #endif /* NO_LIBRARY_PROTOTYPES */
-
-
Index: src/utils.c
===================================================================
RCS file: /home/circledb/.cvs/circle/src/utils.c,v
retrieving revision 1.39
retrieving revision 1.51
diff -u -p -r1.39 -r1.51
--- src/utils.c	2002/01/13 20:07:28	1.39
+++ src/utils.c	2002/04/09 15:03:05	1.51
@@ -28,21 +28,18 @@ extern struct time_data time_info;
 /* local functions */
 struct time_info_data *real_time_passed(time_t t2, time_t t1);
 struct time_info_data *mud_time_passed(time_t t2, time_t t1);
-void die_follower(struct char_data *ch);
-void add_follower(struct char_data *ch, struct char_data *leader);
-int num_followers_charmed(struct char_data *ch);
 void prune_crlf(char *txt);
 
 
 /* creates a random number in interval [from;to] */
-int number(int from, int to)
+int rand_number(int from, int to)
 {
-  /* error checking in case people call number() incorrectly */
+  /* error checking in case people call this incorrectly */
   if (from > to) {
     int tmp = from;
     from = to;
     to = tmp;
-    log("SYSERR: number() should be called with lowest, then highest. number(%d, %d), not number(%d, %d).", from, to, to, from);
+    log("SYSERR: rand_number() should be called with lowest, then highest. (%d, %d), not (%d, %d).", from, to, to, from);
   }
 
   /*
@@ -69,18 +66,19 @@ int dice(int num, int size)
     return (0);
 
   while (num-- > 0)
-    sum += number(1, size);
+    sum += rand_number(1, size);
 
   return (sum);
 }
 
 
+/* Be wary of sign issues with this. */
 int MIN(int a, int b)
 {
   return (a < b ? a : b);
 }
 
-
+/* Be wary of sign issues with this. */
 int MAX(int a, int b)
 {
   return (a > b ? a : b);
@@ -94,14 +92,37 @@ char *CAP(char *txt)
 }
 
 
+#if !defined(HAVE_STRLCPY)
+/*
+ * A 'strlcpy' function in the same fashion as 'strdup' below.
+ *
+ * This copies up to totalsize - 1 bytes from the source string, placing
+ * them and a trailing NUL into the destination string.
+ *
+ * Returns the total length of the string it tried to copy, not including
+ * the trailing NUL.  So a '>= totalsize' test says it was truncated.
+ * (Note that you may have _expected_ truncation because you only wanted
+ * a few characters from the source string.)
+ */
+size_t strlcpy(char *dest, const char *source, size_t totalsize)
+{
+  strncpy(dest, source, totalsize - 1);	/* strncpy: OK (we must assume 'totalsize' is correct) */
+  dest[totalsize - 1] = '\0';
+  return strlen(source);
+}
+#endif
+
+
+#if !defined(HAVE_STRDUP)
 /* Create a duplicate of a string */
-char *str_dup(const char *source)
+char *strdup(const char *source)
 {
   char *new_z;
 
   CREATE(new_z, char, strlen(source) + 1);
-  return (strcpy(new_z, source));
+  return (strcpy(new_z, source)); /* strcpy: OK */
 }
+#endif
 
 
 /*
@@ -116,6 +137,7 @@ void prune_crlf(char *txt)
 }
 
 
+#ifndef str_cmp
 /*
  * str_cmp: a case-insensitive version of strcmp().
  * Returns: 0 if equal, > 0 if arg1 > arg2, or < 0 if arg1 < arg2.
@@ -137,8 +159,10 @@ int str_cmp(const char *arg1, const char
 
   return (0);
 }
+#endif
 
 
+#ifndef strn_cmp
 /*
  * strn_cmp: a case-insensitive version of strncmp().
  * Returns: 0 if equal, > 0 if arg1 > arg2, or < 0 if arg1 < arg2.
@@ -160,24 +184,22 @@ int strn_cmp(const char *arg1, const cha
 
   return (0);
 }
+#endif
 
+
 /* log a death trap hit */
 void log_death_trap(struct char_data *ch)
 {
-  char buf[256];
-
-  sprintf(buf, "%s hit death trap #%d (%s)", GET_NAME(ch),
-	  GET_ROOM_VNUM(IN_ROOM(ch)), world[IN_ROOM(ch)].name);
-  mudlog(buf, BRF, LVL_IMMORT, TRUE);
+  mudlog(BRF, LVL_IMMORT, TRUE, "%s hit death trap #%d (%s)", GET_NAME(ch), GET_ROOM_VNUM(IN_ROOM(ch)), world[IN_ROOM(ch)].name);
 }
 
+
 /*
  * New variable argument log() function.  Works the same as the old for
  * previously written code but is very nice for new code.
  */
-void basic_mud_log(const char *format, ...)
+void basic_mud_vlog(const char *format, va_list args)
 {
-  va_list args;
   time_t ct = time(0);
   char *time_s = asctime(localtime(&ct));
 
@@ -192,13 +214,20 @@ void basic_mud_log(const char *format, .
   time_s[strlen(time_s) - 1] = '\0';
 
   fprintf(logfile, "%-15.15s :: ", time_s + 4);
+  vfprintf(logfile, format, args);
+  fputc('\n', logfile);
+  fflush(logfile);
+}
 
+
+/* So mudlog() can use the same function. */
+void basic_mud_log(const char *format, ...)
+{
+  va_list args;
+
   va_start(args, format);
-  vfprintf(logfile, format, args);
+  basic_mud_vlog(format, args);
   va_end(args);
-
-  fprintf(logfile, "\n");
-  fflush(logfile);
 }
 
 
@@ -221,19 +250,29 @@ int touch(const char *path)
  * mudlog -- log mud messages to a file & to online imm's syslogs
  * based on syslog by Fen Jul 3, 1992
  */
-void mudlog(const char *str, int type, int level, int file)
+void mudlog(int type, int level, int file, const char *str, ...)
 {
-  char buf[MAX_STRING_LENGTH], tp;
+  char buf[MAX_STRING_LENGTH];
   struct descriptor_data *i;
+  va_list args;
 
   if (str == NULL)
     return;	/* eh, oh well. */
-  if (file)
-    log("%s", str);
+
+  if (file) {
+    va_start(args, str);
+    basic_mud_vlog(str, args);
+    va_end(args);
+  }
+
   if (level < 0)
     return;
 
-  sprintf(buf, "[ %s ]\r\n", str);
+  strcpy(buf, "[ ");	/* strcpy: OK */
+  va_start(args, str);
+  vsnprintf(buf + 2, sizeof(buf) - 6, str, args);
+  va_end(args);
+  strcat(buf, " ]\r\n");	/* strcat: OK */
 
   for (i = descriptor_list; i; i = i->next) {
     if (STATE(i) != CON_PLAYING || IS_NPC(i->character)) /* switch */
@@ -242,14 +281,10 @@ void mudlog(const char *str, int type, i
       continue;
     if (PLR_FLAGGED(i->character, PLR_WRITING))
       continue;
-    tp = ((PRF_FLAGGED(i->character, PRF_LOG1) ? 1 : 0) +
-	  (PRF_FLAGGED(i->character, PRF_LOG2) ? 2 : 0));
-    if (tp < type)
+    if (type > (PRF_FLAGGED(i->character, PRF_LOG1) ? 1 : 0) + (PRF_FLAGGED(i->character, PRF_LOG2) ? 2 : 0))
       continue;
 
-    send_to_char(CCGRN(i->character, C_NRM), i->character);
-    send_to_char(buf, i->character);
-    send_to_char(CCNRM(i->character, C_NRM), i->character);
+    send_to_char(i->character, "%s%s%s", CCGRN(i->character, C_NRM), buf, CCNRM(i->character, C_NRM));
   }
 }
 
@@ -260,31 +295,33 @@ void mudlog(const char *str, int type, i
  * to cast a non-const array as const than to cast a const one as non-const.
  * Doesn't really matter since this function doesn't change the array though.
  */
-void sprintbit(bitvector_t bitvector, const char *names[], char *result)
+size_t sprintbit(bitvector_t bitvector, const char *names[], char *result, size_t reslen)
 {
+  size_t len = 0, nlen;
   long nr;
 
   *result = '\0';
 
-  for (nr = 0; bitvector; bitvector >>= 1) {
+  for (nr = 0; bitvector && len < reslen; bitvector >>= 1) {
     if (IS_SET(bitvector, 1)) {
-      if (*names[nr] != '\n') {
-	strcat(result, names[nr]);
-	strcat(result, " ");
-      } else
-	strcat(result, "UNDEFINED ");
+      nlen = snprintf(result + len, reslen - len, "%s ", *names[nr] != '\n' ? names[nr] : "UNDEFINED");
+      if (len + nlen >= reslen || nlen < 0)
+        break;
+      len += nlen;
     }
+
     if (*names[nr] != '\n')
       nr++;
   }
 
   if (!*result)
-    strcpy(result, "NOBITS ");
-}
+    len = strlcpy(result, "NOBITS ", reslen);
 
+  return (len);
+}
 
 
-void sprinttype(int type, const char *names[], char *result)
+size_t sprinttype(int type, const char *names[], char *result, size_t reslen)
 {
   int nr = 0;
 
@@ -293,10 +330,7 @@ void sprinttype(int type, const char *na
     nr++;
   }
 
-  if (*names[nr] != '\n')
-    strcpy(result, names[nr]);
-  else
-    strcpy(result, "UNDEFINED");
+  return strlcpy(result, *names[nr] != '\n' ? names[nr] : "UNDEFINED", reslen);
 }
 
 
@@ -486,16 +520,17 @@ void add_follower(struct char_data *ch, 
  * The newline character is removed from the input.  Lines which begin
  * with '*' are considered to be comments.
  *
- * Returns the number of lines advanced in the file.
+ * Returns the number of lines advanced in the file. Buffer given must
+ * be at least READ_SIZE (256) characters large.
  */
 int get_line(FILE *fl, char *buf)
 {
-  char temp[256];
+  char temp[READ_SIZE];
   int lines = 0;
   int sl;
 
   do {
-    if (!fgets(temp, 256, fl))
+    if (!fgets(temp, READ_SIZE, fl))
       return (0);
     lines++;
   } while (*temp == '*' || *temp == '\n' || *temp == '\r');
@@ -505,15 +540,15 @@ int get_line(FILE *fl, char *buf)
   while (sl > 0 && (temp[sl - 1] == '\n' || temp[sl - 1] == '\r'))
     temp[--sl] = '\0';
 
-  strcpy(buf, temp);
+  strcpy(buf, temp); /* strcpy: OK, if buf >= READ_SIZE (256) */
   return (lines);
 }
 
 
-int get_filename(char *orig_name, char *filename, int mode)
+int get_filename(char *filename, size_t fbufsize, int mode, char *orig_name)
 {
   const char *prefix, *middle, *suffix;
-  char name[64], *ptr;
+  char name[PATH_MAX], *ptr;
 
   if (orig_name == NULL || *orig_name == '\0' || filename == NULL) {
     log("SYSERR: NULL pointer or empty string passed to get_filename(), %p or %p.",
@@ -538,7 +573,7 @@ int get_filename(char *orig_name, char *
     return (0);
   }
 
-  strcpy(name, orig_name);
+  strlcpy(name, orig_name, sizeof(name));
   for (ptr = name; *ptr; ptr++)
     *ptr = LOWER(*ptr);
 
@@ -563,7 +598,7 @@ int get_filename(char *orig_name, char *
     break;
   }
 
-  sprintf(filename, "%s%s"SLASH"%s.%s", prefix, middle, name, suffix);
+  snprintf(filename, fbufsize, "%s%s"SLASH"%s.%s", prefix, middle, name, suffix);
   return (1);
 }
 
Index: src/utils.h
===================================================================
RCS file: /home/circledb/.cvs/circle/src/utils.h,v
retrieving revision 1.47
retrieving revision 1.56
diff -u -p -r1.47 -r1.56
--- src/utils.h	2002/01/10 15:44:56	1.47
+++ src/utils.h	2002/04/09 13:09:55	1.56
@@ -16,20 +16,20 @@ extern FILE *logfile;
 
 #define log			basic_mud_log
 
+#define READ_SIZE	256
+
 /* public functions in utils.c */
-char	*str_dup(const char *source);
-int	str_cmp(const char *arg1, const char *arg2);
-int	strn_cmp(const char *arg1, const char *arg2, int n);
 void	basic_mud_log(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
+void	basic_mud_vlog(const char *format, va_list args);
 int	touch(const char *path);
-void	mudlog(const char *str, int type, int level, int file);
+void	mudlog(int type, int level, int file, const char *str, ...) __attribute__ ((format (printf, 4, 5)));
 void	log_death_trap(struct char_data *ch);
-int	number(int from, int to);
+int	rand_number(int from, int to);
 int	dice(int number, int size);
-void	sprintbit(bitvector_t vektor, const char *names[], char *result);
-void	sprinttype(int type, const char *names[], char *result);
+size_t	sprintbit(bitvector_t vektor, const char *names[], char *result, size_t reslen);
+size_t	sprinttype(int type, const char *names[], char *result, size_t reslen);
 int	get_line(FILE *fl, char *buf);
-int	get_filename(char *orig_name, char *filename, int mode);
+int	get_filename(char *filename, size_t fbufsize, int mode, char *orig_name);
 time_t	mud_time_to_secs(struct time_info_data *now);
 struct time_info_data *age(struct char_data *ch);
 int	num_pc_in_room(struct room_data *room);
@@ -38,6 +38,17 @@ int	room_is_dark(room_rnum room);
 
 #define core_dump()		core_dump_real(__FILE__, __LINE__)
 
+/*
+ * Only provide our versions if one isn't in the C library. These macro names
+ * will be defined by sysdep.h if a strcasecmp or stricmp exists.
+ */
+#ifndef str_cmp
+int	str_cmp(const char *arg1, const char *arg2);
+#endif
+#ifndef strn_cmp
+int	strn_cmp(const char *arg1, const char *arg2, int n);
+#endif
+
 /* random functions in random.c */
 void circle_srandom(unsigned long initial_seed);
 unsigned long circle_random(void);
@@ -211,7 +222,7 @@ void	update_pos(struct char_data *victim
 #define PRF_FLAGGED(ch, flag) (IS_SET(PRF_FLAGS(ch), (flag)))
 #define ROOM_FLAGGED(loc, flag) (IS_SET(ROOM_FLAGS(loc), (flag)))
 #define EXIT_FLAGGED(exit, flag) (IS_SET((exit)->exit_info, (flag)))
-#define OBJAFF_FLAGGED(obj, flag) (IS_SET(GET_OBJ_AFFECT((obj), (flag))
+#define OBJAFF_FLAGGED(obj, flag) (IS_SET(GET_OBJ_AFFECT(obj), (flag)))
 #define OBJVAL_FLAGGED(obj, flag) (IS_SET(GET_OBJ_VAL((obj), 1), (flag)))
 #define OBJWEAR_FLAGGED(obj, flag) (IS_SET(GET_OBJ_WEAR(obj), (flag)))
 #define OBJ_FLAGGED(obj, flag) (IS_SET(GET_OBJ_EXTRA(obj), (flag)))