- general fix of some messages

- improve Makefile more
- prevent broken Welcome


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

4 files changed, 28 insertions, 12 deletions

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 72da221a..c5c0959d 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -3,32 +3,39 @@
 SRCROOT=	..
 .include "$(SRCROOT)/pttbbs.mk"
 
+#######################################################################
 # common modules
+#######################################################################
 
 PROG=	mbbsd
-OBJS=	admin.o announce.o args.o assess.o bbs.o board.o cache.o cal.o card.o\
-	chat.o chicken.o convert.o crypt.o edit.o fav.o friend.o gamble.o\
-	guess.o indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
-	more.o name.o osdep.o read.o record.o register.o\
+CHESSOBJS= chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o othello.o
+GAMEOBJS = card.o guess.o chicken.o
+SYSOBJS  = args.o crypt.o osdep.o
+OBJS=	admin.o announce.o assess.o bbs.o board.o cache.o cal.o\
+	chat.o convert.o edit.o fav.o friend.o gamble.o\
+	indict.o io.o kaede.o lovepaper.o mail.o mbbsd.o menu.o\
+	more.o name.o read.o record.o register.o\
 	stuff.o talk.o term.o topsong.o user.o brc.o vice.o vote.o\
 	xyz.o voteboard.o syspost.o var.o passwd.o calendar.o file.o \
 	pmore.o telnet.o \
-	chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o othello.o
+	$(SYSOBJS) $(CHESSOBJS) $(GAMEOBJS)
 
-# optional modules
+#######################################################################
+# conditional configurations and optional modules
+#######################################################################
 
 .if !defined(WITHOUT_BLOG) 	&& defined(WITH_BLOG)
 CFLAGS+=  -DBLOG
 LDFLAGS+= -L/usr/local/lib/mysql -lmysqlclient
 .endif
 
-.if !defined(WITHOUT_EMAILDB) && defined(WITH_EMAILDB)
+.if !defined(WITHOUT_EMAILDB)	&& defined(WITH_EMAILDB)
 OBJS+=   emaildb.o
 CFLAGS+= -DUSE_EMAILDB
 LDFLAGS+= -lsqlite3
 .endif
 
-.if !defined(WITHOUT_PFTERM) && defined(WITH_PFTERM)
+.if !defined(WITHOUT_PFTERM)	&& defined(WITH_PFTERM)
 OBJS+=	pfterm.o
 CFLAGS+=  -DUSE_PFTERM
 #CFLAGS+= -DDBG_OUTRPT
@@ -36,6 +43,10 @@ CFLAGS+=  -DUSE_PFTERM
 OBJS+=	screen.o
 .endif
 
+#######################################################################
+# special library (DIET) configuration
+#######################################################################
+
 .if defined(DIET)
 OBJS+=	random.o time.o alloc.o
 DIETCC=	diet -Os
@@ -55,6 +66,10 @@ OBJS+= merge.o
 LIBS+=	$(SRCROOT)/src/libbbsutil/libbbsutil.a \
 	$(SRCROOT)/src/libbbs/libbbs.a
 
+#######################################################################
+# Make Rules
+#######################################################################
+
 .SUFFIXES: .c .o
 .c.o:	$(SRCROOT)/include/var.h
 	$(CCACHE) $(DIETCC) $(CC) $(CFLAGS) -c $*.c
diff --git a/mbbsd/screen.c b/mbbsd/screen.c
index 6969d2ab..3de85631 100644
--- a/mbbsd/screen.c
+++ b/mbbsd/screen.c
@@ -1,7 +1,7 @@
 /* $Id$ */
 #include "bbs.h"
 
-#if !defined(EXP_PFTERM) && !defined(USE_PFTERM)
+#if !defined(USE_PFTERM)
 
 #define o_clear()     output(clearbuf,clearbuflen)
 #define o_cleol()     output(cleolbuf,cleolbuflen)
@@ -701,7 +701,7 @@ void scr_restore(const screen_backup_t *old)
     redrawwin();
 }
 
-#endif //  !defined(EXP_PFTERM) && !defined(USE_PFTERM)
+#endif //  !defined(USE_PFTERM)
 
 /* vim:sw=4
  */
diff --git a/mbbsd/stuff.c b/mbbsd/stuff.c
index bc7a5ef0..95030ce6 100644
--- a/mbbsd/stuff.c
+++ b/mbbsd/stuff.c
@@ -416,6 +416,7 @@ show_file(const char *filename, int y, int lines, int mode)
 	while (fgets(buf, sizeof(buf), fp) && lines--)
 	    outs(Ptt_prints(buf, sizeof(buf), mode));
 	fclose(fp);
+	outs(ANSI_RESET); // prevent some broken Welcome file
     } else
 	return 0;
     return 1;
diff --git a/mbbsd/user.c b/mbbsd/user.c
index ce2dedbe..c68dc5b3 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -1447,7 +1447,7 @@ toregister(char *email, char *genbuf, char *phone, char *career,
 	    if (email_count < 0) {
 		move(15, 0); clrtobot();
 		move(17, 0);
-		outs("暫時不允許 email 認證註冊, 請稍後再試\n");
+		outs("暫時不允許\ email 認證註冊, 請稍後再試\n");
 		pressanykey();
 		return;
 	    } else if (email_count >= EMAILDB_LIMIT) { 
@@ -1476,7 +1476,7 @@ toregister(char *email, char *genbuf, char *phone, char *career,
 		email, strlen(email)) < 0) {
 	move(15, 0); clrtobot();
 	move(17, 0);
-	outs("暫時不允許 email 認證註冊, 請稍後再試\n");
+	outs("暫時不允許\ email 認證註冊, 請稍後再試\n");
 	pressanykey();
 	return;
     }