Fixed BW .MIX file

This commit is contained in:
Michiel Broek 2006-01-23 15:01:12 +00:00
parent d745360017
commit 6c8df21b23
3 changed files with 19 additions and 3 deletions

View File

@ -2,6 +2,11 @@ $Id$
v0.83.8 22-Jan-2006 v0.83.8 22-Jan-2006
mbsebbs:
Fixed a strange bug that ftell didn't work right, this caused
corrupt bluewave download packets.
v0.83.7 31-Dec-2005 - 22-Jan-2006 v0.83.7 31-Dec-2005 - 22-Jan-2006
upgrade: upgrade:

View File

@ -1815,6 +1815,7 @@ unsigned int BlueWave_PackArea(unsigned int ulLast, int Area)
snprintf(Temp, PATH_MAX, "%s/%s/tmp/%s.FTI", CFG.bbs_usersdir, exitinfo.Name, CFG.bbsid); snprintf(Temp, PATH_MAX, "%s/%s/tmp/%s.FTI", CFG.bbs_usersdir, exitinfo.Name, CFG.bbsid);
fdfti = fopen(Temp, "a+"); fdfti = fopen(Temp, "a+");
fseek(fdfti, 0, SEEK_END); /* We need to do this, else ftell doesn't work right */
snprintf(Temp, PATH_MAX, "%s/%s/tmp/%s.MIX", CFG.bbs_usersdir, exitinfo.Name, CFG.bbsid); snprintf(Temp, PATH_MAX, "%s/%s/tmp/%s.MIX", CFG.bbs_usersdir, exitinfo.Name, CFG.bbsid);
fdmix = fopen(Temp, "a+"); fdmix = fopen(Temp, "a+");
@ -1824,6 +1825,7 @@ unsigned int BlueWave_PackArea(unsigned int ulLast, int Area)
memset(&Mix, 0, sizeof(MIX_REC)); memset(&Mix, 0, sizeof(MIX_REC));
snprintf((char *)Mix.areanum, 6, "%u", Area); snprintf((char *)Mix.areanum, 6, "%u", Area);
// Syslog('m', "fti position: %d", ftell(fdfti));
Mix.msghptr = le_int((int)ftell(fdfti)); Mix.msghptr = le_int((int)ftell(fdfti));
if ((fdfti != NULL) && (fdmix != NULL) && (fdm != NULL)) { if ((fdfti != NULL) && (fdmix != NULL) && (fdm != NULL)) {
@ -1892,6 +1894,7 @@ unsigned int BlueWave_PackArea(unsigned int ulLast, int Area)
Mix.totmsgs = le_us((tWORD)Current); Mix.totmsgs = le_us((tWORD)Current);
Mix.numpers = le_us((tWORD)Personal); Mix.numpers = le_us((tWORD)Personal);
// Syslog('m', "mix: %6s %6d %6d %6d", Mix.areanum, Mix.totmsgs, Mix.numpers, Mix.msghptr);
fwrite(&Mix, sizeof (Mix), 1, fdmix); fwrite(&Mix, sizeof (Mix), 1, fdmix);
if (fdfti != NULL) if (fdfti != NULL)

View File

@ -4,8 +4,8 @@
include ../Makefile.global include ../Makefile.global
SRCS = mball.c dlcount.c mblang.c mbstat.c mbtoberep.c mbuser.c SRCS = mball.c dlcount.c mblang.c mbstat.c mbtoberep.c mbuser.c mbbw.c
HDRS = mball.h dlcount.h mbstat.h mbuser.h HDRS = mball.h dlcount.h mbstat.h mbuser.h mbbw.h
MBALL_OBJS = mball.o dlcount.o MBALL_OBJS = mball.o dlcount.o
MBALL_LIBS = ../lib/libmbse.a ../lib/libdbase.a MBALL_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBLANG_OBJS = mblang.o MBLANG_OBJS = mblang.o
@ -16,8 +16,10 @@ MBTOBE_OBJS = mbtoberep.o
MBTOBE_LIBS = ../lib/libmbse.a ../lib/libdbase.a MBTOBE_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBUSER_OBJS = mbuser.o MBUSER_OBJS = mbuser.o
MBUSER_LIBS = ../lib/libmbse.a ../lib/libdbase.a MBUSER_LIBS = ../lib/libmbse.a ../lib/libdbase.a
MBBW_OBJS = mbbw.o
MBBW_LIBS = ../lib/libmbse.a ../lib/libdbase.a
OTHER = Makefile OTHER = Makefile
TARGET = mball mblang mbstat mbtoberep mbuser TARGET = mball mblang mbstat mbtoberep mbuser mbbw
############################################################################################################# #############################################################################################################
@ -44,6 +46,9 @@ mbtoberep: ${MBTOBE_OBJS} ${MBTOBE_LIBS}
mbuser: ${MBUSER_OBJS} ${MBUSER_LIBS} mbuser: ${MBUSER_OBJS} ${MBUSER_LIBS}
${CC} -o mbuser ${MBUSER_OBJS} ${LDFLAGS} ${LIBS} ${MBUSER_LIBS} ${CC} -o mbuser ${MBUSER_OBJS} ${LDFLAGS} ${LIBS} ${MBUSER_LIBS}
mbbw: ${MBBW_OBJS} ${MBBW_LIBS}
${CC} -o mbbw ${MBBW_OBJS} ${LDFLAGS} ${LIBS} ${MBBW_LIBS}
install: all install: all
@if [ "`id -un`" != "root" ] ; then \ @if [ "`id -un`" != "root" ] ; then \
echo; echo " Must be root to install!"; echo; exit 3; \ echo; echo " Must be root to install!"; echo; exit 3; \
@ -53,6 +58,7 @@ install: all
${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbstat ${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 ${OWNER} -g ${GROUP} -m 0700 mbtoberep ${BINDIR}
${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR} ${INSTALL} -c -s -o ${ROWNER} -g ${RGROUP} -m 6711 mbuser ${BINDIR}
${INSTALL} -c -s -o ${OWNER} -g ${GROUP} -m 0750 mbbw ${BINDIR}
@rm -f mbchat @rm -f mbchat
filelist: Makefile filelist: Makefile
@ -85,8 +91,10 @@ depend:
# DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT # DO NOT DELETE THIS LINE - MAKE DEPEND RELIES ON IT
# Dependencies generated by make depend # Dependencies generated by make depend
mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h dlcount.h mball.h mball.o: ../config.h ../lib/mbselib.h ../lib/mbse.h ../lib/users.h ../lib/mbsedb.h dlcount.h mball.h
dlcount.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h dlcount.h
mblang.o: ../config.h ../lib/mbselib.h mblang.o: ../config.h ../lib/mbselib.h
mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h mbstat.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbstat.h
mbtoberep.o: ../config.h ../lib/mbselib.h mbtoberep.o: ../config.h ../lib/mbselib.h
mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h mbuser.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/mbsedb.h mbuser.h
mbbw.o: ../config.h ../lib/mbselib.h ../lib/users.h ../lib/bluewave.h ../lib/mbsedb.h mbbw.h
# End of generated dependencies # End of generated dependencies