From f32015b7cf81cf7095fa33d9b9432a494dae179d Mon Sep 17 00:00:00 2001 From: Michiel Broek Date: Fri, 5 Nov 2004 20:41:08 +0000 Subject: [PATCH] Created new mbutils source directory --- ChangeLog | 2 + configure | 2 +- configure.in | 2 +- mbsebbs/.cvsignore | 2 +- mbsebbs/Makefile | 51 +++--------------- mbutils/.cvsignore | 1 + mbutils/Makefile | 92 ++++++++++++++++++++++++++++++++ {mbsebbs => mbutils}/mball.c | 0 {mbsebbs => mbutils}/mball.h | 0 {mbsebbs => mbutils}/mblang.c | 0 {mbsebbs => mbutils}/mbstat.c | 0 {mbsebbs => mbutils}/mbstat.h | 0 {mbsebbs => mbutils}/mbtoberep.c | 0 {mbsebbs => mbutils}/mbuser.c | 0 {mbsebbs => mbutils}/mbuser.h | 0 15 files changed, 106 insertions(+), 46 deletions(-) create mode 100644 mbutils/.cvsignore create mode 100644 mbutils/Makefile rename {mbsebbs => mbutils}/mball.c (100%) rename {mbsebbs => mbutils}/mball.h (100%) rename {mbsebbs => mbutils}/mblang.c (100%) rename {mbsebbs => mbutils}/mbstat.c (100%) rename {mbsebbs => mbutils}/mbstat.h (100%) rename {mbsebbs => mbutils}/mbtoberep.c (100%) rename {mbsebbs => mbutils}/mbuser.c (100%) rename {mbsebbs => mbutils}/mbuser.h (100%) diff --git a/ChangeLog b/ChangeLog index a2bd8321..8bed390a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,8 @@ v0.71.0 27-Oct-2004 general: From filetranfer records removed the batch and bidirectional switches, these are no longer needed. + Added new subdirectory mbutils. Some sources from the mbsebbs + subdirectory are moved there. mbsebbs: In change handle the first character of the name is not diff --git a/configure b/configure index 545a08c9..dcf8c75a 100755 --- a/configure +++ b/configure @@ -1304,7 +1304,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_commands="$ac_config_commands default-1" -SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbnntp mbtask mbsetup unix lang examples html script" +SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang examples html script" PACKAGE="mbsebbs" diff --git a/configure.in b/configure.in index f694fe29..869fe21a 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl $Id$ AC_INIT(lib/mbselib.h) AM_CONFIG_HEADER(config.h) -SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbnntp mbtask mbsetup unix lang examples html script" +SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbutils mbnntp mbtask mbsetup unix lang examples html script" AC_SUBST(SUBDIRS) dnl diff --git a/mbsebbs/.cvsignore b/mbsebbs/.cvsignore index 707d50a3..74e403e3 100644 --- a/mbsebbs/.cvsignore +++ b/mbsebbs/.cvsignore @@ -1 +1 @@ -filelist mball mbchat mblang mbnewusr mbsebbs mbstat mbtoberep mbuser +filelist mbnewusr mbsebbs diff --git a/mbsebbs/Makefile b/mbsebbs/Makefile index 9a255b08..5d2880e5 100644 --- a/mbsebbs/Makefile +++ b/mbsebbs/Makefile @@ -6,18 +6,18 @@ include ../Makefile.global SRCS = signature.c filesub.c language.c mbtoberep.c \ msgutil.c oneline.c bbslist.c morefile.c \ - email.c fsedit.c lineedit.c mblang.c mbuser.c page.c \ + email.c fsedit.c lineedit.c page.c \ bye.c funcs.c mail.c term.c ttyio.c openport.c \ newuser.c pinfo.c timecheck.c change.c transfer.c \ - exitinfo.c mball.c mbsebbs.c menu.c pop3.c lastcallers.c \ - timeout.c chat.c file.c mbstat.c misc.c \ + exitinfo.c mbsebbs.c menu.c pop3.c lastcallers.c \ + timeout.c chat.c file.c misc.c \ offline.c user.c mbnewusr.c input.c whoson.c \ door.c dispfile.c userlist.c timestats.c logentry.c HDRS = signature.h filesub.h language.h mbsebbs.h misc.h offline.h \ timeout.h bbslist.h email.h fsedit.h lineedit.h \ - mbstat.h msgutil.h oneline.h user.h bye.h morefile.h \ - funcs.h mail.h mbuser.h page.h term.h ttyio.h openport.h \ - change.h exitinfo.h mball.h newuser.h \ + msgutil.h oneline.h user.h bye.h morefile.h \ + funcs.h mail.h page.h term.h ttyio.h openport.h \ + change.h exitinfo.h newuser.h \ pinfo.h chat.h file.h menu.h transfer.h \ pop3.h timecheck.h mbnewusr.h input.h whoson.h \ door.h dispfile.h userlist.h timestats.h logentry.h lastcallers.h @@ -32,18 +32,8 @@ MBNEWUSR_OBJS = mbnewusr.o newuser.o language.o timeout.o dispfile.o oneline.o t timecheck.o input.o exitinfo.o funcs.o misc.o change.o door.o term.o openport.o \ filesub.o mail.o email.o msgutil.o pop3.o lineedit.o fsedit.o whoson.o MBNEWUSR_LIBS = ../lib/libmbse.a ../lib/libmsgbase.a ../lib/libdbase.a ../lib/libmbinet.a ../lib/libnodelist.a -MBALL_OBJS = mball.o -MBALL_LIBS = ../lib/libmbse.a ../lib/libdbase.a -MBLANG_OBJS = mblang.o -MBLANG_LIBS = ../lib/libmbse.a ../lib/libdbase.a -MBSTAT_OBJS = mbstat.o -MBSTAT_LIBS = ../lib/libmbse.a ../lib/libdbase.a -MBTOBE_OBJS = mbtoberep.o -MBTOBE_LIBS = ../lib/libmbse.a ../lib/libdbase.a -MBUSER_OBJS = mbuser.o -MBUSER_LIBS = ../lib/libmbse.a ../lib/libdbase.a OTHER = Makefile -TARGET = mbsebbs mbnewusr mball mblang mbstat mbtoberep mbuser +TARGET = mbsebbs mbnewusr ############################################################################################################# @@ -61,33 +51,12 @@ mbsebbs: ${MBSEBBS_OBJS} ${MBSEBBS_LIBS} mbnewusr: ${MBNEWUSR_OBJS} ${MBNEWUSR_LIBS} ${CC} -o mbnewusr ${MBNEWUSR_OBJS} ${LDFLAGS} ${LIBS} ${MBNEWUSR_LIBS} -mball: ${MBALL_OBJS} ${MBALL_LIBS} - ${CC} -o mball ${MBALL_OBJS} ${LDFLAGS} ${LIBS} ${MBALL_LIBS} - -mblang: ${MBLANG_OBJS} ${MBLANG_LIBS} - ${CC} -o mblang ${MBLANG_OBJS} ${LDFLAGS} ${LIBS} ${MBLANG_LIBS} - -mbstat: ${MBSTAT_OBJS} ${MBSTAT_LIBS} - ${CC} -o mbstat ${MBSTAT_OBJS} ${LDFLAGS} ${LIBS} ${MBSTAT_LIBS} - -mbtoberep: ${MBTOBE_OBJS} ${MBTOBE_LIBS} - ${CC} -o mbtoberep ${MBTOBE_OBJS} ${LDFLAGS} ${LIBS} ${MBTOBE_LIBS} - -mbuser: ${MBUSER_OBJS} ${MBUSER_LIBS} - ${CC} -o mbuser ${MBUSER_OBJS} ${LDFLAGS} ${LIBS} ${MBUSER_LIBS} - install: all @if [ "`id -un`" != "root" ] ; then \ echo; echo " Must be root to install!"; echo; exit 3; \ fi ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbsebbs ${BINDIR} ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 6750 mbnewusr ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mball ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mblang ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbstat ${BINDIR} - ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbtoberep ${BINDIR} - ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR} - @rm -f mbchat filelist: Makefile BASE=`pwd`; \ @@ -121,7 +90,7 @@ depend: signature.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h signature.h funcs.h input.h language.h timeout.h term.h ttyio.h filesub.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h funcs.h language.h input.h misc.h timeout.h exitinfo.h change.h term.h ttyio.h language.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h language.h term.h ttyio.h -mbtoberep.o: ../config.h ../lib/mbselib.h +mbtoberep.o: msgutil.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h oneline.h msgutil.h oneline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h funcs.h input.h language.h term.h ttyio.h bbslist.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h bbslist.h funcs.h input.h language.h term.h @@ -129,8 +98,6 @@ morefile.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h la email.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h ../lib/mbinet.h exitinfo.h language.h mail.h timeout.h msgutil.h input.h email.h whoson.h term.h ttyio.h fsedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h pinfo.h fsedit.h term.h ttyio.h lineedit.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h mail.h input.h language.h timeout.h lineedit.h term.h ttyio.h -mblang.o: ../config.h ../lib/mbselib.h -mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h page.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h dispfile.h input.h chat.h page.h timeout.h mail.h language.h term.h ttyio.h bye.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/nodelist.h dispfile.h misc.h language.h bye.h term.h openport.h ttyio.h funcs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msgtext.h ../lib/msg.h funcs.h term.h ttyio.h @@ -144,7 +111,6 @@ timecheck.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timecheck change.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h change.h dispfile.h funcs.h input.h language.h misc.h timeout.h exitinfo.h bye.h term.h ttyio.h transfer.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h transfer.h exitinfo.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h funcs.h input.h language.h oneline.h misc.h bye.h timeout.h timecheck.h exitinfo.h -mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h mball.h mbsebbs.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h mbsebbs.h user.h dispfile.h language.h menu.h misc.h bye.h timeout.h funcs.h term.h ttyio.h openport.h menu.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h oneline.h mail.h bbslist.h change.h chat.h file.h funcs.h input.h misc.h timeout.h menu.h page.h pinfo.h bye.h timecheck.h whoson.h language.h offline.h email.h door.h dispfile.h userlist.h timestats.h logentry.h morefile.h lastcallers.h signature.h term.h ttyio.h pop3.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbinet.h ../lib/msgtext.h ../lib/msg.h msgutil.h pop3.h term.h ttyio.h @@ -152,7 +118,6 @@ lastcallers.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h input.h timeout.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h timeout.h funcs.h bye.h filesub.h language.h term.h chat.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h chat.h funcs.h input.h language.h misc.h whoson.h term.h ttyio.h file.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h filesub.h file.h funcs.h input.h language.h misc.h timeout.h exitinfo.h whoson.h change.h dispfile.h term.h ttyio.h openport.h -mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h misc.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/msg.h funcs.h input.h language.h misc.h timeout.h exitinfo.h ttyio.h term.h offline.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/bluewave.h ../lib/msgtext.h ../lib/msg.h mail.h funcs.h input.h language.h file.h filesub.h exitinfo.h timeout.h msgutil.h pop3.h offline.h whoson.h term.h ttyio.h openport.h user.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h timeout.h user.h dispfile.h funcs.h input.h misc.h bye.h file.h mail.h change.h menu.h exitinfo.h language.h offline.h email.h term.h ttyio.h diff --git a/mbutils/.cvsignore b/mbutils/.cvsignore new file mode 100644 index 00000000..5459fa61 --- /dev/null +++ b/mbutils/.cvsignore @@ -0,0 +1 @@ +filelist mball mbchat mblang mbstat mbtoberep mbuser diff --git a/mbutils/Makefile b/mbutils/Makefile new file mode 100644 index 00000000..b74b2176 --- /dev/null +++ b/mbutils/Makefile @@ -0,0 +1,92 @@ +# Makefile for MBSE BBS under Linux +# Copyright (c) 1998, 2004 by M. Broek. +# $Id$ + +include ../Makefile.global + +SRCS = mball.c mblang.c mbstat.c mbtoberep.c mbuser.c +HDRS = mball.h mbstat.h mbuser.h +MBALL_OBJS = mball.o +MBALL_LIBS = ../lib/libmbse.a ../lib/libdbase.a +MBLANG_OBJS = mblang.o +MBLANG_LIBS = ../lib/libmbse.a ../lib/libdbase.a +MBSTAT_OBJS = mbstat.o +MBSTAT_LIBS = ../lib/libmbse.a ../lib/libdbase.a +MBTOBE_OBJS = mbtoberep.o +MBTOBE_LIBS = ../lib/libmbse.a ../lib/libdbase.a +MBUSER_OBJS = mbuser.o +MBUSER_LIBS = ../lib/libmbse.a ../lib/libdbase.a +OTHER = Makefile +TARGET = mball mblang mbstat mbtoberep mbuser + +############################################################################################################# + +.c.o: + ${CC} ${CFLAGS} ${INCLUDES} ${DEFINES} -c $< + +all: ${TARGET} + +clean: + rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak + +mball: ${MBALL_OBJS} ${MBALL_LIBS} + ${CC} -o mball ${MBALL_OBJS} ${LDFLAGS} ${LIBS} ${MBALL_LIBS} + +mblang: ${MBLANG_OBJS} ${MBLANG_LIBS} + ${CC} -o mblang ${MBLANG_OBJS} ${LDFLAGS} ${LIBS} ${MBLANG_LIBS} + +mbstat: ${MBSTAT_OBJS} ${MBSTAT_LIBS} + ${CC} -o mbstat ${MBSTAT_OBJS} ${LDFLAGS} ${LIBS} ${MBSTAT_LIBS} + +mbtoberep: ${MBTOBE_OBJS} ${MBTOBE_LIBS} + ${CC} -o mbtoberep ${MBTOBE_OBJS} ${LDFLAGS} ${LIBS} ${MBTOBE_LIBS} + +mbuser: ${MBUSER_OBJS} ${MBUSER_LIBS} + ${CC} -o mbuser ${MBUSER_OBJS} ${LDFLAGS} ${LIBS} ${MBUSER_LIBS} + +install: all + @if [ "`id -un`" != "root" ] ; then \ + echo; echo " Must be root to install!"; echo; exit 3; \ + fi + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mball ${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mblang ${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbstat ${BINDIR} + ${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0700 mbtoberep ${BINDIR} + ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR} + @rm -f mbchat + +filelist: Makefile + BASE=`pwd`; \ + BASE=`basename $${BASE}`; \ + (for f in ${SRCS} ${HDRS} ${OTHER} ; do echo ${PACKAGE}-${VERSION}/$${BASE}/$$f; done) >filelist + +depend: + @rm -f Makefile.bak; \ + mv Makefile Makefile.bak; \ + sed -e '/^# DO NOT DELETE/,$$d' Makefile.bak >Makefile; \ + ${ECHO} '# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT' \ + >>Makefile; \ + ${ECHO} '# Dependencies generated by make depend' >>Makefile; \ + for f in ${SRCS}; \ + do \ + ${ECHO} "Dependencies for $$f:\c"; \ + ${ECHO} "`basename $$f .c`.o:\c" >>Makefile; \ + for h in `sed -n -e \ + 's/^#[ ]*include[ ]*"\([^"]*\)".*/\1/p' $$f`; \ + do \ + ${ECHO} " $$h\c"; \ + ${ECHO} " $$h\c" >>Makefile; \ + done; \ + ${ECHO} " done."; \ + ${ECHO} "" >>Makefile; \ + done; \ + ${ECHO} '# End of generated dependencies' >>Makefile + +# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT +# Dependencies generated by make depend +mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h mball.h +mblang.o: ../config.h ../lib/mbselib.h +mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h +mbtoberep.o: ../config.h ../lib/mbselib.h +mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h +# End of generated dependencies diff --git a/mbsebbs/mball.c b/mbutils/mball.c similarity index 100% rename from mbsebbs/mball.c rename to mbutils/mball.c diff --git a/mbsebbs/mball.h b/mbutils/mball.h similarity index 100% rename from mbsebbs/mball.h rename to mbutils/mball.h diff --git a/mbsebbs/mblang.c b/mbutils/mblang.c similarity index 100% rename from mbsebbs/mblang.c rename to mbutils/mblang.c diff --git a/mbsebbs/mbstat.c b/mbutils/mbstat.c similarity index 100% rename from mbsebbs/mbstat.c rename to mbutils/mbstat.c diff --git a/mbsebbs/mbstat.h b/mbutils/mbstat.h similarity index 100% rename from mbsebbs/mbstat.h rename to mbutils/mbstat.h diff --git a/mbsebbs/mbtoberep.c b/mbutils/mbtoberep.c similarity index 100% rename from mbsebbs/mbtoberep.c rename to mbutils/mbtoberep.c diff --git a/mbsebbs/mbuser.c b/mbutils/mbuser.c similarity index 100% rename from mbsebbs/mbuser.c rename to mbutils/mbuser.c diff --git a/mbsebbs/mbuser.h b/mbutils/mbuser.h similarity index 100% rename from mbsebbs/mbuser.h rename to mbutils/mbuser.h