diff options
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/admin.c | 4 | ||||
| -rw-r--r-- | mbbsd/bbs.c | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/mbbsd/admin.c b/mbbsd/admin.c index b6a5b963..84bf25ea 100644 --- a/mbbsd/admin.c +++ b/mbbsd/admin.c @@ -610,7 +610,7 @@ m_mod_board(char *bname) if (getbnum(genbuf)) { move(3, 0); outs("錯誤! 板名雷同"); - } else if ( !invalid_brdname(genbuf) ){ + } else if ( is_valid_brdname(genbuf) ){ strlcpy(newbh.brdname, genbuf, sizeof(newbh.brdname)); break; } @@ -927,7 +927,7 @@ m_newbrd(int whatclass, int recover) if (!getdata(3, 0, msg_bid, newboard.brdname, sizeof(newboard.brdname), DOECHO)) return -1; - } while (invalid_brdname(newboard.brdname)); + } while (!is_valid_brdname(newboard.brdname)); do { getdata(6, 0, "看板類別：", genbuf, 5, DOECHO); diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c index 2f0686e3..d9ed7a86 100644 --- a/mbbsd/bbs.c +++ b/mbbsd/bbs.c @@ -1363,22 +1363,6 @@ do_generalboardreply(/*const*/ fileheader_t * fhdr) *quote_file = 0; } - -int -invalid_brdname(const char *brd) -{ - register char ch, rv=0; - - ch = *brd++; - if (!isalpha((int)ch)) - rv = 2; - while ((ch = *brd++)) { - if (not_alnum(ch) && ch != '_' && ch != '-' && ch != '.') - return (1|rv); - } - return rv; -} - int b_call_in(int ent, const fileheader_t * fhdr, const char *direct) { |