1. fix typo in chinese.

2. fix the problem that board name in fpg has the initial number.


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

2 files changed, 6 insertions, 6 deletions

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 80c3add4..17a35bc1 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -790,16 +790,16 @@ do_generalboardreply(fileheader_t * fhdr)
 int
 invalid_brdname(char *brd)
 {
-    register char   ch;
+    register char   ch, rv=0;
 
     ch = *brd++;
     if (!isalpha(ch))
-	return 1;
+	rv =  2;
     while ((ch = *brd++)) {
 	if (not_alnum(ch) && ch != '_' && ch != '-' && ch != '.')
-	    return 1;
+	    return (1|rv);
     }
-    return 0;
+    return rv;
 }
 
 static int
diff --git a/mbbsd/merge.c b/mbbsd/merge.c
index 93aafaf4..a8a3081c 100644
--- a/mbbsd/merge.c
+++ b/mbbsd/merge.c
@@ -177,7 +177,7 @@ m_fpg()
        Copy(buf, genbuf);
        strcat(buf, genbuf);
        friend_load(FRIEND_OVERRIDE);
-       strcat(msg, "¶×¤J¦n¦³¤Íͳææ\n");
+       strcat(msg, "¶×¤J¦n¤Í¦W³æ\n");
    }
    sprintf(buf, "±b¸¹¶×¤J³ø§i %s -> %s ", userid, cuser.userid);
    post_msg("Security", buf, msg, "[¨t²Î¦w¥þ§½]");
@@ -205,7 +205,7 @@ m_fpg_brd(char *bname, char *fromdir)
      if(!getdata(20,0, "¤p³½ªºªO¦W [­^¤å¤j¤p¼g­n§¹¥þ¥¿½T]:", fbname, 20,
 	        DOECHO)) return;
   }
-  while(invalid_brdname(fbname));
+  while((invalid_brdname(fbname)&1));
 
   sprintf(buf, "fpg/boards/%s.inf", fbname);
   if(!dashf(buf))