diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-03-26 18:12:12 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2008-03-26 18:12:12 +0800 |
| commit | 2e97729c2196fa6ecbb4928734781c0e688219ab (patch) | |
| tree | f984486bf1762dbbe6f45cc54ff6b0492c487e1a /innbbsd | |
| parent | 2a2078146f1e079732cd1a471e064d34a4399890 (diff) | |
| download | pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar.gz pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar.bz2 pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar.lz pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar.xz pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.tar.zst pttbbs-2e97729c2196fa6ecbb4928734781c0e688219ab.zip | |
- (internal) moving more bbs-independent code to utility library.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4023 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'innbbsd')
| -rw-r--r-- | innbbsd/Makefile | 4 | ||||
| -rw-r--r-- | innbbsd/str_decode.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/innbbsd/Makefile b/innbbsd/Makefile index 3365e9c8..c8021368 100644 --- a/innbbsd/Makefile +++ b/innbbsd/Makefile @@ -7,7 +7,7 @@ ADMINUSER?= root@your.domain.name # FreeBSD為了 innbbsd額外需加的參數 inn_CFLAGS_FreeBSD= -DBSD44 -DMMAP -DGETRUSAGE -inn_LDFLAGS_FreeBSD= -L/usr/local/lib -lcrypt -liconv +inn_LDFLAGS_FreeBSD= -L/usr/local/lib -liconv # Linux為了 innbbsd額外需加的參數 inn_CFLAGS_Linux= -DLINUX -DGETRUSAGE @@ -33,7 +33,7 @@ all: ${PROGS} UTIL_DIR= $(SRCROOT)/util UTIL_OBJS= \ util_cache.o util_record.o util_passwd.o util_var.o \ - util_stuff.o util_osdep.o util_args.o util_file.o + util_stuff.o util_osdep.o .for fn in ${UTIL_OBJS} LINK_UTIL_OBJS+= ${UTIL_DIR}/${fn} diff --git a/innbbsd/str_decode.c b/innbbsd/str_decode.c index 72a1f225..7a58439d 100644 --- a/innbbsd/str_decode.c +++ b/innbbsd/str_decode.c @@ -179,7 +179,7 @@ str_iconv( } /* Start translation */ while (srclen > 0 && dstlen > 0) { - iconv_ret = iconv(iconv_descriptor, (const char **)&src, &srclen, + iconv_ret = iconv(iconv_descriptor, &src, &srclen, &dst, &dstlen); if (iconv_ret != 0) { switch (errno) { @@ -260,7 +260,7 @@ str_decode_M3(unsigned char *str) if (*tmp && tmp[1] && tmp[2] == '?') { /* Thor: *tmp == '?' */ #ifdef USE_ICONV int i = mmdecode(tmp + 3, tmp[1], dst1); - i = str_iconv(charset, "big5", dst1, i, dst, + i = str_iconv((char*)charset, "big5", (char*)dst1, i, (char*)dst, sizeof(buf) - ((int)(dst - buf))); #else int i = mmdecode(tmp + 3, tmp[1], dst); @@ -287,5 +287,5 @@ str_decode_M3(unsigned char *str) } } *dst = 0; - strcpy(str, buf); + strcpy((char*)str, (char*)buf); } |