Ticket #7644: namelist-arg.patch.txt

*** src/function.c.orig Fri Oct  5 23:36:32 2007
--- src/function.c  Mon Jul 21 20:25:56 2008
***************
*** 546,552 ****
    {"MWHO", fun_lwho, 0, 0, FN_REG},
    {"MWHOID", fun_lwho, 0, 0, FN_REG},
    {"NAME", fun_name, 0, 2, FN_REG},
!   {"NAMELIST", fun_namelist, 1, 1, FN_REG},
    {"NAMEGRAB", fun_namegrab, 2, 3, FN_REG},
    {"NAMEGRABALL", fun_namegraball, 2, 3, FN_REG},
    {"NAND", fun_nand, 1, INT_MAX, FN_REG},
--- 546,552 ----
    {"MWHO", fun_lwho, 0, 0, FN_REG},
    {"MWHOID", fun_lwho, 0, 0, FN_REG},
    {"NAME", fun_name, 0, 2, FN_REG},
!   {"NAMELIST", fun_namelist, 1, 2, FN_REG},
    {"NAMEGRAB", fun_namegrab, 2, 3, FN_REG},
    {"NAMEGRABALL", fun_namegraball, 2, 3, FN_REG},
    {"NAND", fun_nand, 1, INT_MAX, FN_REG},
*** src/fundb.c.orig    Mon Jul  9 04:50:12 2007
--- src/fundb.c Mon Jul 21 20:25:56 2008
***************
*** 1774,1779 ****
--- 1774,1791 ----
    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) {
***************
*** 1788,1795 ****
--- 1800,1819 ----
        target = visible_short_page(executor, current);
      if (target == NOTHING) {
        safe_str("#-1", buff, bp);
+       if (report) {
+         wenv[0] = current;
+         wenv[1] = "#-1";
+         if (call_ufun(&ufun, wenv, 2, NULL, executor, enactor, pe_info))
+           report = 0;
+       }
      } else if (target == AMBIGUOUS) {
        safe_str("#-2", buff, bp);
+       if (report) {
+         wenv[0] = current;
+         wenv[1] = "#-2";
+         if (call_ufun(&ufun, wenv, 2, NULL, executor, enactor, pe_info))
+           report = 0;
+       }
      } else {
        safe_dbref(target, buff, bp);
      }
*** game/txt/hlp/pennfunc.hlp.orig  Fri Oct  5 23:36:32 2007
--- game/txt/hlp/pennfunc.hlp   Mon Jul 21 20:44:31 2008
***************
*** 2754,2767 ****
  
    Related functions: FULLNAME(), ACCNAME(), INAME() 
  & NAMELIST()
!   namelist(<player-list>)
  
!   Namelist takes a list of players of the form used by the page
    command and returns a corresponding list of dbrefs.
! 
!   >"[namelist(#1 Javelin "ringo spar" bogus)]
    You say, "#1 #7 #56 #-1"
  
  & NAMEGRAB()
  & NAMEGRABALL()
    namegrab(<dbref list>, <name>)
--- 2754,2775 ----
  
    Related functions: FULLNAME(), ACCNAME(), INAME() 
  & NAMELIST()
!   namelist(<player-list>[,[<object>/]<attribute>])
  
!   namelist() takes a list of players of the form used by the page
    command and returns a corresponding list of dbrefs.
!   
!   If an <object>/<attribute> is given, the attribute will be called for
!   each invalid name, with the name as %0 and the returned dbref (#-1
!   for an unmatched name, #-2 for an ambiguous one) as %1.
! 
!   >&foo me=pemit(%#,switch(%1,#-1,Bad,#-2,Ambiguous) name '%0')
!   >"[namelist(#1 Javelin "ringo spar" bogus,me/foo)]
!   Bad name 'bogus'
    You say, "#1 #7 #56 #-1"
  
+   See also: anonymous attributes
+ 
  & NAMEGRAB()
  & NAMEGRABALL()
    namegrab(<dbref list>, <name>)
*** game/txt/hlp/penntop.hlp.orig   Mon Jul  9 04:50:12 2007
--- game/txt/hlp/penntop.hlp    Mon Jul 21 20:35:48 2008
***************
*** 228,234 ****
    The following functions support anonymous attributes:
    
    filter()    filterbool()   fold()      foreach()   map()      mapsql()
!   mix()       munge()        sortby()    sortkey()   step()
  & ATTRIB-OWNERSHIP
    ATTRIBUTE OWNERSHIP
    
--- 228,234 ----
    The following functions support anonymous attributes:
    
    filter()    filterbool()   fold()      foreach()   map()      mapsql()
!   mix()       munge()        namelist()  sortby()    sortkey()   step()
  & ATTRIB-OWNERSHIP
    ATTRIBUTE OWNERSHIP