From 24ec3204b34c9e6749b9312f2edb84edb2a4cb34 Mon Sep 17 00:00:00 2001
From: in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 20 Jul 2003 00:55:34 +0000
Subject: merge from MergeCache

git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@1065 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 innbbsd/Makefile      |  2 +-
 innbbsd/antisplam.h   | 13 -------------
 innbbsd/inndchannel.c |  1 +
 innbbsd/str_decode.c  |  2 +-
 4 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'innbbsd')

diff --git a/innbbsd/Makefile b/innbbsd/Makefile
index 56c91213..5fa6c566 100644
--- a/innbbsd/Makefile
+++ b/innbbsd/Makefile
@@ -24,7 +24,7 @@ OPT= -O -s -pipe -fomit-frame-pointer
 
 BBS_DEP = MapleBBS 
 BBS_UTIL = $(BBS_SRC)/util
-BBS_REC = $(BBS_UTIL)/util_record.o $(BBS_UTIL)/util_cache.o $(BBS_UTIL)/util_passwd.o
+BBS_REC = $(BBS_UTIL)/util_record.o $(BBS_UTIL)/util_cache.o $(BBS_UTIL)/util_passwd.o $(BBS_UTIL)/util_stuff.o $(BBS_UTIL)/util_var.o
 
 #########################
 #
diff --git a/innbbsd/antisplam.h b/innbbsd/antisplam.h
index 30289da1..f72f5348 100644
--- a/innbbsd/antisplam.h
+++ b/innbbsd/antisplam.h
@@ -1,18 +1,5 @@
 #define char_lower(c)  ((c >= 'A' && c <= 'Z') ? c|32 : c)
 
-/*void
-str_lower(t, s)
-  char *t, *s;*/
-void str_lower(char *t, char *s)
-{
-  register char ch;
-  do
-  {
-    ch = *s++;
-    *t++ = char_lower(ch);
-  } while (ch);
-}
-
 #if 0 /* string.h , libc */
 int
 strcasestr(str, tag)
diff --git a/innbbsd/inndchannel.c b/innbbsd/inndchannel.c
index 439b2af0..b784bde4 100644
--- a/innbbsd/inndchannel.c
+++ b/innbbsd/inndchannel.c
@@ -578,6 +578,7 @@ woju
     setgid(BBSGID);
     setuid(BBSUID);
     chdir(BBSHOME);
+    attach_SHM();
     resolve_boards();
 
     port = DefaultINNBBSPort;
diff --git a/innbbsd/str_decode.c b/innbbsd/str_decode.c
index 23a10551..73ad5f64 100644
--- a/innbbsd/str_decode.c
+++ b/innbbsd/str_decode.c
@@ -164,7 +164,7 @@ int str_iconv(
     /* Start translation */
     while (srclen > 0 && dstlen > 0)
     {
-	iconv_ret = iconv(iconv_descriptor, &src, &srclen,
+	iconv_ret = iconv(iconv_descriptor, (const char* *)&src, &srclen,
 		&dst, &dstlen);
 	if (iconv_ret  != 0)
 	{
-- 
cgit v1.2.3