Changeset 441

Timestamp:

08/13/06 00:10:18 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p21 Archival

Files:

• 1.7.7/CHANGES.176 (modified) (1 diff)
• 1.7.7/CHANGES.177 (modified) (1 diff)
• 1.7.7/MANIFEST (modified) (4 diffs)
• 1.7.7/Makefile.SH (modified) (2 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/alias.cnf (modified) (1 diff)
• 1.7.7/game/data/README (added)
• 1.7.7/game/mushcnf.dst (modified) (1 diff)
• 1.7.7/game/restart (modified) (1 diff)
• 1.7.7/game/txt/compose.sh.SH (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennattr.hlp (added)
• 1.7.7/game/txt/hlp/pennchat.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (5 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (4 diffs)
• 1.7.7/game/txt/hlp/pennv176.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennv177.hlp (modified) (2 diffs)
• 1.7.7/game/txt/hlp/pennvOLD.hlp (modified) (1 diff)
• 1.7.7/game/txt/index-files.pl (modified) (1 diff)
• 1.7.7/hdrs/attrib.h (modified) (4 diffs)
• 1.7.7/hdrs/conf.h (modified) (1 diff)
• 1.7.7/hdrs/extchat.h (modified) (4 diffs)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/flags.h (modified) (1 diff)
• 1.7.7/hdrs/lock.h (modified) (2 diffs)
• 1.7.7/hdrs/mushdb.h (modified) (2 diffs)
• 1.7.7/hdrs/mushtype.h (modified) (1 diff)
• 1.7.7/hdrs/switches.h (modified) (1 diff)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/SWITCHES (modified) (1 diff)
• 1.7.7/src/attrib.c (modified) (20 diffs)
• 1.7.7/src/bsd.c (modified) (2 diffs)
• 1.7.7/src/cmds.c (modified) (2 diffs)
• 1.7.7/src/command.c (modified) (2 diffs)
• 1.7.7/src/cque.c (modified) (1 diff)
• 1.7.7/src/destroy.c (modified) (2 diffs)
• 1.7.7/src/extchat.c (modified) (29 diffs)
• 1.7.7/src/filecopy.c (modified) (1 diff)
• 1.7.7/src/flags.c (modified) (3 diffs)
• 1.7.7/src/function.c (modified) (1 diff)
• 1.7.7/src/fundb.c (modified) (4 diffs)
• 1.7.7/src/funlist.c (modified) (2 diffs)
• 1.7.7/src/funmisc.c (modified) (1 diff)
• 1.7.7/src/help.c (modified) (8 diffs)
• 1.7.7/src/ident.c (modified) (1 diff)
• 1.7.7/src/lock.c (modified) (5 diffs)
• 1.7.7/src/look.c (modified) (9 diffs)
• 1.7.7/src/move.c (modified) (6 diffs)
• 1.7.7/src/notify.c (modified) (2 diffs)
• 1.7.7/src/predicat.c (modified) (2 diffs)
• 1.7.7/src/set.c (modified) (4 diffs)
• 1.7.7/src/switchinc.c (modified) (1 diff)
• 1.7.7/src/utils.c (modified) (2 diffs)
• 1.7.7/src/wild.c (modified) (1 diff)
• 1.7.7/src/wiz.c (modified) (1 diff)
• 1.7.7/test/testatree.pl (modified) (3 diffs)
• 1.7.7/test/testrand.pl (added)
• 1.7.7/utils/mkcmds.sh.SH (modified) (2 diffs)
• 1.7.7/utils/penn-install (added)
• 1.7.7/win32/funs.h (modified) (1 diff)

1.7.7/CHANGES.176

@@ -13 +13 @@
-
-==========================================================================
+
+Version 1.7.6 patchlevel 14                     September 23, 2003
+
+Fixes:
+   * Fix to help @search2 by LeeLaLimaLLama@M*U*S*H.
+   * The max file descriptor could get stomped in some cases. [SW]
+   * Powers and toggles on destroyed objects are reset, as they 
+     caused anomalous lsearch/haspower behavior. Report by Mordie@M*U*S*H.
+   * Changing channel privs and loading channels with objects no longer
+     permitted could cause crashes. Report by Septimus@SW RP Forum.
+
-
-Version 1.7.6 patchlevel 13                     August 11, 2003

1.7.7/CHANGES.177

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 21                     September 23, 2003
+
+Major Changes:
+  * Attribute trees. Attributes may now be organized hierarchically
+    like files and directories in a filesystem, using the backtick (`)
+    character as the branch separator. Attribute access restrictions
+    propagate down trees. New wildcard ** is introduced to match
+    all attributes at all tree levels. Suggested by Tabbifli. [TAP]
+Locks:
+  * New framework for performing lock failure activities in hardcode.
+    As a proof-of-concept, the attributes FOLLOW_LOCK`FAILURE,
+    FOLLOW_LOCK`OFAILURE, FOLLOW_LOCK`AFAILURE do what you'd expect
+    when set on a potential leader.  Suggested by Sholevi@M*U*S*H.
+Channels:
+  * New per-channel flags NoTitles, NoNames, and NoCemit do what you'd
+    expect. Set them with @chan/privs. Based on suggestion by 
+    Saturn@M3.
+  * @chan/recall/quiet omits timestamps. Suggested by Vadiv@M*U*S*H.
+Commands:
+  * 'help <wildcard-pattern>' now lists all help topics that match that 
+    pattern.  By popular request. [MUX,SW] 
+  * @flag/letter can be used to change or clear the one-letter alias for a 
+    flag.  Suggested by Nymeria@M*U*S*H. [SW]
+  * @flag/list by God notes disabled flags. Suggested by Nymeria@M*U*S*H. [SW]
+Functions:
+  * rand() now comes in a two-argument (low,high) flavor, and randword()
+    selects a random word from a list. The latter is aliased to
+    pickrand() to match Mux's name. Patch by Luke@M*U*S*H.
+Minor Changes:
+  * Although we're Pueblo 2.50 compliant, go back to sending Pueblo 1.10
+    as the server version until everyone upgrades their clients so
+    they can handle the 2.50 string. Suggested by Shirow.
+  * The locate() function is no longer noisy (no longer notifies
+    the executor in addition to returning a value). Suggested by
+    Mystery8@ST:AW. 
+  * @lock/interact now has a higher priority than other interaction
+    checks, so it will work for Wizards. Suggested by Viila@M*U*S*H.
+  * Tweaks to facilitate a Debian package of PennMUSH. [EEH]
+Fixes:
+  * max descriptor could get stomped in some cases. [SW]
+  * Removed extra struct def in hdrs/mushtype.h. Suggested by Kyle.
+  * Help tweak by Kevin@M*U*S*H.
+  * Fix to locks on players messing up their connection failure counts.
+    Reported by Luke@M*U*S*H.
+  * Fix to @entrances by Luke@M*U*S*H.
+  * Fix to Win32 not handling a missing minimal.db by Luke@M*U*S*H.
+  * The confirmation message for setting/clearing attribute flags would use
+    the flag name given as an argument, not neccessarily the the full name of
+    the flag. Reported by Vadiv@M*U*S*H.  [SW]
+  * Fix a potential memory leak in ident.c [SW]
-
-Version 1.7.7 patchlevel 20                     September 4, 2003

1.7.7/MANIFEST

@@ -159 +159 @@
-utils/mkcmds.sh.SH
-utils/mkvershlp.pl
+utils/penn-install
-utils/update-cnf.pl
-utils/update.pl
@@ -170 +171 @@
-game/names.cnf
-game/restart
+game/data/README
-game/log/README
-game/save/README
@@ -188 +190 @@
-game/txt/evt/pennmush.evt
-game/txt/hlp/index.hlp
+game/txt/hlp/pennattr.hlp
-game/txt/hlp/pennchat.hlp
-game/txt/hlp/pennconf.hlp
@@ -236 +239 @@
-test/testatree.pl
-test/testhastype.pl
+test/testrand.pl

1.7.7/Makefile.SH

@@ -60 +60 @@
-GLOBAL_INSTALL=/usr/libexec/pennmush
-
+# Where to install with 'make debianinstall'
+DEB_INSTALL=$(DESTDIR)/usr/share/games/pennmush/game
+DEB_BIN=$(DESTDIR)/usr/games
+
-all: config.h options.h autogen game/mush.cnf
-    @echo "Making all in src."
@@ -258 +262 @@
-    @echo "** or symlink that to somewhere easier to run. You may wish to strip them."
-
+debianinstall: install
+    (cd game/txt; make clean compose.sh)
+    $(INSTALLDIR) $(DEB_INSTALL)
+    $(CP) -R game/* $(DEB_INSTALL)
+    -rm -f $(DEB_INSTALL)/netmush $(DEB_INSTALL)/info_slave
+    $(INSTALL) config.sh $(DEB_INSTALL)/config.sh
+    $(INSTALL) src/netmud $(DEB_INSTALL)/netmush
+    $(INSTALL) src/info_slave $(DEB_INSTALL)/info_slave
+    $(INSTALL) utils/penn-install $(DEB_BIN)/penn-install
+    $(CHMOD) a+rX -R $(DEB_INSTALL)
+    $(CHMOD) a+rX $(DEB_BIN)/penn-install
+    @echo "** Files installed in $(DEB_INSTALL)."
+    @echo "** You can run penn-install to create a user directory."
+
-!NO!SUBS!
-chmod 755 Makefile

1.7.7/Patchlevel

@@ -1 +1 @@
-Do not edit this file. It is maintained by the official PennMUSH patches.
-0
+1

1.7.7/game/alias.cnf

@@ -47 +47 @@
-function_alias modulo mod
-function_alias modulo modulus
+function_alias randword pickrand
-
-# For rhost compatibility

1.7.7/game/mushcnf.dst

@@ -77 +77 @@
-#compress_suffix .bz2
-#
-compress
-uncompress
-Z
+gzip
+gunzip
+gz
-
-# Room where new players are created.

1.7.7/game/restart

@@ -27 +27 @@
-if [ ! -f $CONF_FILE ]; then
-  echo "CONF_FILE doesn't exist. It's: $CONF_FILE"
+  echo "Create $CONF_FILE from $GAMEDIR/mushcnf.dst"
-  exit 1
-fi

1.7.7/game/txt/compose.sh.SH

@@ +1 @@
+#!/bin/sh
-case $CONFIG in
-'')

1.7.7/game/txt/hlp/pennchat.hlp

@@ -127 +127 @@
-  * "open" - you may speak even if you aren't listening to the channel
-  * "hide_ok" - you may hide from the channel who list.
+  * "notitles" - chantitles are not displayed in channel messages.
+  * "nonames" - player names are not displayed in channel messages.
+  * "nocemit" - @cemit is prohibited on the channel.
-  Specifications may be combined, space-separated. Default is "player"
-
@@ -143 +146 @@
-  @channel/chown <channel> = <new owner>
-
-
+
+
-  The "quiet" switch turns the quiet status of a channel on and off.
-  The "wipe" switch clears a channel of players without deleting it.

1.7.7/game/txt/hlp/penncmd.hlp

@@ -1292 +1292 @@
-  @flag/delete <flag name>
-  @flag/alias <flag name>=<alias>
+  @flag/letter <flag name>[=<letter>]
-  @flag/restrict <flag name>=[<setperms>], [<unsetperms>]
-  @flag/enable <flag name>
@@ -1306 +1307 @@
-    /enable re-enables a disabled flag
-    /alias adds a new alias for an existing flag
+    /letter changes or removes a single-letter alias for an existing flag.
-    /restrict changes flag permissions (see help @flag2)
-    /delete deletes a flag completely, removing it from all objects
@@ -2765 +2767 @@
-                    this attribute will be matched down to its unique
-                    prefixes. This flag is primarily used internally.
+  `                 This attribute is a branch. See: help ATTRIBUTE TREES
-& @sex
-  @sex <player> = <gender>  
@@ -3457 +3460 @@
-  name of the object's owner.  May be abbreviated 'ex <object>'.  If the 
-  attribute parameter is given, you will only see that attribute (good 
-
-
-
+
+
+
+
+
+
-  
-  The /brief switch is equivalent to the 'brief' command.
@@ -3468 +3474 @@
-    ignores the object's VISUAL flag (but not its attribute flags)
-  The /all switch shows the values of VEILED attributes.
+
+  See also: ATTRIBUTE TREES
-& follow
-  follow <object>

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -1360 +1360 @@
-  These functions return a list of attributes on <object> containing
-  <pattern> (or matching <regexp>).  <attrs> is a wildcard pattern for
-; if you want to search all attributes, use "*"
+
-
-  The list returned is similar to that returned by @grep/list
@@ -1691 +1691 @@
-  
-  If a wildcarded attribute pattern is provided, only attribute names
-
-
-
+
+
+
+
-& NATTR()
-& ATTRCNT()
@@ -2633 +2634 @@
-& RAND()
-  rand(<num>)
-
-
+
+
+
+
+
+
+
-  If called with an invalid argument, rand() returns an error message
-  beginning with #-1.
+& RANDWORD()
+& PICKRAND()
+  randword(<list>[, <delim>])
+  
+  Returns a randomly selected element from <list>. <delim> is the list
+  delimiter: if not specified, whitespace delimits the list.
+  
+  pickrand() may be an alias for randword() on some servers.
-& REGEDIT()
-& REGEDITALL()

1.7.7/game/txt/hlp/penntop.hlp

@@ -7 +7 @@
-  For the list of MUSH topics, type:              help topics
-  For an alphabetical list of all help entries:   help entries 
+  For a list of entries that match a pattern:     help <wildcard>
-  For information about PennMUSH:                 help code
-  
@@ -228 +229 @@
-
-  To see the attributes that are set on you or on any of the objects you own,
-
-
-
-
+
-  
-(continued in help attributes4)
@@ -251 +249 @@
-
-  See also: ATTRIB-OWNERSHIP, @set, examine, @atrchown, @atrlock, hasattr()
-
+
+
-& BEING KILLED
- 
@@ -867 +866 @@
-  independent of object ownership. 
-  
-
+
+
-& PARENT
-& PARENTS

1.7.7/game/txt/hlp/pennv176.hlp

@@ +1 @@
+& 1.7.6p14
+Version 1.7.6 patchlevel 14                     September 23, 2003
+
+Fixes:
+   * Fix to help @search2 by LeeLaLimaLLama@M*U*S*H.
+   * The max file descriptor could get stomped in some cases. [SW]
+   * Powers and toggles on destroyed objects are reset, as they 
+     caused anomalous lsearch/haspower behavior. Report by Mordie@M*U*S*H.
+   * Changing channel privs and loading channels with objects no longer
+     permitted could cause crashes. Report by Septimus@SW RP Forum.
+
+
-& 1.7.6p13
-Version 1.7.6 patchlevel 13                     August 11, 2003

1.7.7/game/txt/hlp/pennv177.hlp

@@ -1 @@
-0
+1
-& changes
-This is a list of changes in this patchlevel which are probably of
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 21                     September 23, 2003
+
+Major Changes:
+  * Attribute trees. Attributes may now be organized hierarchically
+    like files and directories in a filesystem, using the backtick (`)
+    character as the branch separator. Attribute access restrictions
+    propagate down trees. New wildcard ** is introduced to match
+    all attributes at all tree levels. Suggested by Tabbifli. [TAP]
+Locks:
+  * New framework for performing lock failure activities in hardcode.
+    As a proof-of-concept, the attributes FOLLOW_LOCK`FAILURE,
+    FOLLOW_LOCK`OFAILURE, FOLLOW_LOCK`AFAILURE do what you'd expect
+    when set on a potential leader.  Suggested by Sholevi@M*U*S*H.
+Channels:
+  * New per-channel flags NoTitles, NoNames, and NoCemit do what you'd
+    expect. Set them with @chan/privs. Based on suggestion by 
+    Saturn@M3.
+  * @chan/recall/quiet omits timestamps. Suggested by Vadiv@M*U*S*H.
+Commands:
+  * 'help <wildcard-pattern>' now lists all help topics that match that 
+    pattern.  By popular request. [MUX,SW] 
+  * @flag/letter can be used to change or clear the one-letter alias for a 
+    flag.  Suggested by Nymeria@M*U*S*H. [SW]
+  * @flag/list by God notes disabled flags. Suggested by Nymeria@M*U*S*H. [SW]
+Functions:
+  * rand() now comes in a two-argument (low,high) flavor, and randword()
+    selects a random word from a list. The latter is aliased to
+    pickrand() to match Mux's name. Patch by Luke@M*U*S*H.
+Minor Changes:
+  * Although we're Pueblo 2.50 compliant, go back to sending Pueblo 1.10
+    as the server version until everyone upgrades their clients so
+    they can handle the 2.50 string. Suggested by Shirow.
+  * The locate() function is no longer noisy (no longer notifies
+    the executor in addition to returning a value). Suggested by
+    Mystery8@ST:AW. 
+  * @lock/interact now has a higher priority than other interaction
+    checks, so it will work for Wizards. Suggested by Viila@M*U*S*H.
+  * Tweaks to facilitate a Debian package of PennMUSH. [EEH]
+Fixes:
+  * max descriptor could get stomped in some cases. [SW]
+  * Removed extra struct def in hdrs/mushtype.h. Suggested by Kyle.
+  * Help tweak by Kevin@M*U*S*H.
+  * Fix to locks on players messing up their connection failure counts.
+    Reported by Luke@M*U*S*H.
+  * Fix to @entrances by Luke@M*U*S*H.
+  * Fix to Win32 not handling a missing minimal.db by Luke@M*U*S*H.
+  * The confirmation message for setting/clearing attribute flags would use
+    the flag name given as an argument, not neccessarily the the full name of
+    the flag. Reported by Vadiv@M*U*S*H.  [SW]
+  * Fix a potential memory leak in ident.c [SW]
+
+& 1.7.7p20
-Version 1.7.7 patchlevel 20                     September 4, 2003
-

1.7.7/game/txt/hlp/pennvOLD.hlp

@@ -4419 +4419 @@
-
-1.7.7: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-
-
+, 21
+, 14
-1.7.5: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12
-1.7.4: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,

1.7.7/game/txt/index-files.pl

@@ -1 @@
-local/
+
-#
-# index-files.pl - make an & index topic for events/news/help

1.7.7/hdrs/attrib.h

@@ -31 +31 @@
-extern int good_atr_name(char const *s);
-extern ATTR *atr_match(char const *string);
+extern ATTR *atr_sub_branch(ATTR *branch);
-extern void atr_new_add(dbref thing, char const *RESTRICT atr,
-            char const *RESTRICT s, dbref player, int flags,
@@ -41 +42 @@
-typedef int (*aig_func) (dbref, dbref, const char *, ATTR *, void *);
-extern int atr_iter_get(dbref player, dbref thing, char const *name,
-
-
-
+
-extern ATTR *atr_complete_match(dbref player, char const *atr, dbref privs);
-extern void atr_free(dbref thing);
@@ -58 +57 @@
-extern void do_atrchown(dbref player, char const *arg1, char const *arg2);
-extern int string_to_atrflag(dbref player, const char *p);
+extern const char *atrflag_to_string(int mask);
-extern void init_atr_name_tree(void);
+
+extern int can_read_attr_internal(dbref player, dbref obj, ATTR *attr);
+extern int can_write_attr_internal(dbref player, dbref obj, ATTR *attr,
+                   int safe);
-extern unsigned const char *atr_get_compressed_data(ATTR *atr);
-extern char *atr_value(ATTR *atr);
@@ -90 +94 @@
-    extern ATTR attr[];
-
+/* external @wipe indicator (changes atr_clr() behaviour) */
+    extern int we_are_wiping;
+
-#define AL_ATTR(alist)          (alist)
-#define AL_NAME(alist)          ((alist)->name)

1.7.7/hdrs/conf.h

@@ -54 +54 @@
-/* These CAN be modified, but it's heavily NOT suggested */
-#define PUEBLO_SEND "</xch_mudtext><img xch_mode=purehtml><xch_page clear=text>\n"
-2.5
+1.1
-
-

1.7.7/hdrs/extchat.h

@@ -135 +135 @@
-#define CHANNEL_CANHIDE 0x40    /* Can non-DARK Wizards hide here? */
-#define CHANNEL_OPEN    0x80    /* Can you speak if you're not joined? */
+#define CHANNEL_NOTITLES 0x100  /* Don't show titles of speakers */
+#define CHANNEL_NONAMES 0x200   /* Don't show names of speakers */
+#define CHANNEL_NOCEMIT 0x400   /* Disallow @cemit */
-#define CHANNEL_DEFAULT_FLAGS   (CHANNEL_PLAYER)
-#define CL_JOIN 0x1
@@ -172 +175 @@
-#define Channel_Admin(c) (ChanType(c) & CHANNEL_ADMIN)
-#define Channel_CanHide(c) (ChanType(c) & CHANNEL_CANHIDE)
+#define Channel_NoTitles(c) (ChanType(c) & CHANNEL_NOTITLES)
+#define Channel_NoNames(c) (ChanType(c) & CHANNEL_NONAMES)
+#define Channel_NoCemit(c) (ChanType(c) & CHANNEL_NOCEMIT)
-#define Chan_Ok_Type(c,o) \
-        ((IsPlayer(o) && Channel_Player(c)) || \
@@ -187 +193 @@
-     (Chan_Can_Access(c,p) && \
-     (eval_boolexp(p,ChanSpeakLock(c),p)))
+#define Chan_Can_Cemit(c,p) \
+     (!Channel_NoCemit(c) && Chan_Can_Speak(c,p))
-#define Chan_Can_Modify(c,p) \
-     (Wizard(p) || (ChanCreator(c) == (p)) || \
@@ -228 +236 @@
-extern void do_chan_desc(dbref player, const char *name, const char *title);
-extern void do_chan_title(dbref player, const char *name, const char *title);
-
+
+
-extern void do_chan_buffer(dbref player, const char *name, const char *lines);
-extern void init_chat(void);

1.7.7/hdrs/externs.h

@@ -465 +465 @@
-                   int cs);
-    extern int quick_wild(const char *RESTRICT tsr, const char *RESTRICT dstr);
+    extern int atr_wild(const char *RESTRICT tstr, const char *RESTRICT dstr);
-#define regexp_match(s,d) regexp_match_case(s,d,1)
-#define wild_match(s,d) wild_match_case(s,d,0)

1.7.7/hdrs/flags.h

@@ -123 +123 @@
-                 char *args_right[]);
-extern void do_flag_add(dbref player, const char *name, char *args_right[]);
-
+
-
-#define twiddle_flag_bitmask(bm,b,neg) (neg ? clear_flag_bitmask(bm,b) : \

1.7.7/hdrs/lock.h

@@ -31 +31 @@
-
-/* Our table of lock types, attributes, and default flags */
-info LOCK
+msg_info LOCKMSG
-/** A lock.
- * This structure represents a lock in the table of lock types
- */
-
+msg_
-  lock_type type;       /**< Type of lock */
-  const char *succbase;     /**< Base name of success attribute */
-  const char *failbase;     /**< Base name of failure attribute */
-  int flags;            /**< Default flags */
-};
-
@@ -62 +61 @@
-void free_locks(lock_list *ll);
-int eval_lock(dbref player, dbref thing, lock_type ltype);
+void fail_lock(dbref player, dbref thing, lock_type ltype, const char *def,
+           dbref loc);
-void do_unlock(dbref player, const char *name, lock_type type);
-void do_lock(dbref player, const char *name, const char *keyname,

1.7.7/hdrs/mushdb.h

@@ -86 +86 @@
-#define Can_Read_Attr(p,x,a)   \
-   (!((a)->flags & AF_INTERNAL) && \
-
-
-
-
-
+
-
-/* can anyone access attribute a on object x? */
-#define Is_Visible_Attr(x,a)   \
-   (!((a)->flags & AF_INTERNAL) && \
-
-
+
-
-/* can p write attribute a on object x, assuming p may modify x? 
@@ -104 +99 @@
- */
-#define Can_Write_Attr(p,x,a)  \
-
-
-
-
-
-
-
+
-#define Can_Write_Attr_Ignore_Safe(p,x,a)  \
-
-
-
-
-
-
+
-
-

1.7.7/hdrs/mushtype.h

@@ -32 +32 @@
-
-/* Boolexps and locks */
-struct boolexp;
-typedef const char *lock_type;
-typedef struct lock_list lock_list;

1.7.7/hdrs/switches.h

@@ -61 +61 @@
-#define SWITCH_IPRINT 60
-#define SWITCH_JOIN 61
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

1.7.7/hdrs/version.h

@@ -1 @@
-0 [09/04
-0
-0
+1 [09/23
+1
+1

1.7.7/src/SWITCHES

@@ -60 +60 @@
-IPRINT
-JOIN
+LETTER
-LIST
-LOWERCASE

1.7.7/src/attrib.c

@@ -47 +47 @@
-extern PRIV attr_privs[];
-
+/** A flag to show if we're in the middle of a @wipe (this changes
+ * behaviour for atr_clr()).  Yes, this is gross and ugly, but it
+ * seemed like a better idea than propogating a signature changes
+ * for atr_clr() and do_set_atr() through the entire codebase.  If
+ * you come up with a better way, PLEASE fix this...
+ */
+int we_are_wiping;
+
+/** A string to hold the name of a missing prefix branch, set by
+ * can_write_attr_internal.  Again, gross and ugly.  Please fix.
+ */
+static char missing_name[ATTRIBUTE_NAME_LIMIT + 1];
+
-/*======================================================================*/
-
@@ -80 +93 @@
- * A good attribute name is at least one character long, no more than
- * ATTRIBUTE_NAME_LIMIT characters long, and every character is a 
-
+
+
- * \param s a string to test for validity as an attribute name.
- */
@@ -90 +104 @@
-  if (!s || !*s)
-    return 0;
+  if (*s == '`')
+    return 0;
+  if (strstr(s, "``"))
+    return 0;
-  for (a = (const unsigned char *) s; *a; a++, len++)
-    if (!atr_name_table[*a])
-      return 0;
+  if (*(s + len - 1) == '`')
+    return 0;
-  return len <= ATTRIBUTE_NAME_LIMIT;
-}
@@ -104 +124 @@
-{
-  return aname_hash_lookup(string);
+}
+
+/** Find the first attribute branching off the specified attribute.
+ * \param branch the attribute to look under
+ */
+ATTR *
+atr_sub_branch(ATTR *branch)
+{
+  char const *name, *n2;
+  size_t len;
+
+  name = AL_NAME(branch);
+  len = strlen(name);
+  for (branch = AL_NEXT(branch); branch; branch = AL_NEXT(branch)) {
+    n2 = AL_NAME(branch);
+    if (strlen(n2) <= len)
+      return NULL;
+    if (n2[len] == '`') {
+      if (!strncmp(n2, name, len))
+    return branch;
+      else
+    return NULL;
+    }
+  }
+  return NULL;
-}
-
@@ -126 +171 @@
-    return -1;
-  return f;
+}
+
+/** Convert an attribute flag bitmask into a list of the full
+ * names of the flags.
+ * \param flags the attribute flags to display.
+ * \return a pointer to a static buffer with the full names of the flags.
+ */
+const char *
+atrflag_to_string(int mask)
+{
+  return privs_to_string(attr_privs, mask);
-}
-
@@ -334 +390 @@
-/** Remove an attribute from an object.
- * This function clears an attribute from an object. 
+ * Permission is denied if the attribute is a branch, not a leaf.
- * \param thing object to clear attribute from.
- * \param atr name of attribute to remove.
@@ -341 +398 @@
-atr_clr(dbref thing, char const *atr, dbref player)
-{
-
+, *sub
-  int comp = 0;
+  size_t len;
-
-  prev = &List(thing);
@@ -359 +417 @@
-    return -1;
-
+  len = strlen(AL_NAME(ptr));
+  sub = atr_sub_branch(ptr);
+  if (!we_are_wiping && sub)
+    return -1;
+
-  if (!IsPlayer(thing) && !(AL_FLAGS(ptr) & AF_NODUMP))
-    ModTime(thing) = mudtime;
@@ -372 +435 @@
-  atr_free_list = ptr;
-  AttrCount(thing)--;
+
+  if (we_are_wiping && sub) {