correct revision 2210

add reloadfcache to shmctl


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

4 files changed, 17 insertions, 9 deletions

diff --git a/mbbsd/cache.c b/mbbsd/cache.c
index d826199f..32cc4a95 100644
--- a/mbbsd/cache.c
+++ b/mbbsd/cache.c
@@ -866,7 +866,7 @@ resolve_garbage(void)
 /* PTT's cache                                           */
 /*-------------------------------------------------------*/
 /* cache for from host »P³Ì¦h¤W½u¤H¼Æ */
-static void
+void
 reload_fcache(void)
 {
     if (SHM->Fbusystate)
diff --git a/mbbsd/name.c b/mbbsd/name.c
index 9a53e086..a012ab93 100644
--- a/mbbsd/name.c
+++ b/mbbsd/name.c
@@ -566,8 +566,6 @@ generalnamecomplete(char *prompt, char *data, int len, size_t nmemb,
 	    if (ptr != 0) {
 		gnc_findbound(data, &start, &end, nmemb, compar);
 		ret = gnc_completeone(data, start, end, permission, getname);
-		if (ret < 0)
-		    data[0] = 0;
 	    } else
 		ptr = -1;
 	    break;
@@ -691,8 +689,10 @@ completeutmp_compar(int where, char *str, int len)
 int
 completeutmp_permission(int where)
 {
-    return (HAS_PERM(PERM_SYSOP) || HAS_PERM(PERM_SEECLOAK) ||
-	    !SHM->sorted[SHM->currsorted][0][where]->invisible);
+    return (unlikely(HAS_PERM(PERM_SYSOP)) ||
+	    unlikely(HAS_PERM(PERM_SEECLOAK)) ||
+//	    !SHM->sorted[SHM->currsorted][0][where]->invisible);
+	    isvisible(currutmp, SHM->sorted[SHM->currsorted][0][where]));
 }
 
 char           *
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 39e142ae..66613e99 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -3006,14 +3006,14 @@ AngelNotOnline(){
 	outs("\nÍ¢¯d¨¥µ¹§A¡G\n");
 	outs("\033[1;31;44m¡ó¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢t\033[37m"
 	     "¤p¤Ñ¨Ï¯d¨¥\033[31m¢u¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢s¡ó\033[m\n");
-	outs("\033[1;31mùú¢t\033[32m ¤p¤Ñ¨Ï                          "
-	     "                                     \033[31m¢uùû\033[m\n");
+	outs("\033[1;31m¢~¢t\033[32m ¤p¤Ñ¨Ï                          "
+	     "                                     \033[31m¢u¢¡\033[m\n");
 	while (fgets(buf, sizeof(buf), fp)) {
 	    buf[strlen(buf) - 1] = 0;
 	    prints("\033[1;31m¢x\033[m%-74.74s\033[1;31m¢x\033[m\n", buf);
 	}
-	outs("\033[1;31mùü¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
-		"¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢sùý\033[m\n");
+	outs("\033[1;31m¢¢¢s¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
+		"¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢s¢£\033[m\n");
 	outs("\033[1;31;44m¡ó¢r¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w"
 		"¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢w¢r¡ó\033[m\n");
 
diff --git a/util/shmctl.c b/util/shmctl.c
index 54757795..e1864dab 100644
--- a/util/shmctl.c
+++ b/util/shmctl.c
@@ -708,6 +708,13 @@ int torb(int argc, char **argv)
     return 0;
 }
 
+int rlfcache(int argc, char **argv)
+{
+    reload_fcache();
+    puts("fcache reloaded");
+    return 0;
+}
+
 struct {
     int     (*func)(int, char **);
     char    *cmd, *descript;
@@ -733,6 +740,7 @@ struct {
       {hotboard,   "hotboard",   "list boards of most bfriends"},
       {usermode,   "usermode",   "list #users in the same mode"},
       {torb,       "reloadbcache", "reload bcache"},
+      {rlfcache,   "reloadfcache", "reload fcache"},
       {NULL, NULL, NULL} };
 
 extern char ** environ;