- (internal) enable building utmpserver

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

2 files changed, 9 insertions, 49 deletions

diff --git a/mbbsd/Makefile b/mbbsd/Makefile
index 17156401..7aa1b55b 100644
--- a/mbbsd/Makefile
+++ b/mbbsd/Makefile
@@ -10,17 +10,18 @@ SRCROOT=	..
 PROG=	mbbsd
 CHESSOBJS= chc.o chc_tab.o chess.o go.o gomo.o dark.o reversi.o
 GAMEOBJS = card.o guess.o chicken.o othello.o
-COREOBJS = bbs.o announce.o read.o board.o cache.o brc.o mail.o record.o fav.o
+COREOBJS = bbs.o announce.o read.o board.o cache.o cal.o brc.o mail.o record.o fav.o
 ACCOBJS  = user.o register.o passwd.o
 TALKOBJS = talk.o chat.o friend.o
-NETOBJS  = mbbsd.o io.o term.o
-UTILOBJS = stuff.o kaede.o convert.o name.o
-PLUGOBJS = lovepaper.o calendar.o topsong.o vice.o
-OBJS=	admin.o assess.o cal.o edit.o menu.o more.o gamble.o \
-	xyz.o syspost.o vote.o var.o voteboard.o \
-	pmore.o telnet.o \
+NETOBJS  = mbbsd.o io.o term.o telnet.o
+UTILOBJS = stuff.o kaede.o convert.o name.o syspost.o
+PLUGOBJS = lovepaper.o calendar.o topsong.o gamble.o vice.o
+PAGEROBJS= more.o pmore.o
+OBJS=	admin.o assess.o edit.o menu.o xyz.o var.o \
+	vote.o voteboard.o \
 	$(COREOBJS) $(ACCOBJS)  $(NETOBJS)   $(TALKOBJS) $(UTILOBJS) \
-	$(SYSOBJS)  $(PLUGOBJS) $(CHESSOBJS) $(GAMEOBJS)
+	$(PAGEROBJS) $(SYSOBJS)  $(PLUGOBJS) \
+	$(CHESSOBJS) $(GAMEOBJS)
 
 #######################################################################
 # conditional configurations and optional modules
diff --git a/mbbsd/stuff.c b/mbbsd/stuff.c
index 1b3aace1..3b79de9a 100644
--- a/mbbsd/stuff.c
+++ b/mbbsd/stuff.c
@@ -531,47 +531,6 @@ DBCS_StringHash(const char *s)
     return fnv1a_32_dbcs_strcase(s, FNV1_32_INIT);
 }
 
-inline int *intbsearch(int key, const int *base0, int nmemb)
-{
-    /* 改自 /usr/src/lib/libc/stdlib/bsearch.c ,
-       專給搜 int array 用的, 不透過 compar function 故較快些 */
-    const   char *base = (const char *)base0;
-    size_t  lim;
-    int     *p;
-
-    for (lim = nmemb; lim != 0; lim >>= 1) {
-	p = (int *)(base + (lim >> 1) * 4);
-	if( key == *p )
-	    return p;
-	if( key > *p ){/* key > p: move right */
-	    base = (char *)p + 4;
-	    lim--;
-	}               /* else move left */
-    }
-    return (NULL);
-}
-
-inline unsigned int *
-uintbsearch(const unsigned int key, const unsigned int *base0, const int nmemb)
-{
-    /* 改自 /usr/src/lib/libc/stdlib/bsearch.c ,
-       專給搜 int array 用的, 不透過 compar function 故較快些 */
-    const   char *base = (const char *)base0;
-    size_t  lim;
-    unsigned int     *p;
-
-    for (lim = nmemb; lim != 0; lim >>= 1) {
-        p = (unsigned int *)(base + (lim >> 1) * 4);
-        if( key == *p )
-            return p;
-        if( key > *p ){/* key > p: move right */
-            base = (char *)p + 4;
-            lim--;
-        }               /* else move left */
-    }
-    return (NULL);
-}
-
 /* AIDS */
 aidu_t fn2aidu(char *fn)
 {