Changeset 407

Timestamp:

08/12/06 16:52:53 (2 years ago)

Author:

pennmush

Message:

PennMUSH 1.7.7p4 Archival

Files:

• 1.7.7/CHANGES (modified) (1 diff)
• 1.7.7/Makefile.SH (modified) (3 diffs)
• 1.7.7/Patchlevel (modified) (1 diff)
• 1.7.7/game/mushcnf.dst (modified) (2 diffs)
• 1.7.7/game/txt/hlp/penncmd.hlp (modified) (3 diffs)
• 1.7.7/game/txt/hlp/pennfunc.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/penntop.hlp (modified) (1 diff)
• 1.7.7/game/txt/hlp/pennvers.hlp (modified) (4 diffs)
• 1.7.7/hdrs/conf.h (modified) (2 diffs)
• 1.7.7/hdrs/externs.h (modified) (1 diff)
• 1.7.7/hdrs/function.h (modified) (3 diffs)
• 1.7.7/hdrs/game.h (modified) (1 diff)
• 1.7.7/hdrs/lock.h (modified) (5 diffs)
• 1.7.7/hdrs/version.h (modified) (1 diff)
• 1.7.7/src/Makefile (modified) (1 diff)
• 1.7.7/src/bsd.c (modified) (2 diffs)
• 1.7.7/src/conf.c (modified) (2 diffs)
• 1.7.7/src/db.c (modified) (2 diffs)
• 1.7.7/src/extmail.c (modified) (2 diffs)
• 1.7.7/src/flags.c (modified) (6 diffs)
• 1.7.7/src/function.c (modified) (12 diffs)
• 1.7.7/src/game.c (modified) (4 diffs)
• 1.7.7/src/lock.c (modified) (1 diff)
• 1.7.7/src/log.c (modified) (1 diff)
• 1.7.7/src/look.c (modified) (1 diff)
• 1.7.7/src/match.c (modified) (18 diffs)
• 1.7.7/src/move.c (modified) (36 diffs)
• 1.7.7/src/player.c (modified) (1 diff)
• 1.7.7/src/rob.c (modified) (2 diffs)
• 1.7.7/src/set.c (modified) (1 diff)
• 1.7.7/src/unparse.c (modified) (2 diffs)
• 1.7.7/src/wild.c (modified) (3 diffs)
• 1.7.7/src/wiz.c (modified) (2 diffs)
• 1.7.7/utils/mkcmds.sh.SH (modified) (6 diffs)

1.7.7/CHANGES

@@ -18 +18 @@
-
-==========================================================================
+
+Version 1.7.7 patchlevel 4                      January 2, 2003
+
+Minor Changes:
+  * When room_connects is on, @aconnect and @adisconnect also 
+    functions on things when players (dis)connect inside them. 
+    Suggested by Philip Mak. [SW]
+  * Parser-enforced argument counts for user-defined @functions,
+    as an option to @function.
+Config:
+  * New mush.cnf option max_global_fns allows increasing the number
+    of @functions allowed without editing source code. If you change
+    this, you should reboot the MUSH or bad things can happen.
+    Suggested by hilikiradi@Dardalani.
+Fixes:
+  * mkcmds.sh doesn't always regenerate every file, only what's
+    needed. Speeds up compiles. Suggested by Philip Mak. [SW]
+  * Fixes from 1.7.6p4.
+
-
-Version 1.7.7 patchlevel 3                      December 25, 2002

1.7.7/Makefile.SH

@@ -61 +61 @@
-    (cd src; make all "CC=$(CC)" "CCFLAGS=$(CCFLAGS)" \
-    "LDFLAGS=$(LDFLAGS)" "CLIBS=$(CLIBS)" "MAKE=$(MAKE)" \
-; rm -f ../hdrs/timestamp
+
-    @echo "If the make was successful, use 'make install' to install links."
-
@@ -75 +75 @@
-
-hdrs/cmds.h: src/cmds.c src/command.c src/cque.c src/help.c src/set.c
-
+ commands
-
-hdrs/switches.h: src/SWITCHES
-
-
-
-   (cd utils; sh mkcmds.sh
-
-
-
+ switches
+
+
+#  (cd utils; sh mkcmds.sh switches
+
+ src/bsd.c src/conf.c src/extmail.c src/help.c src/wiz.c
+ functions
-
-hdrs/patches.h: patches/*
-
+ patches
-
-install: localized all
@@ -223 +223 @@
-
-dist.tar: distclean versions
-    -rm -f hdrs/timestamp
-    (cd utils; sh mkcmds.sh)
-    makedist -c pennmush

1.7.7/Patchlevel

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

1.7.7/game/mushcnf.dst

@@ -189 +189 @@
-# What's the max chain length of indirect locks allowed?
-max_depth 10
+
+# How many @functions can we have? If you change this without # doing a
+# shutdown (or shutdown/reboot) immediately thereafter, you'll very likely
+# crash your MUSH, so don't do that.
+max_global_fns 50
-
-# How much does it cost a mortal to create a channel?
@@ -410 +415 @@
-global_connects yes
-
-
+
+
-room_connects no
-

1.7.7/game/txt/hlp/penncmd.hlp

@@ -1255 +1255 @@
-& @function
-  @function [<function name>]
-
+[,<min args>, <max args>]
-    or @function <function name>=<object>/<attribute>
-  @function/<switch> <function name>
@@ -1286 +1286 @@
-  Functions defined via @function should follow the format used by
-  UFUN() - %0 is the first argument passed, %1 is the second argument
-
+
+
-  
-  Example:
@@ -1325 +1326 @@
-  @function/delete ansi
-  &ansi_fun #1234=%0
-
+, 2, 2
-
- will create a new version of ansi() that doesn't do any
-
+
+
-
-See also: RESTRICT, FUNCTIONS, @startup

1.7.7/game/txt/hlp/pennfunc.hlp

@@ -1825 +1825 @@
-    F   -   Return #-1 if what's found is of a different type than the
-            preferred one.
-
+  
-            ambiguous.
-  If you specify more than one type, the last one will be preferred. Unless

1.7.7/game/txt/hlp/penntop.hlp

@@ -1783 +1783 @@
-    * my <obj> - an object you're carrying
-    * this <obj> - an object in your location (also: this here <obj>)
+    * toward <exit> - an exit in your location
-    * 1st, 2nd, etc. <obj> - one of a set of objects with the same names.
-      Objects are ordered in the order in which they're listed in your
- or room contents
-
+, room contents, and exit list (in that order)
+)
-& &HELP
-This is the AHELP index.

1.7.7/game/txt/hlp/pennvers.hlp

@@ -1 +1 @@
-& changes
-3
+4
-This is a list of changes in this patchlevel which are probably of
-interest to players. More information about new commands and functions
@@ -12 +12 @@
-be read in 'help patchlevels'.
-
+Version 1.7.7 patchlevel 4                      January 2, 2003
+
+Minor Changes:
+  * When room_connects is on, @aconnect and @adisconnect also 
+    functions on things when players (dis)connect inside them. 
+    Suggested by Philip Mak. [SW]
+  * Parser-enforced argument counts for user-defined @functions,
+    as an option to @function.
+Config:
+  * New mush.cnf option max_global_fns allows increasing the number
+    of @functions allowed without editing source code. If you change
+    this, you should reboot the MUSH or bad things can happen.
+    Suggested by hilikiradi@Dardalani.
+Fixes:
+  * mkcmds.sh doesn't always regenerate every file, only what's
+    needed. Speeds up compiles. Suggested by Philip Mak. [SW]
+  * Fixes from 1.7.6p4.
+
+
+& 1.7.7p3
-Version 1.7.7 patchlevel 3                      December 25, 2002
-
@@ -581 +601 @@
-  * Indentation fixes [SW]
-  * Fixes up to 1.7.4p12 merged in.
+
+& 1.7.6p4
+Version 1.7.6 patchlevel 4                      January 2, 2003
+
+Minor Changes:
+   * English-style matching now applies to exits in the room
+     (so '1st down' can match the first 'down' exit if you're not carrying
+     anything that matches 'down'). New english-style matching adjective
+     'toward' restricts the match to exits (so: 'look toward 1st down').
+Fixes:
+   * Code cleanup to fix several potential buffer overflows.
+   * The wildcard matcher had problems with backslash escapes in
+     some cases, making matching a : in a $command very hard.
+     Reported by Wayne@PDX.
+   * @chzone could cause crashes on some systems.  Reported by Wayne@PDX.
+   * When two exits match, one is no longer chosen at random.
+     Instead, the ambiguity should be reported as an error.
+     Reported by Intrevis@M*U*S*H.
+   * The dbref returned by locate when given the X parameter is
+     no longer random, but the last one found (as per the help).
+   * Serious bug in reading locks from the db on startup corrected.
+   * The profiling timer is turned off duing dumps, as some systems
+     (FreeBSD?) appear to continue to use it and interrupt dumps
+     due to cpu limiting. Reported by Nathan Schuette.
+
-
-& 1.7.6p3
@@ -5885 +5930 @@
-type 'help <version>p<patchlevel>'. For example, 'help 1.7.2p3'
-
-
-
+, 4
+, 4
-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/hdrs/conf.h

@@ -221 +221 @@
-  int queue_entry_cpu_time;
-  int ascii_names;
+  int max_global_fns;
-};
-
@@ -347 +348 @@
-#define NEWLINE_ONE_CHAR (options.newline_one_char)
-#define ONLY_ASCII_NAMES (options.ascii_names)
-
+
-
-/* Compiler-specific stuff. */

1.7.7/hdrs/externs.h

@@ -179 +179 @@
-extern void moveto(dbref what, dbref where);
-extern void safe_tel(dbref player, dbref dest, int nomovemsgs);
-dbref
-dbref
+int
+int
-extern void move_wrapper(dbref player, const char *command);
-extern void do_follow(dbref player, const char *arg);

1.7.7/hdrs/function.h

@@ -31 +31 @@
-
-
-/* Number of user @functions */
-#define MAX_GLOBAL_FNS 50
-
-#ifndef HAVE_FUN_DEFINED
-typedef struct fun FUN;
@@ -65 +62 @@
-};
-
-userfn_tab[MAX_GLOBAL_FNS]
+*userfn_tab
-
-extern void do_userfn(char *buff, char **bp,
@@ -86 +83 @@
-extern void do_function_report(dbref player, char *name);
-extern void do_function_delete(dbref player, char *name);
-
+
-
-

1.7.7/hdrs/game.h

@@ -160 +160 @@
-/* From timer.c */
-extern void init_timer(void);
+extern void signal_cpu_limit(int signo);
-
-/* From version.c */

1.7.7/hdrs/lock.h

@@ -55 +55 @@
-int add_lock(dbref player, dbref thing, lock_type type, struct boolexp *key,
-         int flags);
+int add_lock_raw(dbref player, dbref thing, lock_type type,
+         struct boolexp *key, int flags);
-void free_locks(lock_list *ll);
-int eval_lock(dbref player, dbref thing, lock_type ltype);
@@ -65 +67 @@
-const char *lock_flags(lock_list *ll);
-const char *lock_flags_long(lock_list *ll);
-
-#define L_FLAGS(lock) ((lock)->flags)
-#define L_CREATOR(lock) ((lock)->creator)
@@ -71 +72 @@
-#define L_KEY(lock) ((lock)->key)
-#define L_NEXT(lock) ((lock)->next)
-
-/* can p read/evaluate lock l on object x? */
-int lock_visual(dbref, lock_type);
@@ -77 +77 @@
-    (See_All(p) || controls(p,x) || ((Visual(x) || lock_visual(x, l)) && \
-     eval_lock(p,x,Examine_Lock)))
-
-/* The actual magic cookies. */
-extern const lock_type Basic_Lock;
@@ -102 +101 @@
-extern const lock_type Destroy_Lock;    /* Who can @dest me if I'm dest_ok? */
-/* Declare new lock types here! */
-
-#include "boolexp.h"
-
-#endif              /* __LOCK_H */

1.7.7/hdrs/version.h

@@ -1 @@
-3 [12/25/2002
-3
+4 [01/02/2003
+4

1.7.7/src/Makefile

@@ -193 +193 @@
-../hdrs/patches.h:
-    if [ ! -f ../hdrs/patches.h ]; then \
-
+ patches
-    fi
-

1.7.7/src/bsd.c

@@ -4559 +4559 @@
-  if (ROOM_CONNECTS) {
-    /* Do the room the player connected into */
-
+ || IsThing(loc)
-      (void) queue_attribute(loc, "ACONNECT", player);
-    }
@@ -4637 +4637 @@
-    (void) queue_attribute(player, "ADISCONNECT", player);
-    if (ROOM_CONNECTS)
-
+ || IsThing(loc)
-    (void) queue_attribute(loc, "ADISCONNECT", player);
-      }

1.7.7/src/conf.c

@@ -327 +327 @@
-  {"queue_entry_cpu_time", cf_int, &options.queue_entry_cpu_time, 100000, 0,
-   "limits"}
+  ,
+  {"max_global_fns", cf_int, &options.max_global_fns, 2000, 0, 0}
-  ,
-
@@ -925 +927 @@
-  options.max_depth = 10;
-  options.max_parents = 10;
+  options.max_global_fns = 50;
-  options.purge_interval = 601;
-  options.dbck_interval = 599;

1.7.7/src/db.c

@@ -1022 +1022 @@
-    /* boolexp */
-    b = getboolexp(f, type);
-
+_raw
-  }
-}
@@ -1050 +1050 @@
-      return;
-    } else {
-
+_raw
-    }
-  }

1.7.7/src/extmail.c

@@ -416 +416 @@
-
-  struct mail *mp;
-
+, *bp
-  char folderheader[BUFFER_LEN];
-  struct mail_selector ms;
@@ -444 +444 @@
-      strcpy(folderheader, T("Folder:"));
-    notify(player, DASH_LINE);
+    bp = tbuf1;
-    if (IsPlayer(mp->from))
-printf(tbuf1, "%s", Name(mp->from)
+afe_str(Name(mp->from), tbuf1, &bp
-    else
-
-
+
+
+
-    notify_format(player,
-              T

1.7.7/src/flags.c

@@ -691 +691 @@
-    GoodObject(Location(thing)) && (hear || listener) &&
-    !Hearer(thing) && !Listener(thing)) {
-
+
+
+
-      notify_except(Contents(Location(thing)), NOTHING, tbuf1);
-      notify_except(Contents(thing), NOTHING, tbuf1);
@@ -697 +699 @@
-    if (IsRoom(thing) && (f->type == TYPE_ROOM) &&
-    (f->flag == ROOM_LISTEN) && !hear && !Listener(thing)) {
-
+
+
+
-      notify_except(Contents(thing), NOTHING, tbuf1);
-    }
@@ -704 +708 @@
-      case TYPE_EXIT:
-    if (Audible(Source(thing))) {
-
+
+
+
+
-      notify_except(Contents(Source(thing)), NOTHING, tbuf1);
-    }
@@ -755 +762 @@
-    ((f->flag == THING_PUPPET) || (f->flag == THING_LISTEN)) &&
-    !hear && !listener) {
-
+
+
+
-      notify_except(Contents(Location(thing)), NOTHING, tbuf1);
-      notify_except(Contents(thing), NOTHING, tbuf1);
@@ -761 +770 @@
-    if (IsRoom(thing) && (f->type == TYPE_ROOM) &&
-    (f->flag == ROOM_LISTEN) && !hear && !listener) {
-
+
+
+
-      notify_except(Contents(thing), NOTHING, tbuf1);
-    }
@@ -769 +780 @@
-      case TYPE_EXIT:
-    if (Audible(Source(thing))) {
-
+
+
+
+
-      notify_except(Contents(Source(thing)), NOTHING, tbuf1);
-    }

1.7.7/src/function.c

@@ -5 +5 @@
-#include <string.h>
-#include <ctype.h>
+#include <stdlib.h>
-#include "conf.h"
-#include "attrib.h"
@@ -27 +28 @@
-extern void local_functions(void);
-
+USERFN_ENTRY *userfn_tab;
-HASHTAB htab_function;
-HASHTAB htab_user_function;
@@ -567 +569 @@
-
-void
-
+void
-{
-  FUNTAB *ftp;
@@ -577 +579 @@
-  }
-  local_functions();
+}
+
+void
+function_init_postconfig(void)
+{
+  userfn_tab =
+    (USERFN_ENTRY *) mush_malloc(MAX_GLOBAL_FNS * sizeof(USERFN_ENTRY),
+                 "userfn_tab");
-}
-
@@ -681 +691 @@
- */
-
-USERFN_ENTRY userfn_tab[MAX_GLOBAL_FNS];
-
-static Size_t userfn_count = 0;
@@ -760 +769 @@
-do_function(dbref player, char *name, char *argv[])
-{
-
+[,<minargs>,<maxargs>]
-   * or @function <function name>=<thing>/<attribute>
-   * Adds a new user-defined function.
@@ -844 +853 @@
-  fp = func_hash_lookup(upcasestr(name));
-  if (!fp) {
-
+(Size_t) 
-      notify(player, T("Function table full."));
-      return;
@@ -852 +861 @@
-    fp->name = mush_strdup(name, "func_hash.name");
-    fp->where.offset = userfn_count;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    fp->flags = 0;
-    hashadd(name, fp, &htab_user_function);
@@ -874 +898 @@
-    }
-    if (fp->flags & FN_BUILTIN) {   /* Overriding a built in function */
-
+(Size_t) 
-    notify(player, T("Function table full."));
-    return;
@@ -881 +905 @@
-      fp->name = mush_strdup(name, "func_hash.name");
-      fp->where.offset = userfn_count;
-      fp->minargs = 0;
-      fp->maxargs = 10;
-      fp->flags = 0;
-      userfn_count++;
@@ -893 +915 @@
-    userfn_tab[fp->where.offset].name =
-      mush_strdup(upcasestr(argv[2]), "userfn_tab.name");
+    if (argv[3] && *argv[3]) {
+      fp->minargs = parse_integer(argv[3]);
+      if (fp->minargs < 0)
+    fp->minargs = 0;
+      else if (fp->minargs > 10)
+    fp->minargs = 10;
+    } else
+      fp->minargs = 0;
+
+    if (argv[4] && *argv[4]) {
+      fp->maxargs = parse_integer(argv[4]);
+      if (fp->maxargs < -10)
+    fp->maxargs = -10;
+      else if (fp->maxargs > 10)
+    fp->maxargs = 10;
+    } else
+      fp->maxargs = 10;
-    notify(player, T("Function updated."));
-  }
@@ -1140 +1179 @@
-  }
-
-
-
-
-
-
-  *tp = '\0';
-  notify_format(player, T("Flags     : %s"), tbuf);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

1.7.7/src/game.c

@@ -324 +324 @@
-  FILE *f = NULL;
-
+#ifndef WIN32
+  ignore_signal(SIGPROF);
+#endif
+#ifdef I_SETJMP
-  if (setjmp(db_err)) {
-    /* The dump failed. Disk might be full or something went bad with the
@@ -330 +334 @@
-    flag_broadcast(WIZARD | ROYALTY, 0,
-           T("GAME: ERROR! Database save failed!"));
+#ifdef HAS_ITIMER
+    install_sig_handler(SIGPROF, signal_cpu_limit);
+#endif
-  } else {
-    local_dump_database();
@@ -402 +409 @@
-  }
-
+#endif
+#ifdef HAS_ITIMER
+  install_sig_handler(SIGPROF, signal_cpu_limit);
+#endif
-}
-
@@ -618 +629 @@
-  config_file_startup(conf);
-  command_init_postconfig();
+  function_init_postconfig();
-}
-

1.7.7/src/lock.c

@@ -383 +383 @@
-}
-
+/* Set the lock type on thing to boolexp.
+ * Used only on db load, when we can't safely test the player's
+ * permissions because they're not loaded yet.
+ */
+int
+add_lock_raw(dbref player, dbref thing, lock_type type, struct boolexp *key,
+         int flags)
+{
+  lock_list *ll, **t;
+  lock_type real_type = type;
+
+  if (!GoodObject(thing)) {
+    return 0;
+  }
+
+  ll = next_free_lock();
+  if (!ll) {
+    /* Oh, this sucks */
+    do_log(LT_ERR, 0, 0, "Unable to malloc memory for lock_list!");
+  } else {
+    real_type = st_insert(type, &lock_names);
+    ll->type = real_type;
+    ll->key = key;
+    ll->creator = player;
+    if (flags == -1) {
+      const lock_list *l2 = get_lockproto(real_type);
+      if (l2)
+    ll->flags = l2->flags;
+      else
+    ll->flags = 0;
+    } else {
+      ll->flags = flags;
+    }
+    t = &Locks(thing);
+    while (*t && strcmp(L_TYPE(*t), L_TYPE(ll)) < 0)
+      t = &L_NEXT(*t);
+    L_NEXT(ll) = *t;
+    *t = ll;
+  }
+  return 1;
+}
+
-/* Very primitive. */
-static void

1.7.7/src/log.c

@@ -45 +45 @@
-    dbref object;
-{
-
+, *bp
-
-  switch (object) {
-  case NOTHING:
-printf
+trcpy
-    break;
-  case AMBIGUOUS:
-printf
+trcpy
-    break;
-  case HOME:
-printf
+trcpy
-    break;
-  default:
-
-
+
+
+
+
-  }
-

1.7.7/src/look.c

@@ -655 +655 @@
-{
-  static char buf[BUFFER_LEN];
+  char *bp;
-  CHANLIST *c;
-
-  if ((c = Chanlist(player))) {
-
-
-
+
+
+
+
+
+
+
-  } else
-    strcpy(buf, T("Channels: *NONE*"));

1.7.7/src/match.c

@@ -77 +77 @@
-                  dbref *last_match, int *match_count);
-static dbref match_exit(const dbref who, const char *name,
-
+, int *match_count
-static dbref match_exit_internal(const dbref match_who,
-                 const char *match_name, const int type,
@@ -93 +93 @@
-              long int flags, dbref thing1, dbref thing2,
-              int *match_count);
+extern int check_alias(const char *command, const char *list);  /* game.c */
-
-
@@ -205 +206 @@
-      match_remote_contents(who, name, type, flags, &last_match, &match_count);
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
@@ -212 +213 @@
-    match = match_neighbor(who, name, type, flags, &last_match, &match_count);
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
@@ -219 +220 @@
-    match = match_possession(who, name, type, flags, &last_match, &match_count);
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
-  }
-  if (flags & MAT_EXIT) {
-
+, &match_count
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
@@ -233 +234 @@
-    match = match_container(who, name, type, flags, &last_match, &match_count);
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
@@ -240 +241 @@
-    match = match_exit_internal(who, name, type, flags, who, &match_count);
-    if (GoodObject(match)) {
-++
+ += match_count
-      exact_match = match;
-    }
-  }
-las
-GoodObject(exact_match
+exac
+((flags & MAT_LAST) && GoodObject(last_match)
-    match = match_english(who, name, flags);
-    if (GoodObject(match)) {
@@ -360 +361 @@
-  DOLIST(first, first) {
-    if (first == absolute) {
+      (*match_count)++;
-      return first;
-    } else if (!strcasecmp(Name(first), match_name) ||
@@ -367 +369 @@
-     * make sure match_count is high enough that we report ambiguity
-     */
-    *match_count += 2;
-    *last_match =
-      choose_thing(match_who, type, flags, the_match, first, match_count);
-    return NOTHING;
-
+ {
-    the_match = first;
+    (*match_count)++;
+      }
-    } else if (string_match(Name(first), match_name)) {
-      *last_match =
@@ -413 +416 @@
-
-static dbref
-
+, match_count
-    const dbref who;
-    const char *name;
-    const int type;
-    const long flags;
+    int *match_count;
-{
-  dbref loc;
@@ -424 +428 @@
-    if (flags & MAT_REMOTES) {
-      if (GoodObject(loc))
-
+
+
-      else
-    return NOTHING;
-    } else if (flags & MAT_GLOBAL)
-
-
-
+
+
+
+
-}
-
@@ -444 +450 @@
-  dbref exit_tmp;
-  dbref absolute;
-  const char *match;
-  const char *p;
-  dbref the_match = NOTHING;
-
@@ -454 +458 @@
-  absolute = match_absolute(match_name);
-  DOLIST(exit_tmp, Exits(loc)) {
- {
+
-      the_match = exit_tmp;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+