diff --git a/ChangeLog b/ChangeLog index ab3e9e1f..41d7b82d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4592,6 +4592,8 @@ v0.33.20 10-Feb-2002 the main configuration (add default macro path). Edit the message groups and file groups for new settings. Run mbfile check to fix download directory permissions. + Check the setting in menu 10.2.13 if it does what you want it + to do. general: Added structures for area maintenance with area lists. @@ -4679,6 +4681,7 @@ v0.33.20 10-Feb-2002 Protected convert-all setting in menus 10.1 and 10.2 when no default archiver is defined. Changed page layout in site.doc + Changed the confusing No Touch setting in tic areas to Touch. mbmon: The top statusbar now displays the bbs Free/Down/Busy status. @@ -4770,6 +4773,7 @@ v0.33.20 10-Feb-2002 Improved error reporting when file copy fails. When a virus scanner is started, de mbtask connection timeout is set to one hour. + Changed the confusing No Touch setting in tic areas to Touch. mbmsg: When creating non-existend message bases, the path is created @@ -4894,6 +4898,7 @@ v0.33.20 10-Feb-2002 mbstat: The timeout for the wait command was wrong due to a wrong upsdown semafore test. + Corrected a spelling error. hatch: A new shellscript to hatch files in a tic area. diff --git a/TODO b/TODO index 50e63c3b..d0c04b94 100644 --- a/TODO +++ b/TODO @@ -61,6 +61,11 @@ mbfido: N: Must be able to use more nodelist override's from the setup. + U: Add routing table to override standard routing. + + N: The first file received in a not yet created tic area is refused + after the area is created: node xxx not connected to area xxx. + mbcico: L: Implement modem connect response translation for ISDN lines, i.e. make the CAUSE responses human readable. see McMail for this diff --git a/html/images/fegroup.gif b/html/images/fegroup.gif index 62e5d7b0..0e559b2a 100644 Binary files a/html/images/fegroup.gif and b/html/images/fegroup.gif differ diff --git a/html/images/fileecho.gif b/html/images/fileecho.gif index 990057c6..d76c2d3e 100644 Binary files a/html/images/fileecho.gif and b/html/images/fileecho.gif differ diff --git a/html/setup/fegroup.html b/html/setup/fegroup.html index 207c007f..5e5ec6cc 100644 --- a/html/setup/fegroup.html +++ b/html/setup/fegroup.html @@ -12,7 +12,7 @@
-
Last update 01-May-2001
+
Last update 29-May-2001

 

MBSE BBS Setup - File Echo's Setup - File Groups.

@@ -71,7 +71,7 @@ to divide between your downlinks or let them all pay the full price. Replace Set replace option in new areas. Dupecheck Set Dupecheck option in new areas. Secure Set secure option in new areas. -No touch Set no touch filedate option in new areas. +Touch Set Touch filedate option in new areas. Virscan Set virus scanner option in new areas. Announce Set announce files option in new areas. Upd magic Set update magicname option in new areas. diff --git a/html/setup/fileecho.html b/html/setup/fileecho.html index 6d723206..906cd49c 100644 --- a/html/setup/fileecho.html +++ b/html/setup/fileecho.html @@ -12,7 +12,7 @@
-
Last update 01-May-2002
+
Last update 29-May-2002

 

MBSE BBS Setup - File Echo's Setup - TIC Areas.

@@ -47,7 +47,7 @@ the number of files (nodelists). Replace Honor the "Replace" command in the .tic file. Dupecheck Check for duplicates in this area. Secure Check if the sending system is connected. -No touch Don't touch the filedate, keep it original. +Touch Touch rearchived files to the original date. Virus sc. Try to scan for virusses. Announce Files may be announced in this area. Upd magic Allow update magic request name. diff --git a/lib/structs.h b/lib/structs.h index cf283f0a..0e4a4cd0 100644 --- a/lib/structs.h +++ b/lib/structs.h @@ -1127,7 +1127,7 @@ struct _tic { unsigned Replace : 1; /* Allow Replace */ unsigned DupCheck : 1; /* Dupe Check */ unsigned Secure : 1; /* Check for secure system */ - unsigned NoTouch : 1; /* Don't touch filedate */ + unsigned Touch : 1; /* Touch filedate */ unsigned VirScan : 1; /* Run Virus scanners */ unsigned Announce : 1; /* Announce files */ unsigned UpdMagic : 1; /* Update Magic database */ @@ -1259,7 +1259,7 @@ struct _fgroup { unsigned Replace : 1; /* Allow replace */ unsigned DupCheck : 1; /* Dupe Check */ unsigned Secure : 1; /* Check for secure system */ - unsigned NoTouch : 1; /* Don't touch filedates */ + unsigned Touch : 1; /* Touch filedates */ unsigned VirScan : 1; /* Run Virus scanners */ unsigned Announce : 1; /* Announce files */ unsigned UpdMagic : 1; /* Update Magic database */ diff --git a/mbfido/createf.c b/mbfido/createf.c index 9031e145..e269a825 100644 --- a/mbfido/createf.c +++ b/mbfido/createf.c @@ -345,7 +345,7 @@ int CheckTicGroup(char *Area, int SendUplink, faddr *f) tic.Replace = fgroup.Replace; tic.DupCheck = fgroup.DupCheck; tic.Secure = fgroup.Secure; - tic.NoTouch = fgroup.NoTouch; + tic.Touch = fgroup.Touch; tic.VirScan = fgroup.VirScan; tic.Announce = fgroup.Announce; tic.UpdMagic = fgroup.UpdMagic; diff --git a/mbfido/createm.c b/mbfido/createm.c index 6eeb7431..426f7a11 100644 --- a/mbfido/createm.c +++ b/mbfido/createm.c @@ -139,12 +139,14 @@ int CheckEchoGroup(char *Area, int SendUplink, faddr *f) return 1; } fread(&msgshdr, sizeof(msgshdr), 1, mp); - offset = msgshdr.hdrsize + ((mgroup.StartArea -1) * (msgshdr.recsize + msgshdr.syssize)); - Syslog('+', "file end at %ld, offset needed %ld", ftell(mp), offset); /* * Verify the file is large enough */ + fseek(mp, 0, SEEK_END); + offset = msgshdr.hdrsize + ((mgroup.StartArea -1) * (msgshdr.recsize + msgshdr.syssize)); + Syslog('+', "file end at %ld, offset needed %ld", ftell(mp), offset); + if (ftell(mp) < offset) { Syslog('m', "Database too small, expanding..."); memset(&msgs, 0, sizeof(msgs)); @@ -159,7 +161,7 @@ int CheckEchoGroup(char *Area, int SendUplink, faddr *f) } if (fseek(mp, offset, SEEK_SET)) { - WriteError("$Can't seek in %s", temp); + WriteError("$Can't seek in %s to position %ld", temp, offset); fclose(ap); fclose(mp); free(buf); diff --git a/mbfido/ptic.c b/mbfido/ptic.c index 5852de36..cab94dde 100644 --- a/mbfido/ptic.c +++ b/mbfido/ptic.c @@ -670,7 +670,7 @@ int ProcessTic(fa_list *sbl) * received file as the file creation date. */ if (MustRearc || DidBanner) { - if ((!tic.NoTouch) && (tic.FileArea)) { + if ((tic.Touch) && (tic.FileArea)) { ut.actime = mktime(localtime(&TIC.FileDate)); ut.modtime = mktime(localtime(&TIC.FileDate)); sprintf(Temp, "%s/%s", TIC.Inbound, TIC.NewName); diff --git a/mbsebbs/mbstat.c b/mbsebbs/mbstat.c index 85a7731b..e154f553 100644 --- a/mbsebbs/mbstat.c +++ b/mbsebbs/mbstat.c @@ -259,7 +259,7 @@ int Wait(void) if (file_exist(buf, R_OK) == 0) Waiting = 30; - Syslog('+', "Waiting for the BBS to become free, timout %d seconds", Waiting); + Syslog('+', "Waiting for the BBS to become free, timeout %d seconds", Waiting); while (Waiting) { strcpy(buf, SockR("SFRE:0;")); if (strncmp(buf, "100:0;", 6) == 0) { diff --git a/mbsetup/m_fgroup.c b/mbsetup/m_fgroup.c index 70c996a1..8db14cae 100644 --- a/mbsetup/m_fgroup.c +++ b/mbsetup/m_fgroup.c @@ -288,7 +288,7 @@ void FgScreen(void) mvprintw(18,32, "22. Dupecheck"); mvprintw(19,32, "23. Secure"); - mvprintw( 9,56, "24. No touch"); + mvprintw( 9,56, "24. Touch"); mvprintw(10,56, "25. Virscan"); mvprintw(11,56, "26. Announce"); mvprintw(12,56, "27. Upd magic"); @@ -364,7 +364,7 @@ int EditFGrpRec(int Area) show_bool(18,46, fgroup.DupCheck); show_bool(19,46, fgroup.Secure); - show_bool( 9,70, fgroup.NoTouch); + show_bool( 9,70, fgroup.Touch); show_bool(10,70, fgroup.VirScan); show_bool(11,70, fgroup.Announce); show_bool(12,70, fgroup.UpdMagic); @@ -464,7 +464,7 @@ int EditFGrpRec(int Area) case 22:E_BOOL(18,46, fgroup.DupCheck, "Set ^Dupe check^ in new created tic areas") case 23:E_BOOL(19,46, fgroup.Secure, "Set ^Secure^ tic processing in new created tic areas") - case 24:E_BOOL( 9,70, fgroup.NoTouch, "Set ^Don't touch filedate^ in new created tic areas") + case 24:E_BOOL( 9,70, fgroup.Touch, "Set ^Touch filedate^ in new created tic areas") case 25:E_BOOL(10,70, fgroup.VirScan, "Set ^Virus scanner^ in new created tic areas") case 26:E_BOOL(11,70, fgroup.Announce, "Set ^Announce files^ in new created tic areas") case 27:E_BOOL(12,70, fgroup.UpdMagic, "Set ^Update magic^ in new created tic areas") @@ -737,7 +737,7 @@ int tic_group_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Allow replace %s\n", getboolean(fgroup.Replace)); fprintf(fp, " Dupe checking %s\n", getboolean(fgroup.DupCheck)); fprintf(fp, " Secure %s\n", getboolean(fgroup.Secure)); - fprintf(fp, " No touch dates %s\n", getboolean(fgroup.NoTouch)); + fprintf(fp, " Touch dates %s\n", getboolean(fgroup.Touch)); fprintf(fp, " Virus scan %s\n", getboolean(fgroup.VirScan)); fprintf(fp, " Announce %s\n", getboolean(fgroup.Announce)); fprintf(fp, " Update magics %s\n", getboolean(fgroup.UpdMagic)); diff --git a/mbsetup/m_ticarea.c b/mbsetup/m_ticarea.c index e68e8eb6..83198ecc 100644 --- a/mbsetup/m_ticarea.c +++ b/mbsetup/m_ticarea.c @@ -421,7 +421,7 @@ void SetTicScreen(void) mvprintw( 7,41, "11. Dupecheck"); mvprintw( 8,41, "12. Secure"); - mvprintw( 9,41, "13. No touch"); + mvprintw( 9,41, "13. Touch"); mvprintw(10,41, "14. Virus sc."); mvprintw(11,41, "15. Announce"); mvprintw(12,41, "16. Upd magic"); @@ -840,7 +840,7 @@ int EditTicRec(int Area) show_bool( 7,55, tic.DupCheck); show_bool( 8,55, tic.Secure); - show_bool( 9,55, tic.NoTouch); + show_bool( 9,55, tic.Touch); show_bool(10,55, tic.VirScan); show_bool(11,55, tic.Announce); show_bool(12,55, tic.UpdMagic); @@ -902,7 +902,7 @@ int EditTicRec(int Area) tic.Replace = fgroup.Replace; tic.DupCheck = fgroup.DupCheck; tic.Secure = fgroup.Secure; - tic.NoTouch = fgroup.NoTouch; + tic.Touch = fgroup.Touch; tic.VirScan = fgroup.VirScan; tic.Announce = fgroup.Announce; tic.UpdMagic = fgroup.UpdMagic; @@ -942,7 +942,7 @@ int EditTicRec(int Area) case 10:E_BOOL(15,16, tic.Replace, "Allow ^Replace^ files command"); case 11:E_BOOL( 7,55, tic.DupCheck, "Check for ^duplicates^ in received files"); case 12:E_BOOL( 8,55, tic.Secure, "Check for ^secure^ systems"); - case 13:E_BOOL( 9,55, tic.NoTouch, "Don't ^touch^ filedate"); + case 13:E_BOOL( 9,55, tic.Touch, "^Touch filedate^ on rearchived files to the origininal filedate"); case 14:E_BOOL(10,55, tic.VirScan, "Check received files for ^virusses^"); case 15:E_BOOL(11,55, tic.Announce, "^Announce^ received files"); case 16:E_BOOL(12,55, tic.UpdMagic, "Update files ^magic^ names"); @@ -1282,7 +1282,7 @@ int tic_areas_doc(FILE *fp, FILE *toc, int page) fprintf(fp, " Replace ok. %s\n", getboolean(tic.Replace)); fprintf(fp, " Dupe check %s\n", getboolean(tic.DupCheck)); fprintf(fp, " Secure %s\n", getboolean(tic.Secure)); - fprintf(fp, " No touch %s\n", getboolean(tic.NoTouch)); + fprintf(fp, " Touch %s\n", getboolean(tic.Touch)); fprintf(fp, " Virus scan %s\n", getboolean(tic.VirScan)); fprintf(fp, " Announce %s\n", getboolean(tic.Announce)); fprintf(fp, " Upd. magic %s\n", getboolean(tic.UpdMagic));