diff options
| -rw-r--r-- | mbbsd/menu.c | 2 | ||||
| -rw-r--r-- | mbbsd/merge.c | 8 | ||||
| -rw-r--r-- | mbbsd/record.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mbbsd/menu.c b/mbbsd/menu.c index 71b63718..680efbe7 100644 --- a/mbbsd/menu.c +++ b/mbbsd/menu.c @@ -394,7 +394,7 @@ const static commands_t userlist[] = { {u_register, PERM_BASIC, "RRegister 填寫《註冊申請單》"}, {u_list, PERM_SYSOP, "UUsers 列出註冊名單"}, #ifdef MERGEBBS - {m_fpg, PERM_LOGINOK, "FFPG import 花園變身術"}, + {m_fpg, PERM_LOGINOK, "FFPG Import 花園變身術"}, #endif {NULL, 0, NULL} }; diff --git a/mbbsd/merge.c b/mbbsd/merge.c index daa60cc0..c2881e30 100644 --- a/mbbsd/merge.c +++ b/mbbsd/merge.c @@ -78,15 +78,15 @@ m_fpg() demoney(man.money/155); cuser.exmailbox += (man.mailk + man.keepmail); + if (cuser.exmailbox > 1000) cuser.exmailbox = 1000; prints("您的花園信箱有 %d : %d, 匯入後共有 %d\n", man.mailk, man.keepmail, cuser.exmailbox ); if(cuser.firstlogin > man.firstlogin) d = man.firstlogin; else d = cuser.firstlogin; - prints("花園註冊日期 %s 此帳號註冊日期 %s 將取 %s \n", - Cdatedate(&(man.firstlogin)), - Cdatedate(&(cuser.firstlogin)), - Cdatedate(&d) ); + prints("花園註冊日期 %s ", Cdatedate(&(man.firstlogin))); + prints("此帳號註冊日期 %s 將取 ",Cdatedate(&(cuser.firstlogin))); + prints("%s", Cdatedate(&d) ); cuser.firstlogin = d; if(cuser.numlogins < man.numlogins) i = man.numlogins; diff --git a/mbbsd/record.c b/mbbsd/record.c index 2903ab2b..aafcaca8 100644 --- a/mbbsd/record.c +++ b/mbbsd/record.c @@ -41,7 +41,7 @@ get_sum_records(char *fpath, int size) char buf[200], *p; // Ptt : should avoid big loop - if ((fp = open(fpath, O_RDONLY))) + if ((fp = open(fpath, O_RDONLY))==-1) return -1; strlcpy(buf, fpath, sizeof(buf)); |