Patch03 for TinyMUX 1.4

Fixed problems with zone recursion, as well as a problem with examining
a zoned object and seeing all attributes as the same name. All
semaphores are now cleared on objects when they are destroyed. @clone now
creates object with the correct cost. Fixed problem with @oemit that
crept in 1.4p0.

Due to a switch to the CVS revision control system, the Makefile now
generates the symbolic links in the game/bin directory.

diff -c -r ./CHANGES ../mux/CHANGES
*** ./CHANGES	Sun Apr  6 22:21:57 1997
--- ../mux/CHANGES	Wed Apr 16 02:03:03 1997
***************
*** 434,436 ****
--- 434,451 ----
  - @wait <n>=@restart will no longer crash the MUX.
  - @oemit now works as described in the help, no longer only in the executing 
    player's location.
+ 
+ TinyMUX 1.4 patchlevel 1:
+ - This fixed a problem with the help for mail(), a crashing problem with
+   repeat(), and a compiling problem with patchlevel.h.
+ 
+ TinyMUX 1.4 patchlevel 2:
+ - This patch fixes a problem with patchlevel.h, as well as a problem with
+   @delcommand where restoring a built-in command was not functioning properly.
+ 
+ TinyMUX 1.4 patchlevel 3:
+ - Fixed problems with zone recursion, as well as a problem with examining a
+   zoned object and seeing all attributes as the same name.
+ - All semaphores are now cleared on objects when they are destroyed.
+ - @clone now creates object with the correct cost.
+ - Fixed problem with @oemit that crept in 1.4p0.
diff -c -r ./src/Makefile.in ../mux/src/Makefile.in
*** ./src/Makefile.in	Tue Dec  3 22:09:32 1996
--- ../mux/src/Makefile.in	Wed Apr 16 11:21:06 1997
***************
*** 207,216 ****
  	$(CC) $(ALLCFLAGS) -c $<
  
  # paths is likely to remain broken
! all: slave $(OUT) 
  
  TAGS: *.c *.h
  	etags *.c *.h
  
  conc: portconc.o
  	$(CC) $(ALLCFLAGS) $(LIBS) -o conc portconc.o
--- 207,224 ----
  	$(CC) $(ALLCFLAGS) -c $<
  
  # paths is likely to remain broken
! all: slave $(OUT) links 
  
  TAGS: *.c *.h
  	etags *.c *.h
+ 
+ links: dbconvert mkindx netmux slave
+         cd ../game/bin ; rm -f conc ; ln -s ../../src/conc conc
+         cd ../game/bin ; rm -f dbconvert ; ln -s ../../src/dbconvert
+         cd ../game/bin ; rm -f mkindx ; ln -s ../../src/mkindx
+         cd ../game/bin ; rm -f netmux ; ln -s ../../src/netmux
+         cd ../game/bin ; rm -f slave ; ln -s ../../src/slave
+ 	cd ../game/text; rm -f mkindx; ln -s ../../src/mkindx
  
  conc: portconc.o
  	$(CC) $(ALLCFLAGS) $(LIBS) -o conc portconc.o
diff -c -r ./src/alloc.c ../mux/src/alloc.c
*** ./src/alloc.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/alloc.c	Wed Apr 16 02:00:34 1997
***************
*** 2,8 ****
   * alloc.c - memory allocation subsystem 
   */
  /*
!  * $Id: alloc.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
--- 2,8 ----
   * alloc.c - memory allocation subsystem 
   */
  /*
!  * $Id: alloc.c,v 1.2 1997/04/16 06:00:34 dpassmor Exp $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
diff -c -r ./src/alloc.h ../mux/src/alloc.h
*** ./src/alloc.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/alloc.h	Wed Apr 16 02:00:35 1997
***************
*** 1,5 ****
  /* alloc.h - External definitions for memory allocation subsystem */
! /* $Id: alloc.h,v 1.2 1995/11/18 09:26:11 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* alloc.h - External definitions for memory allocation subsystem */
! /* $Id: alloc.h,v 1.2 1997/04/16 06:00:35 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/ansi.h ../mux/src/ansi.h
*** ./src/ansi.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/ansi.h	Wed Apr 16 02:00:36 1997
***************
*** 1,5 ****
  /* ansi.h */
! /* $Id: ansi.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  /* ANSI control codes for various neat-o terminal effects
   *
--- 1,5 ----
  /* ansi.h */
! /* $Id: ansi.h,v 1.2 1997/04/16 06:00:36 dpassmor Exp $ */
  
  /* ANSI control codes for various neat-o terminal effects
   *
diff -c -r ./src/attrs.h ../mux/src/attrs.h
*** ./src/attrs.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/attrs.h	Wed Apr 16 02:00:37 1997
***************
*** 1,5 ****
  /* attrs.h - Attribute definitions */
! /* $Id: attrs.h,v 1.2 1995/11/22 23:34:24 root Exp $ */
  
  #ifndef _ATTRS_H
  #define _ATTRS_H
--- 1,5 ----
  /* attrs.h - Attribute definitions */
! /* $Id: attrs.h,v 1.2 1997/04/16 06:00:37 dpassmor Exp $ */
  
  #ifndef _ATTRS_H
  #define _ATTRS_H
diff -c -r ./src/boolexp.c ../mux/src/boolexp.c
*** ./src/boolexp.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/boolexp.c	Wed Apr 16 02:00:38 1997
***************
*** 2,8 ****
   * boolexp.c 
   */
  /*
!  * $Id: boolexp.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
--- 2,8 ----
   * boolexp.c 
   */
  /*
!  * $Id: boolexp.c,v 1.2 1997/04/16 06:00:38 dpassmor Exp $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
diff -c -r ./src/bsd.c ../mux/src/bsd.c
*** ./src/bsd.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/bsd.c	Wed Apr 16 02:00:39 1997
***************
*** 2,8 ****
   * bsd.c 
   */
  /*
!  * $Id: bsd.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
--- 2,8 ----
   * bsd.c 
   */
  /*
!  * $Id: bsd.c,v 1.2 1997/04/16 06:00:39 dpassmor Exp $ 
   */
  #include "copyright.h"
  #include "autoconf.h"
diff -c -r ./src/command.c ../mux/src/command.c
*** ./src/command.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/command.c	Wed Apr 16 02:00:40 1997
***************
*** 2,8 ****
   * command.c - command parser and support routines 
   */
  /*
!  * $Id: command.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * command.c - command parser and support routines 
   */
  /*
!  * $Id: command.c,v 1.2 1997/04/16 06:00:40 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/command.h ../mux/src/command.h
*** ./src/command.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/command.h	Wed Apr 16 02:00:42 1997
***************
*** 1,5 ****
  /* command.h - declarations used by the command processor */
! /* $Id: command.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* command.h - declarations used by the command processor */
! /* $Id: command.h,v 1.2 1997/04/16 06:00:42 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/compat.c ../mux/src/compat.c
*** ./src/compat.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/compat.c	Wed Apr 16 02:00:43 1997
***************
*** 3,9 ****
   * compat.c -- functions that we need to provide because they are missing 
   */
  /*
!  * $Id: compat.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 3,9 ----
   * compat.c -- functions that we need to provide because they are missing 
   */
  /*
!  * $Id: compat.c,v 1.2 1997/04/16 06:00:43 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/comsys.c ../mux/src/comsys.c
*** ./src/comsys.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/comsys.c	Wed Apr 16 02:00:44 1997
***************
*** 3,9 ****
   * comsys.c 
   */
  /*
!  * $Id: comsys.c,v 1.4 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include <ctype.h>
--- 3,9 ----
   * comsys.c 
   */
  /*
!  * $Id: comsys.c,v 1.2 1997/04/16 06:00:44 dpassmor Exp $ 
   */
  
  #include <ctype.h>
diff -c -r ./src/comsys.h ../mux/src/comsys.h
*** ./src/comsys.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/comsys.h	Wed Apr 16 02:00:46 1997
***************
*** 1,5 ****
  /* comsys.h */
! /* $Id: comsys.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #ifndef __COMSYS_H__
  #define __COMSYS_H__
--- 1,5 ----
  /* comsys.h */
! /* $Id: comsys.h,v 1.2 1997/04/16 06:00:46 dpassmor Exp $ */
  
  #ifndef __COMSYS_H__
  #define __COMSYS_H__
diff -c -r ./src/conf.c ../mux/src/conf.c
*** ./src/conf.c	Sat Apr 12 16:02:30 1997
--- ../mux/src/conf.c	Wed Apr 16 02:00:47 1997
***************
*** 2,8 ****
   * conf.c:      set up configuration information and static data 
   */
  /*
!  * $Id: conf.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * conf.c:      set up configuration information and static data 
   */
  /*
!  * $Id: conf.c,v 1.2 1997/04/16 06:00:47 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 309,314 ****
--- 309,315 ----
  	mudstate.func_invk_ctr = 0;
  	mudstate.ntfy_nest_lev = 0;
  	mudstate.lock_nest_lev = 0;
+ 	mudstate.zone_nest_num = 0;
  	for (i = 0; i < MAX_GLOBAL_REGS; i++)
  		mudstate.global_regs[i] = NULL;
  #else
diff -c -r ./src/config.h ../mux/src/config.h
*** ./src/config.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/config.h	Wed Apr 16 02:00:48 1997
***************
*** 1,5 ****
  /* config.h */
! /* $Id: config.h,v 1.3 1995/12/03 09:19:06 root Exp root $ */
  
  #ifndef CONFIG_H
  #define CONFIG_H
--- 1,5 ----
  /* config.h */
! /* $Id: config.h,v 1.2 1997/04/16 06:00:48 dpassmor Exp $ */
  
  #ifndef CONFIG_H
  #define CONFIG_H
diff -c -r ./src/copyright.h ../mux/src/copyright.h
*** ./src/copyright.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/copyright.h	Wed Apr 16 02:00:49 1997
***************
*** 1,6 ****
  /* copyright.h */
  /* -*-C-*- */
! /* $Id: copyright.h,v 1.3 1995/11/22 23:34:24 root Exp $ */
  
  /*
   * TinyMUX 1.0, 1.1 and 1.2 Source code is maintained by David Passmore
--- 1,6 ----
  /* copyright.h */
  /* -*-C-*- */
! /* $Id: copyright.h,v 1.2 1997/04/16 06:00:49 dpassmor Exp $ */
  
  /*
   * TinyMUX 1.0, 1.1 and 1.2 Source code is maintained by David Passmore
diff -c -r ./src/cque.c ../mux/src/cque.c
*** ./src/cque.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/cque.c	Wed Apr 16 02:00:50 1997
***************
*** 2,8 ****
   * cque.c -- commands and functions for manipulating the command queue 
   */
  /*
!  * $Id: cque.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * cque.c -- commands and functions for manipulating the command queue 
   */
  /*
!  * $Id: cque.c,v 1.2 1997/04/16 06:00:50 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 264,276 ****
  	dbref aowner;
  	char *str;
  
! 	str = atr_get(sem, attr, &aowner, &aflags);
! 	num = atoi(str);
! 	free_lbuf(str);
  	if (num > 0) {
  		num = 0;
  		for (point = mudstate.qsemfirst, trail = NULL; point; point = next) {
! 			if (point->sem == sem) {
  				num++;
  				if (trail)
  					trail->next = next = point->next;
--- 264,282 ----
  	dbref aowner;
  	char *str;
  
!        if (attr) {
!                str = atr_get(sem, attr, &aowner, &aflags);
!                num = atoi(str);
!                free_lbuf(str);
!        } else {
!                num = 1;
!        }
! 
  	if (num > 0) {
  		num = 0;
  		for (point = mudstate.qsemfirst, trail = NULL; point; point = next) {
!                        if ((point->sem == sem) &&
!                            ((point->attr == attr) || !attr)) {
  				num++;
  				if (trail)
  					trail->next = next = point->next;
diff -c -r ./src/create.c ../mux/src/create.c
*** ./src/create.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/create.c	Wed Apr 16 02:00:51 1997
***************
*** 2,8 ****
   * create.c -- Commands that create new objects 
   */
  /*
!  * $Id: create.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * create.c -- Commands that create new objects 
   */
  /*
!  * $Id: create.c,v 1.2 1997/04/16 06:00:51 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 600,607 ****
  	else
  		s_Name(clone, Name(thing));
  
- 	s_Pennies(clone, cost);
- 	
  	/*
  	 * Clear out problem flags from the original 
  	 */
--- 600,605 ----
diff -c -r ./src/db.c ../mux/src/db.c
*** ./src/db.c	Sat Apr 12 16:02:25 1997
--- ../mux/src/db.c	Wed Apr 16 02:00:52 1997
***************
*** 2,8 ****
   * db.c 
   */
  /*
!  * $Id: db.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * db.c 
   */
  /*
!  * $Id: db.c,v 1.2 1997/04/16 06:00:52 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 3171,3206 ****
   * check_zone - checks back through a zone tree for control 
   */
  
! int check_zone(player, thing, limit)
  dbref player, thing;
- int limit;
  {
! 	if (!mudconf.have_zones || (Zone(thing) == NOTHING) || (limit == mudconf.zone_nest_lim) || (isPlayer(thing)))
  		return 0;
! 
  	/*
  	 * If the zone doesn't have an enterlock, DON'T allow control. 
  	 */
  
  	if (atr_get_raw(Zone(thing), A_LENTER) && could_doit(player, Zone(thing), A_LENTER)) {
  		return 1;
  	} else {
! 		return check_zone(player, Zone(thing), limit + 1);
  	}
  
  }
  
! int check_zone_for_player(player, thing, limit)
  dbref player, thing;
- int limit;
  {
! 	if (!mudconf.have_zones || (Zone(thing) == NOTHING) || (limit == mudconf.zone_nest_lim) || !(isPlayer(thing)))
  		return 0;
  
  	if (atr_get_raw(Zone(thing), A_LENTER) && could_doit(player, Zone(thing), A_LENTER)) {
  		return 1;
  	} else {
! 		return check_zone(player, Zone(thing), limit + 1);
  	}
  
  }
--- 3171,3213 ----
   * check_zone - checks back through a zone tree for control 
   */
  
! int check_zone(player, thing)
  dbref player, thing;
  {
! 	if (!mudconf.have_zones || (Zone(thing) == NOTHING) || 
! 	     (mudstate.zone_nest_num == mudconf.zone_nest_lim) || (isPlayer(thing))) {
  		return 0;
! 	}
! 	
  	/*
  	 * If the zone doesn't have an enterlock, DON'T allow control. 
  	 */
  
  	if (atr_get_raw(Zone(thing), A_LENTER) && could_doit(player, Zone(thing), A_LENTER)) {
+ 		mudstate.zone_nest_num = 0;
  		return 1;
  	} else {
! 		mudstate.zone_nest_num++;
! 		return check_zone(player, Zone(thing));
  	}
  
  }
  
! int check_zone_for_player(player, thing)
  dbref player, thing;
  {
! 	if (!mudconf.have_zones || (Zone(thing) == NOTHING) ||
! 	    (mudstate.zone_nest_num == mudconf.zone_nest_lim) || !(isPlayer(thing))) {
! 		mudstate.zone_nest_num = 0;
  		return 0;
+ 	}
  
  	if (atr_get_raw(Zone(thing), A_LENTER) && could_doit(player, Zone(thing), A_LENTER)) {
+ 		mudstate.zone_nest_num = 0;
  		return 1;
  	} else {
! 		mudstate.zone_nest_num++;
! 		return check_zone(player, Zone(thing));
  	}
  
  }
***************
*** 3215,3223 ****
  
  #else
  
! int check_zone(player, thing, limit)
  dbref player, thing;
- int limit;
  {
  	return 0;
  }
--- 3222,3229 ----
  
  #else
  
! int check_zone(player, thing)
  dbref player, thing;
  {
  	return 0;
  }
diff -c -r ./src/db.h ../mux/src/db.h
*** ./src/db.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/db.h	Wed Apr 16 02:00:53 1997
***************
*** 1,5 ****
  /* db.h */
! /* $Id: db.h,v 1.3 1995/12/03 09:19:06 root Exp root $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* db.h */
! /* $Id: db.h,v 1.2 1997/04/16 06:00:53 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/db_rw.c ../mux/src/db_rw.c
*** ./src/db_rw.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/db_rw.c	Wed Apr 16 02:00:54 1997
***************
*** 2,8 ****
   * db_rw.c 
   */
  /*
!  * $Id: db_rw.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * db_rw.c 
   */
  /*
!  * $Id: db_rw.c,v 1.2 1997/04/16 06:00:54 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/dbconvert.c ../mux/src/dbconvert.c
*** ./src/dbconvert.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/dbconvert.c	Wed Apr 16 02:00:55 1997
***************
*** 2,8 ****
   * dbconvert.c - Convert databases to various MUX formats 
   */
  /*
!  * $Id: dbconvert.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * dbconvert.c - Convert databases to various MUX formats 
   */
  /*
!  * $Id: dbconvert.c,v 1.2 1997/04/16 06:00:55 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/eval.c ../mux/src/eval.c
*** ./src/eval.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/eval.c	Wed Apr 16 02:00:56 1997
***************
*** 2,8 ****
   * eval.c - command evaluation and cracking 
   */
  /*
!  * $Id: eval.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * eval.c - command evaluation and cracking 
   */
  /*
!  * $Id: eval.c,v 1.2 1997/04/16 06:00:56 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/externs.h ../mux/src/externs.h
*** ./src/externs.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/externs.h	Wed Apr 16 02:00:57 1997
***************
*** 1,6 ****
  
  /* externs.h - Prototypes for externs not defined elsewhere */
! /* $Id: externs.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,6 ----
  
  /* externs.h - Prototypes for externs not defined elsewhere */
! /* $Id: externs.h,v 1.2 1997/04/16 06:00:57 dpassmor Exp $ */
  
  #include "copyright.h"
  
***************
*** 293,300 ****
  extern int	FDECL(atr_get_info, (dbref, int, dbref *, int *));
  extern int	FDECL(atr_pget_info, (dbref, int, dbref *, int *));
  extern void	FDECL(atr_free, (dbref));
! extern int	FDECL(check_zone, (dbref, dbref, int));
! extern int	FDECL(check_zone_for_player, (dbref, dbref, int));
  extern void	FDECL(toast_player, (dbref));
  
  /* Command handler keys */
--- 293,300 ----
  extern int	FDECL(atr_get_info, (dbref, int, dbref *, int *));
  extern int	FDECL(atr_pget_info, (dbref, int, dbref *, int *));
  extern void	FDECL(atr_free, (dbref));
! extern int	FDECL(check_zone, (dbref, dbref));
! extern int	FDECL(check_zone_for_player, (dbref, dbref));
  extern void	FDECL(toast_player, (dbref));
  
  /* Command handler keys */
diff -c -r ./src/file_c.c ../mux/src/file_c.c
*** ./src/file_c.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/file_c.c	Wed Apr 16 02:00:58 1997
***************
*** 2,8 ****
   * file_c.c -- File cache management 
   */
  /*
!  * $Id: file_c.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * file_c.c -- File cache management 
   */
  /*
!  * $Id: file_c.c,v 1.2 1997/04/16 06:00:58 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/file_c.h ../mux/src/file_c.h
*** ./src/file_c.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/file_c.h	Wed Apr 16 02:00:59 1997
***************
*** 1,5 ****
  /* file_c.h -- File cache header file */
! /* $Id: file_c.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  #ifndef __FILE_C
--- 1,5 ----
  /* file_c.h -- File cache header file */
! /* $Id: file_c.h,v 1.2 1997/04/16 06:00:59 dpassmor Exp $ */
  
  #include "copyright.h"
  #ifndef __FILE_C
diff -c -r ./src/flags.c ../mux/src/flags.c
*** ./src/flags.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/flags.c	Wed Apr 16 02:01:00 1997
***************
*** 2,8 ****
   * flags.c - flag manipulation routines 
   */
  /*
!  * $Id: flags.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * flags.c - flag manipulation routines 
   */
  /*
!  * $Id: flags.c,v 1.2 1997/04/16 06:01:00 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/flags.h ../mux/src/flags.h
*** ./src/flags.h	Sat Apr 12 16:02:02 1997
--- ../mux/src/flags.h	Wed Apr 16 02:01:01 1997
***************
*** 1,5 ****
  /* flags.h - object flags */
! /* $Id: flags.h,v 1.3 1995/12/03 09:19:06 root Exp root $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* flags.h - object flags */
! /* $Id: flags.h,v 1.2 1997/04/16 06:01:01 dpassmor Exp $ */
  
  #include "copyright.h"
  
***************
*** 444,467 ****
  #define	Parentable(p,x)	(Controls(p,x) || \
  			 (Parent_ok(x) && could_doit(p,x,A_LPARENT)))
  
! #define OnEnterLock(p,x) (check_zone(p,x,0))
  
  #define	Examinable(p,x)	(((Flags(x) & VISUAL) != 0) || \
  			 (See_All(p)) || \
!                          OnEnterLock(p,x) || \
! 			 (Owner(p) == Owner(x)))
  
  #define	MyopicExam(p,x)	(((Flags(x) & VISUAL) != 0) || \
  			 (!Myopic(p) && (See_All(p) || \
! 			 OnEnterLock(p,x) || \
!   	                 (Owner(p) == Owner(x)))))
  
  #define	Controls(p,x)	(Good_obj(x) && \
  			 (!(God(x) && !God(p))) && \
  			 (Control_All(p) || \
-                          OnEnterLock(p,x) || \
  			  ((Owner(p) == Owner(x)) && \
! 			   (Inherits(p) || !Inherits(x)))))
  
  #define	Affects(p,x)	(Good_obj(x) && \
  			 (!(God(x) && !God(p))) && \
--- 444,467 ----
  #define	Parentable(p,x)	(Controls(p,x) || \
  			 (Parent_ok(x) && could_doit(p,x,A_LPARENT)))
  
! #define OnEnterLock(p,x) (check_zone(p,x))
  
  #define	Examinable(p,x)	(((Flags(x) & VISUAL) != 0) || \
  			 (See_All(p)) || \
!                          (Owner(p) == Owner(x)) || \
! 			 OnEnterLock(p,x))
  
  #define	MyopicExam(p,x)	(((Flags(x) & VISUAL) != 0) || \
  			 (!Myopic(p) && (See_All(p) || \
! 			 (Owner(p) == Owner(x)) || \
!   	                 OnEnterLock(p,x))))
  
  #define	Controls(p,x)	(Good_obj(x) && \
  			 (!(God(x) && !God(p))) && \
  			 (Control_All(p) || \
  			  ((Owner(p) == Owner(x)) && \
! 			   (Inherits(p) || !Inherits(x))) || \
! 			   OnEnterLock(p,x)))
  
  #define	Affects(p,x)	(Good_obj(x) && \
  			 (!(God(x) && !God(p))) && \
diff -c -r ./src/funceval.c ../mux/src/funceval.c
*** ./src/funceval.c	Sun Apr  6 23:35:18 1997
--- ../mux/src/funceval.c	Wed Apr 16 02:01:02 1997
***************
*** 2,8 ****
   * funceval.c - MUX function handlers 
   */
  /*
!  * $Id: funceval.c,v 1.4 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * funceval.c - MUX function handlers 
   */
  /*
!  * $Id: funceval.c,v 1.2 1997/04/16 06:01:02 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/functions.c ../mux/src/functions.c
*** ./src/functions.c	Mon Apr  7 02:00:09 1997
--- ../mux/src/functions.c	Wed Apr 16 02:01:04 1997
***************
*** 2,8 ****
   * functions.c - MUX function handlers 
   */
  /*
!  * $Id: functions.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * functions.c - MUX function handlers 
   */
  /*
!  * $Id: functions.c,v 1.2 1997/04/16 06:01:04 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/functions.h ../mux/src/functions.h
*** ./src/functions.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/functions.h	Wed Apr 16 02:01:05 1997
***************
*** 1,5 ****
  /* functions.h - declarations for functions & function processing */
! /* $Id: functions.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* functions.h - declarations for functions & function processing */
! /* $Id: functions.h,v 1.2 1997/04/16 06:01:05 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/game.c ../mux/src/game.c
*** ./src/game.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/game.c	Wed Apr 16 02:01:06 1997
***************
*** 2,8 ****
   * game.c 
   */
  /*
!  * $Id: game.c,v 1.5 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * game.c 
   */
  /*
!  * $Id: game.c,v 1.2 1997/04/16 06:01:06 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/gdbm.h ../mux/src/gdbm.h
*** ./src/gdbm.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/gdbm.h	Wed Apr 16 02:01:07 1997
***************
*** 1,5 ****
  /* gdbm.h  -  The include file for dbm users.  */
! /* $Id: gdbm.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  /*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
      Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
--- 1,5 ----
  /* gdbm.h  -  The include file for dbm users.  */
! /* $Id: gdbm.h,v 1.2 1997/04/16 06:01:07 dpassmor Exp $ */
  
  /*  This file is part of GDBM, the GNU data base manager, by Philip A. Nelson.
      Copyright (C) 1990, 1991, 1993  Free Software Foundation, Inc.
diff -c -r ./src/help.c ../mux/src/help.c
*** ./src/help.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/help.c	Wed Apr 16 02:01:08 1997
***************
*** 2,8 ****
   * help.c -- commands for giving help 
   */
  /*
!  * $Id: help.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * help.c -- commands for giving help 
   */
  /*
!  * $Id: help.c,v 1.2 1997/04/16 06:01:08 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/help.h ../mux/src/help.h
*** ./src/help.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/help.h	Wed Apr 16 02:01:09 1997
***************
*** 1,5 ****
  /* help.h */
! /* $Id: help.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #define  LINE_SIZE		90
  
--- 1,5 ----
  /* help.h */
! /* $Id: help.h,v 1.2 1997/04/16 06:01:09 dpassmor Exp $ */
  
  #define  LINE_SIZE		90
  
diff -c -r ./src/htab.c ../mux/src/htab.c
*** ./src/htab.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/htab.c	Wed Apr 16 02:01:10 1997
***************
*** 2,8 ****
   * htab.c - table hashing routines 
   */
  /*
!  * $Id: htab.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * htab.c - table hashing routines 
   */
  /*
!  * $Id: htab.c,v 1.2 1997/04/16 06:01:10 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/htab.h ../mux/src/htab.h
*** ./src/htab.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/htab.h	Wed Apr 16 02:01:11 1997
***************
*** 1,5 ****
  /* htab.h - Structures and declarations needed for table hashing */
! /* $Id: htab.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* htab.h - Structures and declarations needed for table hashing */
! /* $Id: htab.h,v 1.2 1997/04/16 06:01:11 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/interface.h ../mux/src/interface.h
*** ./src/interface.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/interface.h	Wed Apr 16 02:01:12 1997
***************
*** 1,5 ****
  /* interface.h */
! /* $Id: interface.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* interface.h */
! /* $Id: interface.h,v 1.2 1997/04/16 06:01:12 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/log.c ../mux/src/log.c
*** ./src/log.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/log.c	Wed Apr 16 02:01:12 1997
***************
*** 2,8 ****
   * log.c - logging routines 
   */
  /*
!  * $Id: log.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * log.c - logging routines 
   */
  /*
!  * $Id: log.c,v 1.2 1997/04/16 06:01:12 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/look.c ../mux/src/look.c
*** ./src/look.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/look.c	Wed Apr 16 02:01:13 1997
***************
*** 3,9 ****
   * look.c -- commands which look at things 
   */
  /*
!  * $Id: look.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 3,9 ----
   * look.c -- commands which look at things 
   */
  /*
!  * $Id: look.c,v 1.2 1997/04/16 06:01:13 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 306,314 ****
  {
  	dbref aowner;
  	int ca, aflags;
! 	ATTR *attr;
  	char *as, *buf;
  
  	for (ca = atr_head(thing, &as); ca; ca = atr_next(&as)) {
  		if ((ca == A_DESC) || (ca == A_LOCK))
  			continue;
--- 306,315 ----
  {
  	dbref aowner;
  	int ca, aflags;
! 	ATTR *attr, *cattr;
  	char *as, *buf;
  
+ 	cattr = (ATTR *)malloc(sizeof(ATTR));
  	for (ca = atr_head(thing, &as); ca; ca = atr_next(&as)) {
  		if ((ca == A_DESC) || (ca == A_LOCK))
  			continue;
***************
*** 316,321 ****
--- 317,324 ----
  		if (!attr)
  			continue;
  
+ 		bcopy((char *)attr, (char *)cattr, sizeof(ATTR));
+ 
  		/*
  		 * Should we exclude this attr? 
  		 */
***************
*** 327,332 ****
--- 330,339 ----
  
  		buf = atr_get(thing, ca, &aowner, &aflags);
  		if (Read_attr(player, othing, attr, aowner, aflags)) {
+                        /* check_zone/atr_num overwrites attr!! */
+ 
+                        if (attr->number != cattr->number)
+                                bcopy((char *)cattr, (char *)attr, sizeof(ATTR));
  
  			if (!(check_exclude && (aflags & AF_PRIVATE))) {
  				if (hash_insert)
***************
*** 338,343 ****
--- 345,351 ----
  		}
  		free_lbuf(buf);
  	}
+ 	free(cattr);
  }
  
  static void look_atrs(player, thing, check_parents)
diff -c -r ./src/mail.c ../mux/src/mail.c
*** ./src/mail.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/mail.c	Wed Apr 16 02:01:15 1997
***************
*** 4,10 ****
   * originally taken from PennMUSH 1.50 p10, and has been heavily modified
   * since being included in MUX.
   * 
!  * $Id: mail.c,v 1.5 1995/12/03 09:18:32 root Exp root $
   * -------------------------------------------------------------------
   */
  
--- 4,10 ----
   * originally taken from PennMUSH 1.50 p10, and has been heavily modified
   * since being included in MUX.
   * 
!  * $Id: mail.c,v 1.2 1997/04/16 06:01:15 dpassmor Exp $
   * -------------------------------------------------------------------
   */
  
diff -c -r ./src/mail.h ../mux/src/mail.h
*** ./src/mail.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/mail.h	Wed Apr 16 02:01:16 1997
***************
*** 1,5 ****
  /* mail.h */
! /* $Id: mail.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #ifndef _MAIL_H
  #define _MAIL_H
--- 1,5 ----
  /* mail.h */
! /* $Id: mail.h,v 1.2 1997/04/16 06:01:16 dpassmor Exp $ */
  
  #ifndef _MAIL_H
  #define _MAIL_H
diff -c -r ./src/match.c ../mux/src/match.c
*** ./src/match.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/match.c	Wed Apr 16 02:01:18 1997
***************
*** 2,8 ****
   * match.c -- Routines for parsing arguments 
   */
  /*
!  * $Id: match.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * match.c -- Routines for parsing arguments 
   */
  /*
!  * $Id: match.c,v 1.2 1997/04/16 06:01:18 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/match.h ../mux/src/match.h
*** ./src/match.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/match.h	Wed Apr 16 02:01:20 1997
***************
*** 1,5 ****
  /* match.h */
! /* $Id: match.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* match.h */
! /* $Id: match.h,v 1.2 1997/04/16 06:01:20 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/mguests.c ../mux/src/mguests.c
*** ./src/mguests.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/mguests.c	Wed Apr 16 02:01:22 1997
***************
*** 3,9 ****
   * mguests.c - multiguest code originally ported from DarkZone 
   */
  /*
!  * $Id: mguests.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include <stdlib.h>
--- 3,9 ----
   * mguests.c - multiguest code originally ported from DarkZone 
   */
  /*
!  * $Id: mguests.c,v 1.2 1997/04/16 06:01:22 dpassmor Exp $ 
   */
  
  #include <stdlib.h>
diff -c -r ./src/mguests.h ../mux/src/mguests.h
*** ./src/mguests.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/mguests.h	Wed Apr 16 02:01:22 1997
***************
*** 1,5 ****
  /* mguests.h */
! /* $Id: mguests.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #ifndef  __MGUESTS_H
  #define __MGUESTS_H
--- 1,5 ----
  /* mguests.h */
! /* $Id: mguests.h,v 1.2 1997/04/16 06:01:22 dpassmor Exp $ */
  
  #ifndef  __MGUESTS_H
  #define __MGUESTS_H
diff -c -r ./src/misc.h ../mux/src/misc.h
*** ./src/misc.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/misc.h	Wed Apr 16 02:01:23 1997
***************
*** 1,5 ****
  /* misc.h - miscellaneous structures that are needed in more than one file */
! /* $Id: misc.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* misc.h - miscellaneous structures that are needed in more than one file */
! /* $Id: misc.h,v 1.2 1997/04/16 06:01:23 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/mkindx.c ../mux/src/mkindx.c
*** ./src/mkindx.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/mkindx.c	Wed Apr 16 02:01:24 1997
***************
*** 2,8 ****
   * mkindx.c -- make help/news file indexes 
   */
  /*
!  * $Id: mkindx.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * mkindx.c -- make help/news file indexes 
   */
  /*
!  * $Id: mkindx.c,v 1.2 1997/04/16 06:01:24 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/move.c ../mux/src/move.c
*** ./src/move.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/move.c	Wed Apr 16 02:01:25 1997
***************
*** 2,8 ****
   * move.c -- Routines for moving about 
   */
  /*
!  * $Id: move.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * move.c -- Routines for moving about 
   */
  /*
!  * $Id: move.c,v 1.2 1997/04/16 06:01:25 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/mudconf.h ../mux/src/mudconf.h
*** ./src/mudconf.h	Sat Apr 12 16:02:36 1997
--- ../mux/src/mudconf.h	Wed Apr 16 02:01:26 1997
***************
*** 1,5 ****
  /* mudconf.h */
! /* $Id: mudconf.h,v 1.3 1995/11/22 23:34:24 root Exp $ */
  
  #ifndef __CONF_H
  #define __CONF_H
--- 1,5 ----
  /* mudconf.h */
! /* $Id: mudconf.h,v 1.2 1997/04/16 06:01:26 dpassmor Exp $ */
  
  #ifndef __CONF_H
  #define __CONF_H
***************
*** 345,350 ****
--- 345,351 ----
  	int	ntfy_nest_lev;	/* Current nesting of notifys */
  	int	lock_nest_lev;	/* Current nesting of lock evals */
  	char	*global_regs[MAX_GLOBAL_REGS];	/* Global registers */
+ 	int     zone_nest_num;  /* Global current zone nest position */
  #else
  	int	logging;	/* Are we in the middle of logging? */
  	char	buffer[256];	/* A buffer for holding temp stuff */
diff -c -r ./src/netcommon.c ../mux/src/netcommon.c
*** ./src/netcommon.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/netcommon.c	Wed Apr 16 02:01:27 1997
***************
*** 3,9 ****
   * netcommon.c 
   */
  /*
!  * $Id: netcommon.c,v 1.6 1995/12/03 09:18:32 root Exp root $ 
   */
  
  /*
--- 3,9 ----
   * netcommon.c 
   */
  /*
!  * $Id: netcommon.c,v 1.2 1997/04/16 06:01:27 dpassmor Exp $ 
   */
  
  /*
diff -c -r ./src/object.c ../mux/src/object.c
*** ./src/object.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/object.c	Wed Apr 16 02:01:28 1997
***************
*** 2,8 ****
   * object.c - low-level object manipulation routines 
   */
  /*
!  * $Id: object.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * object.c - low-level object manipulation routines 
   */
  /*
!  * $Id: object.c,v 1.2 1997/04/16 06:01:28 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 444,450 ****
  			notify(owner, "Halted.");
  		}
  	}
! 	nfy_que(obj, A_SEMAPHORE, NFY_DRAIN, 0);
  #endif
  
  	/*
--- 444,450 ----
  			notify(owner, "Halted.");
  		}
  	}
! 	nfy_que(obj, 0, NFY_DRAIN, 0);
  #endif
  
  	/*
diff -c -r ./src/patchlevel.h ../mux/src/patchlevel.h
*** ./src/patchlevel.h	Wed Apr  9 12:46:34 1997
--- ../mux/src/patchlevel.h	Wed Apr 16 02:01:29 1997
***************
*** 1,11 ****
  /* patchlevel.h - version information */
! /* $Id: patchlevel.h,v 1.2 1995/11/18 09:26:11 root Exp $ */
  
  #include "copyright.h"
  
  #define	MUX_VERSION		"1.4"		/* Base version number */
! #define PATCHLEVEL		2		/* Patch sequence number */
! #define	MUX_RELEASE_DATE	"4/6/97"	/* Source release date */
  
  /*#define BETA			1*/		/* Define if a BETA release */
  
--- 1,11 ----
  /* patchlevel.h - version information */
! /* $Id: patchlevel.h,v 1.2 1997/04/16 06:01:29 dpassmor Exp $ */
  
  #include "copyright.h"
  
  #define	MUX_VERSION		"1.4"		/* Base version number */
! #define PATCHLEVEL		3		/* Patch sequence number */
! #define	MUX_RELEASE_DATE	"4/15/97"	/* Source release date */
  
  /*#define BETA			1*/		/* Define if a BETA release */
  
diff -c -r ./src/player.c ../mux/src/player.c
*** ./src/player.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/player.c	Wed Apr 16 02:01:30 1997
***************
*** 2,8 ****
   * player.c 
   */
  /*
!  * $Id: player.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * player.c 
   */
  /*
!  * $Id: player.c,v 1.2 1997/04/16 06:01:30 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/player_c.c ../mux/src/player_c.c
*** ./src/player_c.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/player_c.c	Wed Apr 16 02:01:31 1997
***************
*** 3,9 ****
   * player_c.c -- Player cache routines 
   */
  /*
!  * $Id: player_c.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 3,9 ----
   * player_c.c -- Player cache routines 
   */
  /*
!  * $Id: player_c.c,v 1.2 1997/04/16 06:01:31 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/powers.c ../mux/src/powers.c
*** ./src/powers.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/powers.c	Wed Apr 16 02:01:32 1997
***************
*** 3,9 ****
   * powers.c - power manipulation routines 
   */
  /*
!  * $Id: powers.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 3,9 ----
   * powers.c - power manipulation routines 
   */
  /*
!  * $Id: powers.c,v 1.2 1997/04/16 06:01:32 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/powers.h ../mux/src/powers.h
*** ./src/powers.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/powers.h	Wed Apr 16 02:01:33 1997
***************
*** 1,5 ****
  /* powers.h - object powers */
! /* $Id: powers.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #include "copyright.h"
  
--- 1,5 ----
  /* powers.h - object powers */
! /* $Id: powers.h,v 1.2 1997/04/16 06:01:33 dpassmor Exp $ */
  
  #include "copyright.h"
  
diff -c -r ./src/predicates.c ../mux/src/predicates.c
*** ./src/predicates.c	Wed Apr  9 12:53:39 1997
--- ../mux/src/predicates.c	Wed Apr 16 02:01:34 1997
***************
*** 1,6 ****
  
  /*
!  * $Id: predicates.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 1,6 ----
  
  /*
!  * $Id: predicates.c,v 1.2 1997/04/16 06:01:34 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/rob.c ../mux/src/rob.c
*** ./src/rob.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/rob.c	Wed Apr 16 02:01:35 1997
***************
*** 2,8 ****
   * rob.c -- Commands dealing with giving/taking/killing things or money 
   */
  /*
!  * $Id: rob.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * rob.c -- Commands dealing with giving/taking/killing things or money 
   */
  /*
!  * $Id: rob.c,v 1.2 1997/04/16 06:01:35 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/sa-boolexp.c ../mux/src/sa-boolexp.c
*** ./src/sa-boolexp.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-boolexp.c	Wed Apr 16 02:01:36 1997
***************
*** 2,8 ****
   * Standalone boolexp.c 
   */
  /*
!  * $Id: sa-boolexp.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  #undef MEMORY_BASED
  #define STANDALONE
--- 2,8 ----
   * Standalone boolexp.c 
   */
  /*
!  * $Id: sa-boolexp.c,v 1.2 1997/04/16 06:01:36 dpassmor Exp $ 
   */
  #undef MEMORY_BASED
  #define STANDALONE
diff -c -r ./src/sa-conf.c ../mux/src/sa-conf.c
*** ./src/sa-conf.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-conf.c	Wed Apr 16 02:01:37 1997
***************
*** 2,8 ****
   * Standalone conf.c 
   */
  /*
!  * $Id: sa-conf.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone conf.c 
   */
  /*
!  * $Id: sa-conf.c,v 1.2 1997/04/16 06:01:37 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-db.c ../mux/src/sa-db.c
*** ./src/sa-db.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-db.c	Wed Apr 16 02:01:38 1997
***************
*** 2,8 ****
   * Standalone db.c 
   */
  /*
!  * $Id: sa-db.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone db.c 
   */
  /*
!  * $Id: sa-db.c,v 1.2 1997/04/16 06:01:38 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-db_rw.c ../mux/src/sa-db_rw.c
*** ./src/sa-db_rw.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-db_rw.c	Wed Apr 16 02:01:39 1997
***************
*** 2,8 ****
   * Standalone db_rw.c 
   */
  /*
!  * $Id: sa-db_rw.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone db_rw.c 
   */
  /*
!  * $Id: sa-db_rw.c,v 1.2 1997/04/16 06:01:39 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-flags.c ../mux/src/sa-flags.c
*** ./src/sa-flags.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-flags.c	Wed Apr 16 02:01:39 1997
***************
*** 2,8 ****
   * Standalone flags.c 
   */
  /*
!  * $Id: sa-flags.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone flags.c 
   */
  /*
!  * $Id: sa-flags.c,v 1.2 1997/04/16 06:01:39 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-htab.c ../mux/src/sa-htab.c
*** ./src/sa-htab.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-htab.c	Wed Apr 16 02:01:40 1997
***************
*** 2,8 ****
   * Standalone htab.c 
   */
  /*
!  * $Id: sa-htab.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone htab.c 
   */
  /*
!  * $Id: sa-htab.c,v 1.2 1997/04/16 06:01:40 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-log.c ../mux/src/sa-log.c
*** ./src/sa-log.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-log.c	Wed Apr 16 02:01:41 1997
***************
*** 2,8 ****
   * Standalone log.c 
   */
  /*
!  * $Id: sa-log.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone log.c 
   */
  /*
!  * $Id: sa-log.c,v 1.2 1997/04/16 06:01:41 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-object.c ../mux/src/sa-object.c
*** ./src/sa-object.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-object.c	Wed Apr 16 02:01:42 1997
***************
*** 2,8 ****
   * Standalone object.c 
   */
  /*
!  * $Id: sa-object.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone object.c 
   */
  /*
!  * $Id: sa-object.c,v 1.2 1997/04/16 06:01:42 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-player_c.c ../mux/src/sa-player_c.c
*** ./src/sa-player_c.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-player_c.c	Wed Apr 16 02:01:43 1997
***************
*** 2,8 ****
   * Standalone player_c.c 
   */
  /*
!  * $Id: sa-player_c.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone player_c.c 
   */
  /*
!  * $Id: sa-player_c.c,v 1.2 1997/04/16 06:01:43 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-pred.c ../mux/src/sa-pred.c
*** ./src/sa-pred.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-pred.c	Wed Apr 16 02:01:44 1997
***************
*** 2,8 ****
   * Standalone predicates.c 
   */
  /*
!  * $Id: sa-pred.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone predicates.c 
   */
  /*
!  * $Id: sa-pred.c,v 1.2 1997/04/16 06:01:44 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-stringu.c ../mux/src/sa-stringu.c
*** ./src/sa-stringu.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-stringu.c	Wed Apr 16 02:01:44 1997
***************
*** 2,8 ****
   * Standalone stringutil.c 
   */
  /*
!  * $Id: sa-stringu.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone stringutil.c 
   */
  /*
!  * $Id: sa-stringu.c,v 1.2 1997/04/16 06:01:44 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-udb_misc.c ../mux/src/sa-udb_misc.c
*** ./src/sa-udb_misc.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-udb_misc.c	Wed Apr 16 02:01:45 1997
***************
*** 1,5 ****
  /* Standalone udb_misc.c */
  
! /* $Id$ */
  #define STANDALONE
  #include "udb_misc.c"
--- 1,5 ----
  /* Standalone udb_misc.c */
  
! /* $Id: sa-udb_misc.c,v 1.2 1997/04/16 06:01:45 dpassmor Exp $ */
  #define STANDALONE
  #include "udb_misc.c"
diff -c -r ./src/sa-udb_obj.c ../mux/src/sa-udb_obj.c
*** ./src/sa-udb_obj.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-udb_obj.c	Wed Apr 16 02:01:46 1997
***************
*** 1,5 ****
  /* Standalone udb_obj.c */
  
! /* $Id$ */
  #define STANDALONE
  #include "udb_obj.c"
--- 1,5 ----
  /* Standalone udb_obj.c */
  
! /* $Id: sa-udb_obj.c,v 1.2 1997/04/16 06:01:46 dpassmor Exp $ */
  #define STANDALONE
  #include "udb_obj.c"
diff -c -r ./src/sa-udb_ocache.c ../mux/src/sa-udb_ocache.c
*** ./src/sa-udb_ocache.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-udb_ocache.c	Wed Apr 16 02:01:47 1997
***************
*** 1,5 ****
  /* Standalone udb_ocache.c */
  
! /* $Id$ */
  #define STANDALONE
  #include "udb_ocache.c"
--- 1,5 ----
  /* Standalone udb_ocache.c */
  
! /* $Id: sa-udb_ocache.c,v 1.2 1997/04/16 06:01:47 dpassmor Exp $ */
  #define STANDALONE
  #include "udb_ocache.c"
diff -c -r ./src/sa-udb_ochunk.c ../mux/src/sa-udb_ochunk.c
*** ./src/sa-udb_ochunk.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-udb_ochunk.c	Wed Apr 16 02:01:48 1997
***************
*** 1,5 ****
  /* Standalone udb_ochunk.c */
  
! /* $Id$ */
  #define STANDALONE
  #include "udb_ochunk.c"
--- 1,5 ----
  /* Standalone udb_ochunk.c */
  
! /* $Id: sa-udb_ochunk.c,v 1.2 1997/04/16 06:01:48 dpassmor Exp $ */
  #define STANDALONE
  #include "udb_ochunk.c"
diff -c -r ./src/sa-unparse.c ../mux/src/sa-unparse.c
*** ./src/sa-unparse.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-unparse.c	Wed Apr 16 02:01:49 1997
***************
*** 2,8 ****
   * Standalone unparse.c 
   */
  /*
!  * $Id: sa-unparse.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone unparse.c 
   */
  /*
!  * $Id: sa-unparse.c,v 1.2 1997/04/16 06:01:49 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/sa-vattr.c ../mux/src/sa-vattr.c
*** ./src/sa-vattr.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/sa-vattr.c	Wed Apr 16 02:01:49 1997
***************
*** 2,8 ****
   * Standalone vattr.c 
   */
  /*
!  * $Id: sa-vattr.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #undef MEMORY_BASED
--- 2,8 ----
   * Standalone vattr.c 
   */
  /*
!  * $Id: sa-vattr.c,v 1.2 1997/04/16 06:01:49 dpassmor Exp $ 
   */
  
  #undef MEMORY_BASED
diff -c -r ./src/set.c ../mux/src/set.c
*** ./src/set.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/set.c	Wed Apr 16 02:01:50 1997
***************
*** 2,8 ****
   * set.c -- commands which set parameters 
   */
  /*
!  * $Id: set.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * set.c -- commands which set parameters 
   */
  /*
!  * $Id: set.c,v 1.2 1997/04/16 06:01:50 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 123,129 ****
  	}
  
  	if (!Wizard(player) && !(Controls(player, thing)) &&
! 	    !(check_zone_for_player(player, thing, mudconf.zone_nest_lim)) &&
  	    !(db[player].owner == db[thing].owner)) {
  		notify(player, "You don't have the power to shift reality.");
  		return;
--- 123,129 ----
  	}
  
  	if (!Wizard(player) && !(Controls(player, thing)) &&
! 	    !(check_zone_for_player(player, thing)) &&
  	    !(db[player].owner == db[thing].owner)) {
  		notify(player, "You don't have the power to shift reality.");
  		return;
diff -c -r ./src/slave.c ../mux/src/slave.c
*** ./src/slave.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/slave.c	Wed Apr 16 02:01:51 1997
***************
*** 4,10 ****
   * The philosophy is to keep this program as simple/small as possible.
   * It does normal fork()s, so the smaller it is, the faster it goes.
   * 
!  * $Id: slave.c,v 1.2 1995/11/22 23:33:17 root Exp $
   */
  
  #include "autoconf.h"
--- 4,10 ----
   * The philosophy is to keep this program as simple/small as possible.
   * It does normal fork()s, so the smaller it is, the faster it goes.
   * 
!  * $Id: slave.c,v 1.2 1997/04/16 06:01:51 dpassmor Exp $
   */
  
  #include "autoconf.h"
diff -c -r ./src/slave.h ../mux/src/slave.h
*** ./src/slave.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/slave.h	Wed Apr 16 02:01:53 1997
***************
*** 1,5 ****
  /* slave.h */
! /* $Id: slave.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  enum {
      SLAVE_IDENTQ = 'i',
--- 1,5 ----
  /* slave.h */
! /* $Id: slave.h,v 1.2 1997/04/16 06:01:53 dpassmor Exp $ */
  
  enum {
      SLAVE_IDENTQ = 'i',
diff -c -r ./src/speech.c ../mux/src/speech.c
*** ./src/speech.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/speech.c	Wed Apr 16 02:01:55 1997
***************
*** 2,8 ****
   * speech.c -- Commands which involve speaking 
   */
  /*
!  * $Id: speech.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * speech.c -- Commands which involve speaking 
   */
  /*
!  * $Id: speech.c,v 1.2 1997/04/16 06:01:55 dpassmor Exp $ 
   */
  
  #include "copyright.h"
***************
*** 803,809 ****
  			}
  			break;
  		case PEMIT_OEMIT:
! 			notify_except(Location(player), player, target, message);
  			break;
  		case PEMIT_WHISPER:
  			switch (*message) {
--- 803,809 ----
  			}
  			break;
  		case PEMIT_OEMIT:
! 			notify_except(Location(target), player, target, message);
  			break;
  		case PEMIT_WHISPER:
  			switch (*message) {
diff -c -r ./src/stringutil.c ../mux/src/stringutil.c
*** ./src/stringutil.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/stringutil.c	Wed Apr 16 02:01:56 1997
***************
*** 2,8 ****
   * stringutil.c -- string utilities 
   */
  /*
!  * $Id: stringutil.c,v 1.4 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * stringutil.c -- string utilities 
   */
  /*
!  * $Id: stringutil.c,v 1.2 1997/04/16 06:01:56 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/timer.c ../mux/src/timer.c
*** ./src/timer.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/timer.c	Wed Apr 16 02:01:57 1997
***************
*** 2,8 ****
   * timer.c -- Subroutines for (system-) timed events 
   */
  /*
!  * $Id: timer.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * timer.c -- Subroutines for (system-) timed events 
   */
  /*
!  * $Id: timer.c,v 1.2 1997/04/16 06:01:57 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/udb.h ../mux/src/udb.h
*** ./src/udb.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/udb.h	Wed Apr 16 02:01:58 1997
***************
*** 1,4 ****
! /* $Id: udb.h,v 1.1 1995/11/14 03:47:09 root Exp $ */
  
  #ifndef _UDB_H
  #define _UDB_H
--- 1,4 ----
! /* $Id: udb.h,v 1.2 1997/04/16 06:01:58 dpassmor Exp $ */
  
  #ifndef _UDB_H
  #define _UDB_H
diff -c -r ./src/udb_defs.h ../mux/src/udb_defs.h
*** ./src/udb_defs.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/udb_defs.h	Wed Apr 16 02:01:58 1997
***************
*** 4,10 ****
  	Andrew Molitor, amolitor@eagle.wesleyan.edu
  	1991
  	
! 	$Id: udb_defs.h,v 1.1 1995/11/14 03:47:09 root Exp $
  */
  
  
--- 4,10 ----
  	Andrew Molitor, amolitor@eagle.wesleyan.edu
  	1991
  	
! 	$Id: udb_defs.h,v 1.2 1997/04/16 06:01:58 dpassmor Exp $
  */
  
  
diff -c -r ./src/udb_misc.c ../mux/src/udb_misc.c
*** ./src/udb_misc.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/udb_misc.c	Wed Apr 16 02:01:59 1997
***************
*** 6,12 ****
   * 
   * Andrew Molitor, amolitor@eagle.wesleyan.edu
   * 
!  * $Id: udb_misc.c,v 1.2 1995/11/22 23:33:17 root Exp $
   */
  
  #include "autoconf.h"
--- 6,12 ----
   * 
   * Andrew Molitor, amolitor@eagle.wesleyan.edu
   * 
!  * $Id: udb_misc.c,v 1.2 1997/04/16 06:01:59 dpassmor Exp $
   */
  
  #include "autoconf.h"
diff -c -r ./src/udb_obj.c ../mux/src/udb_obj.c
*** ./src/udb_obj.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/udb_obj.c	Wed Apr 16 02:02:00 1997
***************
*** 6,12 ****
   * 
   * 1992
   * 
!  * $Id: udb_obj.c,v 1.2 1995/11/22 23:33:17 root Exp $
   */
  
  #include	"autoconf.h"
--- 6,12 ----
   * 
   * 1992
   * 
!  * $Id: udb_obj.c,v 1.2 1997/04/16 06:02:00 dpassmor Exp $
   */
  
  #include	"autoconf.h"
diff -c -r ./src/udb_ocache.c ../mux/src/udb_ocache.c
*** ./src/udb_ocache.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/udb_ocache.c	Wed Apr 16 02:02:01 1997
***************
*** 9,15 ****
   * do object-by-object, hiding the object part inside
   * the cache layer. Upper layers think it's an attribute cache.
   * 
!  * $Id: udb_ocache.c,v 1.3 1995/11/22 23:33:17 root Exp $
   */
  
  /*
--- 9,15 ----
   * do object-by-object, hiding the object part inside
   * the cache layer. Upper layers think it's an attribute cache.
   * 
!  * $Id: udb_ocache.c,v 1.2 1997/04/16 06:02:01 dpassmor Exp $
   */
  
  /*
diff -c -r ./src/udb_ochunk.c ../mux/src/udb_ochunk.c
*** ./src/udb_ochunk.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/udb_ochunk.c	Wed Apr 16 02:02:02 1997
***************
*** 1,7 ****
  /*
   * Copyright (C) 1991, Marcus J. Ranum. All rights reserved.
   * 
!  * $Id: udb_ochunk.c,v 1.2 1995/11/22 23:33:17 root Exp $
   */
  
  /*
--- 1,7 ----
  /*
   * Copyright (C) 1991, Marcus J. Ranum. All rights reserved.
   * 
!  * $Id: udb_ochunk.c,v 1.2 1997/04/16 06:02:02 dpassmor Exp $
   */
  
  /*
diff -c -r ./src/unparse.c ../mux/src/unparse.c
*** ./src/unparse.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/unparse.c	Wed Apr 16 02:02:03 1997
***************
*** 2,8 ****
   * unparse.c 
   */
  /*
!  * $Id: unparse.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * unparse.c 
   */
  /*
!  * $Id: unparse.c,v 1.2 1997/04/16 06:02:03 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/unsplit.c ../mux/src/unsplit.c
*** ./src/unsplit.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/unsplit.c	Wed Apr 16 02:02:04 1997
***************
*** 2,8 ****
   * unsplit.c -- filter for re-combining continuation lines 
   */
  /*
!  * $Id: unsplit.c,v 1.2 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * unsplit.c -- filter for re-combining continuation lines 
   */
  /*
!  * $Id: unsplit.c,v 1.2 1997/04/16 06:02:04 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/vattr.c ../mux/src/vattr.c
*** ./src/vattr.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/vattr.c	Wed Apr 16 02:02:05 1997
***************
*** 3,9 ****
   * vattr.c -- Manages the user-defined attributes. 
   */
  /*
!  * $Id: vattr.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 3,9 ----
   * vattr.c -- Manages the user-defined attributes. 
   */
  /*
!  * $Id: vattr.c,v 1.2 1997/04/16 06:02:05 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/vattr.h ../mux/src/vattr.h
*** ./src/vattr.h	Sun Apr  6 23:35:15 1997
--- ../mux/src/vattr.h	Wed Apr 16 02:02:05 1997
***************
*** 1,7 ****
  /*
   *  Definitions for user-defined attributes
   *
!  *  $Id: vattr.h,v 1.1 1995/11/14 03:47:09 root Exp $
   */
  
  #define VNAME_SIZE	32
--- 1,7 ----
  /*
   *  Definitions for user-defined attributes
   *
!  *  $Id: vattr.h,v 1.2 1997/04/16 06:02:05 dpassmor Exp $
   */
  
  #define VNAME_SIZE	32
diff -c -r ./src/version.c ../mux/src/version.c
*** ./src/version.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/version.c	Wed Apr 16 02:02:06 1997
***************
*** 2,8 ****
   * version.c - version information 
   */
  /*
!  * $Id: version.c,v 1.3 1995/11/22 23:33:17 root Exp $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * version.c - version information 
   */
  /*
!  * $Id: version.c,v 1.2 1997/04/16 06:02:06 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/walkdb.c ../mux/src/walkdb.c
*** ./src/walkdb.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/walkdb.c	Wed Apr 16 02:02:07 1997
***************
*** 2,8 ****
   * walkdb.c -- Support for commands that walk the entire db 
   */
  /*
!  * $Id: walkdb.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * walkdb.c -- Support for commands that walk the entire db 
   */
  /*
!  * $Id: walkdb.c,v 1.2 1997/04/16 06:02:07 dpassmor Exp $ 
   */
  
  #include "copyright.h"
diff -c -r ./src/wild.c ../mux/src/wild.c
*** ./src/wild.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/wild.c	Wed Apr 16 02:02:08 1997
***************
*** 11,17 ****
   * * This code is hereby placed under GNU copyleft,
   * * see copyright.h for details.
   * *
!  * * $Id: wild.c,v 1.3 1995/11/22 23:33:17 root Exp $
   */
  #include "copyright.h"
  #include "autoconf.h"
--- 11,17 ----
   * * This code is hereby placed under GNU copyleft,
   * * see copyright.h for details.
   * *
!  * * $Id: wild.c,v 1.2 1997/04/16 06:02:08 dpassmor Exp $
   */
  #include "copyright.h"
  #include "autoconf.h"
diff -c -r ./src/wiz.c ../mux/src/wiz.c
*** ./src/wiz.c	Sun Apr  6 23:35:19 1997
--- ../mux/src/wiz.c	Wed Apr 16 02:02:09 1997
***************
*** 2,8 ****
   * wiz.c -- Wizard-only commands 
   */
  /*
!  * $Id: wiz.c,v 1.4 1995/12/03 09:18:32 root Exp root $ 
   */
  
  #include "copyright.h"
--- 2,8 ----
   * wiz.c -- Wizard-only commands 
   */
  /*
!  * $Id: wiz.c,v 1.2 1997/04/16 06:02:09 dpassmor Exp $ 
   */
  
  #include "copyright.h"