From fa5b233767ca9d4e012839c28eb13628d2ebba63 Mon Sep 17 00:00:00 2001 From: piaip Date: Sat, 10 Sep 2005 06:24:56 +0000 Subject: Automake is a hard work, still not working now. git-svn-id: http://opensvn.csie.org/pttbbs/branches/piaip.automake@3152 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- innbbsd/Makefile | 71 ---------------------------------------------------- innbbsd/Makefile.old | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ innbbsd/innbbsd.c | 8 +++--- 3 files changed, 76 insertions(+), 74 deletions(-) delete mode 100644 innbbsd/Makefile create mode 100644 innbbsd/Makefile.old (limited to 'innbbsd') diff --git a/innbbsd/Makefile b/innbbsd/Makefile deleted file mode 100644 index 0e6c75cc..00000000 --- a/innbbsd/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -# $Id$ -.include "../pttbbs.mk" - -VERSION= 0.50-pttpatch -ADMINUSER?= root@your.domain.name - -# FreeBSD innbbsd肂惠把计 -inn_CFLAGS_FreeBSD= -DBSD44 -DMMAP -DGETRUSAGE -inn_LDFLAGS_FreeBSD= -L/usr/local/lib -lcrypt -liconv - -# Linux innbbsd肂惠把计 -inn_CFLAGS_Linux= -DLINUX -DGETRUSAGE -inn_LDFLAGS_Linux= - -# Solarisinnbbsd肂惠把计 -inn_CFLAGS_Solaris= -DMMAP -DSolaris -DSYSV -I/usr/local/include/ -inn_LDFLAGS_Solaris= -L/usr/local/lib -liconv -lsocket -lnsl -lkstat - -CFLAGS+= -DVERSION=\"${VERSION}\" \ - -DADMINUSER=\"${ADMINUSER}\" \ - -DMapleBBS -DDBZDEBUG -I. \ - ${inn_CFLAGS_${OSTYPE}} -DHMM_USE_ANTI_SPAM - -LDFLAGS+= ${inn_LDFLAGS_${OSTYPE}} - -PROGS= bbslink bbsnnrp ctlinnbbsd \ - innbbsd mkhistory - -all: ${PROGS} - -# bbs util -UTIL_DIR= ../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 - -.for fn in ${UTIL_OBJS} -LINK_UTIL_OBJS+= ${UTIL_DIR}/${fn} - -${UTIL_DIR}/${fn}: # FIXME: dependency - cd ${UTIL_DIR}; make ${fn} -.endfor - - -echobbslib.o: echobbslib.c - ${CC} ${CFLAGS} -DWITH_ECHOMAIL -c echobbslib.c - -innbbsd: inndchannel.o innbbsd.o connectsock.o rfc931.o daemon.o \ - file.o pmain.o his.o dbz.o closeonexec.o dbztool.o \ - inntobbs.o receive_article.o echobbslib.o str_decode.o nocem.o - ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} - -bbslink: bbslink.o pmain.o inntobbs.o echobbslib.o connectsock.o \ - file.o port.o str_decode.o - ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} - -bbsnnrp: bbsnnrp.o pmain.o bbslib.o connectsock.o file.o - ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} - -ctlinnbbsd: ctlinnbbsd.o pmain.o bbslib.o connectsock.o file.o - ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} - -mkhistory: mkhistory.o bbslib.o file.o his.o dbz.o port.o closeonexec.o - ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} - -install: ${PROGS} - install -d ${BBSHOME}/innd/ - install -c -m 755 ${PROGS} ${BBSHOME}/innd/ - -clean: - rm -f *.o ${PROGS} core *.core diff --git a/innbbsd/Makefile.old b/innbbsd/Makefile.old new file mode 100644 index 00000000..0e6c75cc --- /dev/null +++ b/innbbsd/Makefile.old @@ -0,0 +1,71 @@ +# $Id$ +.include "../pttbbs.mk" + +VERSION= 0.50-pttpatch +ADMINUSER?= root@your.domain.name + +# FreeBSD innbbsd肂惠把计 +inn_CFLAGS_FreeBSD= -DBSD44 -DMMAP -DGETRUSAGE +inn_LDFLAGS_FreeBSD= -L/usr/local/lib -lcrypt -liconv + +# Linux innbbsd肂惠把计 +inn_CFLAGS_Linux= -DLINUX -DGETRUSAGE +inn_LDFLAGS_Linux= + +# Solarisinnbbsd肂惠把计 +inn_CFLAGS_Solaris= -DMMAP -DSolaris -DSYSV -I/usr/local/include/ +inn_LDFLAGS_Solaris= -L/usr/local/lib -liconv -lsocket -lnsl -lkstat + +CFLAGS+= -DVERSION=\"${VERSION}\" \ + -DADMINUSER=\"${ADMINUSER}\" \ + -DMapleBBS -DDBZDEBUG -I. \ + ${inn_CFLAGS_${OSTYPE}} -DHMM_USE_ANTI_SPAM + +LDFLAGS+= ${inn_LDFLAGS_${OSTYPE}} + +PROGS= bbslink bbsnnrp ctlinnbbsd \ + innbbsd mkhistory + +all: ${PROGS} + +# bbs util +UTIL_DIR= ../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 + +.for fn in ${UTIL_OBJS} +LINK_UTIL_OBJS+= ${UTIL_DIR}/${fn} + +${UTIL_DIR}/${fn}: # FIXME: dependency + cd ${UTIL_DIR}; make ${fn} +.endfor + + +echobbslib.o: echobbslib.c + ${CC} ${CFLAGS} -DWITH_ECHOMAIL -c echobbslib.c + +innbbsd: inndchannel.o innbbsd.o connectsock.o rfc931.o daemon.o \ + file.o pmain.o his.o dbz.o closeonexec.o dbztool.o \ + inntobbs.o receive_article.o echobbslib.o str_decode.o nocem.o + ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} + +bbslink: bbslink.o pmain.o inntobbs.o echobbslib.o connectsock.o \ + file.o port.o str_decode.o + ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} + +bbsnnrp: bbsnnrp.o pmain.o bbslib.o connectsock.o file.o + ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} + +ctlinnbbsd: ctlinnbbsd.o pmain.o bbslib.o connectsock.o file.o + ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} + +mkhistory: mkhistory.o bbslib.o file.o his.o dbz.o port.o closeonexec.o + ${CCACHE} ${CC} -o $@ ${LDFLAGS} $? ${LINK_UTIL_OBJS} + +install: ${PROGS} + install -d ${BBSHOME}/innd/ + install -c -m 755 ${PROGS} ${BBSHOME}/innd/ + +clean: + rm -f *.o ${PROGS} core *.core diff --git a/innbbsd/innbbsd.c b/innbbsd/innbbsd.c index f71ab30c..bdbd2a59 100644 --- a/innbbsd/innbbsd.c +++ b/innbbsd/innbbsd.c @@ -266,7 +266,6 @@ static int CMDmode(client) ClientType *client; { - /* char cwdpath[MAXPATHLEN+1]; */ argv_t *argv = &client->Argv; extern ClientType INNBBSD_STAT; daemoncmd_t *p = argv->dc; @@ -312,8 +311,11 @@ CMDmode(client) fprintf(argv->out, "NONE NEWSFEEDS %d\r\n", NONENEWSFEEDS); fprintf(argv->out, "Max connections %d\r\n", Maxclient); #ifdef DEBUGCWD - getwd(cwdpath); - fprintf(argv->out, "Working directory %s\r\n", cwdpath); + { + char cwdpath[MAXPATHLEN+1]; + getcwd(cwdpath, sizeof(cwdpath)); + fprintf(argv->out, "Working directory %s\r\n", cwdpath); + } #endif if (Channel) for (i = 0, j = 0; i < Maxclient; ++i) { -- cgit v1.2.3