PennMUSH 1.8.3p11

Author: talvo@talvo.com <talvo@talvo.com@ba372814-4f39-11de-9ad6-1127a62b9fcd>
Date:   Sun Nov 29 20:40:15 2009 +0000

    Issue 41, namelist() now takes an optional obj/attr for error
    reporting

Fixes #145

diff --git a/src/function.c b/src/function.c
index 6823ed1cbc6ebc70b0e6c66f9ec846abfd628958..66f4ff2a116b08e72f7d596ebf1004d627473733 100644 (file)
--- a/src/function.c
+++ b/src/function.c
@@ -562,7 +562,7 @@ FUNTAB flist[] = {
   {"NAME", fun_name, 0, 2, FN_REG},
   {"NAMEGRAB", fun_namegrab, 2, 3, FN_REG},
   {"NAMEGRABALL", fun_namegraball, 2, 3, FN_REG},
-  {"NAMELIST", fun_namelist, 1, 1, FN_REG},
+  {"NAMELIST", fun_namelist, 1, 2, FN_REG},
   {"NAND", fun_nand, 1, INT_MAX, FN_REG},
   {"NATTR", fun_nattr, 1, 1, FN_REG},
   {"NCHILDREN", fun_lsearch, 1, 1, FN_REG},

diff --git a/src/fundb.c b/src/fundb.c
index f488e7a5e9ebd2ab1b5f6ac761e0b85e483b52f1..b3e4604adc0af737a969e935b38147c1f3918f43 100644 (file)
--- a/src/fundb.c
+++ b/src/fundb.c
@@ -1831,6 +1831,18 @@ FUNCTION(fun_namelist)
   char *current;
   dbref target;
   const char *start;
+  int report = 0;
+  ufun_attrib ufun;
+  char *wenv[2];
+
+  if (nargs > 1 && args[1] && *args[1]) {
+    if (fetch_ufun_attrib(args[1], executor, &ufun, 1)) {
+      report = 1;
+    } else {
+      safe_str(ufun.errmess, buff, bp);
+      return;
+    }
+  }
 
   start = args[0];
   while (start && *start) {
@@ -1843,12 +1855,14 @@ FUNCTION(fun_namelist)
     target = lookup_player(current);
     if (!GoodObject(target))
       target = visible_short_page(executor, current);
-    if (target == NOTHING) {
-      safe_str("#-1", buff, bp);
-    } else if (target == AMBIGUOUS) {
-      safe_str("#-2", buff, bp);
-    } else {
-      safe_dbref(target, buff, bp);
+    safe_dbref(target, buff, bp);
+    if (target == NOTHING || target == AMBIGUOUS) {
+      if (report) {
+        wenv[0] = current;
+        wenv[1] = unparse_dbref(target);
+        if (call_ufun(&ufun, wenv, 2, NULL, executor, enactor, pe_info))
+          report = 0;
+      }
     }
   }
 }