* In generalnamecomplete(), complete as more as possible when space (' ')

   is pressed. (As what <tab> does in most shell)
 * In all three completing functions (namecomplete, usercomplete and
   generalnamecomplete), return null string instead of partial matched
   name which makes users able to talk/annoy those they are not supposed
   to talk to (admins or cloaks).
 * Type of parameters of generalnamecomplete has typedefed and should
   be clearer.
 * New macro CompleteBoard and CompleteOnlineUser are defined since most
   of the usage of generalnamecomplete are the same.


git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@2468 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

1 files changed, 2 insertions, 10 deletions

diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index f60db2d4..927ec328 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -2248,11 +2248,7 @@ userlist(void)
 		    int             fi;	/* allpickuplist[fi] */
 		    char            swid[IDLEN + 1];
 		    move(1, 0);
-		    si = generalnamecomplete(msg_uid, swid,
-					     sizeof(swid), SHM->UTMPnumber,
-					     completeutmp_compar,
-					     completeutmp_permission,
-					     completeutmp_getname);
+		    si = CompleteOnlineUser(msg_uid, swid);
 		    if (si >= 0) {
 			pickup_t        friends[MAX_FRIEND + 1];
 			int             nGots, i;
@@ -2764,11 +2760,7 @@ t_talk()
      * BBSNAME "¡j§a¡I"); return XEASY; }
      */
     stand_title("¥´¶}¸Ü§X¤l");
-    generalnamecomplete(msg_uid, uident, sizeof(uident),
-			SHM->UTMPnumber,
-			completeutmp_compar,
-			completeutmp_permission,
-			completeutmp_getname);
+    CompleteOnlineUser(msg_uid, uident);
     if (uident[0] == '\0')
 	return 0;