summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-04-13 21:54:34 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2008-04-13 21:54:34 +0800
commit87c171ae1e929c62d0e3cf1db2e208fe54cbe965 (patch)
treea6e0844567f4afcef4965044a67cc5ad22216a44
parent013a43d7cd0a0299638793bca0ebd371326e0284 (diff)
downloadpttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar.gz
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar.bz2
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar.lz
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar.xz
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.tar.zst
pttbbs-87c171ae1e929c62d0e3cf1db2e208fe54cbe965.zip
- fix loginview crash (having NULL entries)
- make aligned comments as exp feature git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4159 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/board.c3
-rw-r--r--mbbsd/mbbsd.c2
-rw-r--r--mbbsd/user.c3
3 files changed, 7 insertions, 1 deletions
diff --git a/mbbsd/board.c b/mbbsd/board.c
index 26add700..46b2633d 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -392,10 +392,13 @@ b_config(void)
(bp->brdattr & BRD_IPLOGRECMD) ?
ANSI_COLOR(1)"自動":"不會");
+// enable if we have it.
+#ifdef EXP_ALIGNEDCMT
prints( " " ANSI_COLOR(1;36) "a" ANSI_RESET
" - 推文時 %s" ANSI_RESET " 開頭\n",
(bp->brdattr & BRD_ALIGNEDCMT) ?
ANSI_COLOR(1)"對齊":"不對齊");
+#endif
#ifdef USE_AUTOCPLOG
prints( " " ANSI_COLOR(1;36) "x" ANSI_RESET
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index 72b40cc5..2675b856 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1296,6 +1296,8 @@ user_login(void)
if ((cuser.loginview >> i) & 1)
{
const char *fn = loginview_file[(int)i][0];
+ if (!fn)
+ break;
if (*fn == '@') // special
{
// since only one special now, let's write directly...
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 72e175a4..f2b4eda8 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -51,7 +51,8 @@ u_loginview(void)
in = i;
clrtobot();
- while ((i = getkey("請按 [A-N] 切換設定,按 [Return] 結束:"))!='\r')
+ while ((i = getkey("請按 [A-%c] 切換設定,按 [Return] 結束:",
+ 'A'+in-1))!='\r')
{
i = i - 'a';
if (i >= in || i < 0)