bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scope of recent changes.

Browse Source
This commit is contained in:
Alexander S. Aganichev
2003-12-10 08:35:16 +00:00
parent 9548bafcac
commit 5ed34a60fb
88 changed files with 649 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
goldlib/gall/Makefile
View File

@@ -9,7 +9,7 @@ else
ifeq ($(TERM),cygwin)
INCS+=-I$(TOP)/goldlib/glibc
else
ifeq ($(TERM),MSYS)
ifeq ($(TERM),msys)
INCS+=-I$(TOP)/goldlib/glibc
endif
endif

2
goldlib/gall/gcrcall.h
View File

@@ -52,6 +52,7 @@ extern dword __crc32_table[];
// prototyped unsigned parameters anyway, so we have no problem here.
inline word updCrc16(byte ch, word crc) { return (word)(__crc16_table[byte(crc >> 8)] ^ (crc << 8) ^ (ch)); }
inline word updCrc16c(byte ch, word crc) { return (word)(__crc16_table[byte(crc >> 8) ^ (ch)] ^ (crc << 8)); }
inline dword updCrc32(byte ch, dword crc) { return (dword)(__crc32_table[byte(crc) ^ byte(ch)] ^ (crc >> 8)); }
@@ -68,6 +69,7 @@ const dword CRC32_MASK_CCITT = 0xFFFFFFFFUL;
// Prototypes
word strCrc16(const char* s, bool nocase=true, word mask=CRC16_MASK_NORMAL);
word strCrc16c(const char* s, bool nocase=true, word mask=CRC16_MASK_NORMAL);
dword strCrc32(const char* s, bool nocase=true, dword mask=CRC32_MASK_NORMAL);
dword strHash32(const char* s, bool nocase=true);

20
goldlib/gall/gcrcs16.cpp
View File

@@ -49,5 +49,25 @@ word strCrc16(const char* s, bool __case, word mask) {
}
// ------------------------------------------------------------------
// Generate bugfree CRC-16 of a normal nul-terminated string
word strCrc16c(const char* s, bool __case, word mask) {
word crc = mask;
if(__case) {
while(*s)
crc = updCrc16c(toupper(*s++), crc);
}
else {
while(*s)
crc = updCrc16c(*s++, crc);
}
return crc;
}
// ------------------------------------------------------------------

7
goldlib/gcfg/gedacfg.cpp
View File

@@ -40,7 +40,8 @@ gareafile::gareafile() {
quiet = true;
sharemode = 0;
fidomsgtype = 0;
// fidomsgtype = 0;
fidomsgtype = "";
ra2usersbbs = 0;
squishuserno = 0;
@@ -87,7 +88,7 @@ void AreaCfg::reset() {
groupid = 0;
originno = 0;
board = 0;
msgbase = 0;
basetype = "";
aka.reset();
type = GMB_NONE;
scan = 0;
@@ -139,7 +140,7 @@ AreaCfg& AreaCfg::operator=(const AreaCfg& AC) {
this->groupid = AC.groupid;
this->originno = AC.originno;
this->board = AC.board;
this->msgbase = AC.msgbase;
this->basetype = AC.basetype;
this->aka = AC.aka;
this->type = AC.type;
this->scan = AC.scan;

71
goldlib/gcfg/gedacfg.h
View File

@@ -71,26 +71,6 @@ const uint GMB_NONE = 0x00ff;
const uint GMB_DEFAULT = 0xf00f;
// ------------------------------------------------------------------
// Msgbase types
const uint GMB_HUDSON = 0x0001;
const uint GMB_GOLDBASE = 0x0002;
const uint GMB_JAM = 0x0004;
const uint GMB_SQUISH = 0x0008;
const uint GMB_OPUS = 0x0010;
const uint GMB_FTS1 = 0x0020;
const uint GMB_FIDO = 0x0030;
const uint GMB_EZYCOM = 0x0040;
const uint GMB_PCBOARD = 0x0080;
const uint GMB_WILDCAT = 0x0100;
const uint GMB_ADEPTXBBS = 0x0200;
const uint GMB_MAILBOX = 0x1000;
const uint GMB_NEWSSPOOL = 0x2000;
const uint GMB_SEPARATOR = 0x8000;
const uint GMB_SMB = 0x10000;
// ------------------------------------------------------------------
class AreaCfgBase {
@@ -102,7 +82,7 @@ public:
int originno; // Origin number
uint board; // Board number (Hudson/Goldbase/Ezycom/PCBoard fmts)
uint type; // Type of msgarea (GMB_xxx)
uint msgbase; // Type of msgbase (GMB_xxx)
const char *basetype; // Type of msgbase
ftn_addr aka; // The AKA to use in the area
ftn_attr attr; // Default attributes
byte scan : 1; // TRUE if listed with AREASCAN
@@ -114,19 +94,7 @@ public:
int setorigin(std::string& origin);
bool isfts1() const { return !!(msgbase & GMB_FTS1); }
bool isopus() const { return !!(msgbase & GMB_OPUS); }
bool isezycom() const { return !!(msgbase & GMB_EZYCOM); }
bool isfido() const { return !!(msgbase & (GMB_FTS1|GMB_OPUS)); }
bool isgoldbase() const { return !!(msgbase & GMB_GOLDBASE); }
bool ishudson() const { return !!(msgbase & GMB_HUDSON); }
bool isjam() const { return !!(msgbase & GMB_JAM); }
bool ispcboard() const { return !!(msgbase & GMB_PCBOARD); }
bool issquish() const { return !!(msgbase & GMB_SQUISH); }
bool iswildcat() const { return !!(msgbase & GMB_WILDCAT); }
bool isadeptxbbs() const { return !!(msgbase & GMB_ADEPTXBBS); }
bool isseparator() const { return !!(msgbase & GMB_SEPARATOR); }
bool issmb() const { return !!(msgbase & GMB_SMB); }
bool isseparator() const { return streql(basetype, "SEPARATOR"); }
bool isnet() const { return !!(type & GMB_NET); }
bool isecho() const { return !!(type & GMB_ECHO); }
@@ -237,7 +205,7 @@ protected:
#endif
#ifndef GCFG_NOWATERGATE
// Watergate parser function
uint gettype(uint msgtype, const byte wtrtype);
const char *gettype(const char *msgtype, const byte wtrtype);
#endif
#ifndef GCFG_NOXMAIL
// XMail parser function
@@ -320,7 +288,7 @@ public:
int quiet;
int sharemode;
int fidomsgtype;
const char *fidomsgtype;
int ra2usersbbs;
int squishuserno;
@@ -468,37 +436,6 @@ void CfgPcboardpath(const char *path, bool force = false);
void CfgSquishuserpath(const char *path, bool force = false);
void CfgFidolastread(const char *path);
// ------------------------------------------------------------------
// Legacy area types
const uint AT_NET = GMB_NET;
const uint AT_EMAIL = GMB_EMAIL;
const uint AT_ECHO = GMB_ECHO;
const uint AT_NEWSGROUP = GMB_NEWSGROUP;
const uint AT_LOCAL = GMB_LOCAL;
const uint AT_QWK = GMB_QWK;
const uint AT_SOUP = GMB_SOUP;
// ------------------------------------------------------------------
// Legacy msgbase types
const uint MT_HUDSON = GMB_HUDSON;
const uint MT_GOLDBASE = GMB_GOLDBASE;
const uint MT_JAM = GMB_JAM;
const uint MT_SQUISH = GMB_SQUISH;
const uint MT_OPUS = GMB_OPUS;
const uint MT_FTS1 = GMB_FTS1;
const uint MT_FIDO = GMB_FIDO;
const uint MT_EZYCOM = GMB_EZYCOM;
const uint MT_PCBOARD = GMB_PCBOARD;
const uint MT_WILDCAT = GMB_WILDCAT;
const uint MT_ADEPTXBBS = GMB_ADEPTXBBS;
const uint MT_MAILBOX = GMB_MAILBOX;
const uint MT_NEWSSPOOL = GMB_NEWSSPOOL;
const uint MT_SEPARATOR = GMB_SEPARATOR;
const uint MT_SMB = GMB_SMB;
// ------------------------------------------------------------------

10
goldlib/gcfg/gxareas.cpp
View File

@@ -60,21 +60,21 @@ void gareafile::ReadAreasBBS(char* tag) {
aa.attr = attribsecho;
aa.board = atoi(path);
if(aa.board and (aa.board < 201))
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
else if((aa.board > 200) and (aa.board < 501))
aa.msgbase = GMB_GOLDBASE;
aa.basetype = "GOLDBASE";
else if(*path == '$') {
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
adjustpath(path+1);
aa.setpath(path+1);
}
else if(*path == '!') {
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
adjustpath(path+1);
aa.setpath(path+1);
}
else {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
adjustpath(path);
aa.setpath(path);
}

12
goldlib/gcfg/gxcrash.cpp
View File

@@ -148,7 +148,7 @@ void gareafile::ReadCrashmailCfg(const char* file) {
aa.aka = primary_aka;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
jbstrcpy(path, buf, sizeof(Path), &jbcpos);
aa.setpath(path);
aa.setdesc("CrashEcho Netmail");
@@ -162,12 +162,12 @@ void gareafile::ReadCrashmailCfg(const char* file) {
if(aa.type != GMB_NONE) {
if(not unconfirmed)
AddNewArea(aa);
aa.reset();
}
aa.reset();
aa.type = GMB_NONE;
unconfirmed = false;
jbstrcpy(tmp, buf, 100, &jbcpos);
if(strieql(tmp, "DEFAULT") or strnieql(tmp, "DEFAULT_", 8)) {
aa.type = GMB_NONE;
break;
}
switch(crc16) {
@@ -191,13 +191,13 @@ void gareafile::ReadCrashmailCfg(const char* file) {
jbstrcpy(tmp, buf, 10, &jbcpos);
switch(strCrc16(tmp)) {
case CRC_MSG:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
break;
case CRC_JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
break;
case CRC_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
break;
default:
aa.reset();

22
goldlib/gcfg/gxdb.cpp
View File

@@ -68,11 +68,11 @@ void gareafile::ReadDB130(char* tag, char* dbpath) {
aa.reset();
switch(toupper(AA2.msgbase)) {
case 'Q':
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = AA2.board;
break;
case 'F':
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(STRNP2C(AA2.path));
break;
}
@@ -129,11 +129,11 @@ void gareafile::ReadDB1046(char* file, char* tag) {
aa.reset();
switch(toupper(ADF->msgbase)) {
case 'Q':
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = ADF->board;
break;
case 'F':
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(STRNP2C(ADF->path));
break;
}
@@ -192,11 +192,11 @@ void gareafile::ReadDB1047A22(char* file, int reclen, char* tag) {
aa.reset();
switch(toupper(ADF->msgbase)) {
case 'Q':
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = ADF->board;
break;
case 'F':
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(STRNP2C(ADF->path));
break;
}
@@ -258,11 +258,11 @@ void gareafile::ReadDB2011(char* file, int reclen, char* tag) {
case 'Q':
if(ADF->board < 1 or ADF->board > 200)
continue; // Bad area number
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = ADF->board;
break;
case 'F':
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(STRNP2C(ADF->path));
break;
}
@@ -384,12 +384,12 @@ void gareafile::ReadDBridge(char* tag) {
aa.type = GMB_NET;
aa.attr = attribsnet;
if(type == 'F') {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(strbtrim(netpath));
}
else if(type == 'Q') {
strtrim(buf);
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = atoi(buf+50);
}
aa.setdesc("D'Bridge Netmail");
@@ -400,7 +400,7 @@ void gareafile::ReadDBridge(char* tag) {
strbtrim(badecho);
if(*badecho) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(badecho);

2
goldlib/gcfg/gxdutch.cpp
View File

@@ -75,7 +75,7 @@ void gareafile::ReadDutchie(char* tag) {
if(*ptr != ';' and *ptr != '-' and strnicmp(ptr, "PASSTHRU", 8) and *ptr != '\x1A' and *ptr) {
aa.reset();
aa.msgbase = GMB_FTS1;
aa.basetype = "FTS1";
ptr = strtok(ptr, " \t"); // Get path
aa.setpath(ptr);
ptr = strtok(NULL, " \t"); // Get description

17
goldlib/gcfg/gxezy102.cpp
View File

@@ -71,7 +71,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Fido netmail directory
if(not strblank(config->netmailpath)) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka.zone = constant->netaddress[0].zone;
@@ -89,7 +89,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
if(constant->netaddress[n].net) {
if(constant->netmailboard[n]) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka.zone = constant->netaddress[n].zone;
@@ -110,7 +110,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Ezycom watchdog board
if(constant->watchmess) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -126,7 +126,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Ezycom paging board
if(constant->pagemessboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -142,7 +142,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad logon board
if(constant->badpwdmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -158,7 +158,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad qwk board
if(constant->qwkmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka.zone = constant->netaddress[0].zone;
@@ -174,7 +174,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad echomail board
if(constant->badmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka.zone = constant->netaddress[0].zone;
@@ -216,7 +216,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
STRNP2C(messages->originline);
aa.board = record;
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.groupid = messages->areagroup;
aa.setorigin(*messages->originline ? messages->originline : config->defaultorigin);
@@ -235,6 +235,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
default:
aa.type = GMB_ECHO;
aa.attr = attribsecho;
break;
}
switch(messages->msgkinds) {

16
goldlib/gcfg/gxezy110.cpp
View File

@@ -72,7 +72,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Fido netmail directory
if(not strblank(config->netmailpath)) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka.zone = constant->netaddress[0].zone;
@@ -90,7 +90,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
if(constant->netaddress[n].net) {
if(constant->netmailboard[n]) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka.zone = constant->netaddress[n].zone;
@@ -111,7 +111,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Ezycom watchdog board
if(constant->watchmess) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -127,7 +127,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Ezycom paging board
if(constant->pagemessboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -143,7 +143,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad logon board
if(constant->badpwdmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.aka.zone = constant->netaddress[0].zone;
@@ -159,7 +159,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad qwk board
if(constant->qwkmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka.zone = constant->netaddress[0].zone;
@@ -175,7 +175,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
// Ezycom bad echomail board
if(constant->badmsgboard) {
aa.reset();
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka.zone = constant->netaddress[0].zone;
@@ -217,7 +217,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
STRNP2C(messages->originline);
aa.board = record;
aa.msgbase = GMB_EZYCOM;
aa.basetype = "EZYCOM";
aa.groupid = messages->areagroup;
aa.setorigin(*messages->originline ? messages->originline : config->defaultorigin);

8
goldlib/gcfg/gxfd.cpp
View File

@@ -98,7 +98,7 @@ void gareafile::ReadFrontDoor(char* tag) {
aa.aka = shared->aka[0];
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.attr.r_o(editor->netfolderflags & EDREADONLY);
aa.attr.pvt(editor->msgbits & MSGPRIVATE);
aa.attr.cra(editor->msgbits & MSGCRASH);
@@ -132,15 +132,15 @@ void gareafile::ReadFrontDoor(char* tag) {
aa.attr = (behave & FOLDER_ECHOMAIL) ? attribsecho : attribslocal;
aa.attr.r_o(behave & FOLDER_READONLY);
if(behave & FOLDER_HMB) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = folder->board;
}
else if(behave & FOLDER_JAM) {
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(folder->path);
}
else {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(folder->path);
}
if(behave & FOLDER_PRIVATE)

10
goldlib/gcfg/gxfecho4.cpp
View File

@@ -79,7 +79,7 @@ void gareafile::ReadFastecho11x(int fh) {
aa.aka = CAST(ftn_addr, aka[0].main);
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(cfg->NetMPath);
aa.setdesc("FastEcho Netmail");
aa.setautoid("NETMAIL");
@@ -93,19 +93,19 @@ void gareafile::ReadFastecho11x(int fh) {
aa.aka = CAST(ftn_addr, aka[area->flags.aka].main);
switch(area->flags.type) {
case QBBS:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->board;
break;
case FIDO:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(area->path);
break;
case SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(area->path);
break;
case JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(area->path);
break;
case PT_BOARD:

10
goldlib/gcfg/gxfecho5.cpp
View File

@@ -79,7 +79,7 @@ void gareafile::ReadFastecho141(int fh) {
aa.aka = CAST(ftn_addr, aka[0].main);
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(cfg->NetMPath);
aa.setdesc("FastEcho Netmail");
aa.setautoid("NETMAIL");
@@ -93,19 +93,19 @@ void gareafile::ReadFastecho141(int fh) {
aa.aka = CAST(ftn_addr, aka[area->flags.aka].main);
switch(area->flags.type) {
case QBBS:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->board;
break;
case FIDO:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(area->path);
break;
case SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(area->path);
break;
case JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(area->path);
break;
case PT_BOARD:

10
goldlib/gcfg/gxfecho6.cpp
View File

@@ -80,7 +80,7 @@ void gareafile::ReadFastecho142(int fh) {
aa.aka = aka[0].main;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(cfg->NetMPath);
aa.setdesc("FastEcho Netmail");
aa.setautoid("NETMAIL");
@@ -97,19 +97,19 @@ void gareafile::ReadFastecho142(int fh) {
switch(area->flags.storage) {
case QBBS:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->board;
break;
case FIDO:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(area->path);
break;
case SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(area->path);
break;
case JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(area->path);
break;
default:

8
goldlib/gcfg/gxfidpcb.cpp
View File

@@ -167,7 +167,7 @@ void gareafile::ReadFidoPCB(char* tag) {
// *.MSG style netmail
aa.reset();
aa.aka = mainaddr;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(mailpath);
@@ -179,7 +179,7 @@ void gareafile::ReadFidoPCB(char* tag) {
if(*netmailpath) {
aa.reset();
aa.aka = mainaddr;
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
aa.type = GMB_NET;
aa.attr = attribsnet;
strcat(AddBackslash(netmailpath), "MATRIX");
@@ -194,7 +194,7 @@ void gareafile::ReadFidoPCB(char* tag) {
if(*lostmailpath) {
aa.reset();
aa.aka = mainaddr;
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
strcat(AddBackslash(lostmailpath), "LOST");
@@ -210,7 +210,7 @@ void gareafile::ReadFidoPCB(char* tag) {
for(int n=0; n<areas; n++,ap++) {
aa.reset();
aa.aka = mainaddr;
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
if(not ap->msgs)

18
goldlib/gcfg/gxfm092.cpp
View File

@@ -49,7 +49,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->netPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->netPath);
@@ -62,7 +62,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->sentPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->sentPath);
@@ -75,7 +75,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->rcvdPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->rcvdPath);
@@ -88,7 +88,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
for(int x=0; x<MAX_AKAS; x++) {
if(cfg->netmailBoard[x] and cfg->netmailBoard[x] < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.board = cfg->netmailBoard[x];
@@ -106,7 +106,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(cfg->recBoard and cfg->recBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->recBoard;
@@ -119,7 +119,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(cfg->badBoard and cfg->badBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->badBoard;
@@ -132,7 +132,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(cfg->dupBoard and cfg->dupBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->dupBoard;
@@ -145,7 +145,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->pmailPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(cfg->pmailPath);
@@ -189,7 +189,7 @@ void gareafile::ReadFMail092(FILE* fp, char* path, char* file, char* options) {
break;
}
aa.board = ar->board;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.setdesc(ar->comment);
aa.setechoid(ar->areaNameOld[0] ? ar->areaNameOld : ar->areaName);
aa.setorigin(ar->originLine);

20
goldlib/gcfg/gxfm100.cpp
View File

@@ -50,7 +50,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->netPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->netPath);
@@ -63,7 +63,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->sentPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->sentPath);
@@ -76,7 +76,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->rcvdPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->rcvdPath);
@@ -89,7 +89,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
for(int x=0; x<MAX_NETAKAS; x++) {
if(cfg->netmailBoard[x] and cfg->netmailBoard[x] < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.board = cfg->netmailBoard[x];
@@ -107,7 +107,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(cfg->recBoard and cfg->recBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->recBoard;
@@ -120,7 +120,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(cfg->badBoard and cfg->badBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->badBoard;
@@ -133,7 +133,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(cfg->dupBoard and cfg->dupBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->dupBoard;
@@ -146,7 +146,7 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->pmailPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(cfg->pmailPath);
@@ -209,11 +209,11 @@ void gareafile::ReadFMail098(FILE* fp, char* path, char* file, char* options) {
}
if(ar->board) {
aa.board = ar->board;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
}
else if(*ar->msgBasePath) {
aa.setpath(ar->msgBasePath);
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
}
aa.setdesc(ar->comment);

20
goldlib/gcfg/gxfm116.cpp
View File

@@ -50,7 +50,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->netPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->netPath);
@@ -63,7 +63,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->sentPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->sentPath);
@@ -76,7 +76,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->rcvdPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(cfg->rcvdPath);
@@ -89,7 +89,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
for(int x=0; x<MAX_NETAKAS; x++) {
if(cfg->netmailBoard[x] and cfg->netmailBoard[x] < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.board = cfg->netmailBoard[x];
@@ -107,7 +107,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(cfg->recBoard and cfg->recBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->recBoard;
@@ -120,7 +120,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(cfg->badBoard and cfg->badBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->badBoard;
@@ -133,7 +133,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(cfg->dupBoard and cfg->dupBoard < 201) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = cfg->dupBoard;
@@ -146,7 +146,7 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
if(not strblank(cfg->pmailPath)) {
aa.reset();
aa.aka = cfg->akaList[0].nodeNum;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(cfg->pmailPath);
@@ -213,11 +213,11 @@ void gareafile::ReadFMail116(FILE* fp, char* path, char* file, char* options) {
}
if(ar->board) {
aa.board = ar->board;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
}
else if(*ar->msgBasePath) {
aa.setpath(ar->msgBasePath);
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
}
aa.setdesc(ar->comment);

50
goldlib/gcfg/gxgecho.cpp
View File

@@ -105,11 +105,11 @@ void gareafile::ReadGEcho(char* tag) {
CfgHudsonpath(gesetup->hmbpath);
CfgJampath(gesetup->jampath);
int _fidomsgtype = fidomsgtype;
const char *_fidomsgtype = fidomsgtype;
if(ge_version >= 102) {
_fidomsgtype = (gesetup->extraoptions & OPUSDATES) ? GMB_OPUS : GMB_FTS1;
if((_fidomsgtype == GMB_FTS1) and (fidomsgtype == GMB_OPUS)) {
_fidomsgtype = (gesetup->extraoptions & OPUSDATES) ? "OPUS" : "FTS1";
if((streql(_fidomsgtype, "FTS1")) and (streql(fidomsgtype, "OPUS"))) {
std::cout <<
"* Warning - FTS-1 format is used for *.MSG. For better compatibility set this" << std::endl <<
"* in GSETUP: Miscellanous->GEcho Options->MSG compatibilty = Opus (not Fido)." << std::endl <<
@@ -127,7 +127,7 @@ void gareafile::ReadGEcho(char* tag) {
// Old netmail board (no longer in use by GEcho, but just in case...)
if(gesetup->oldnetmailboard and gesetup->oldnetmailboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[0];
@@ -138,7 +138,7 @@ void gareafile::ReadGEcho(char* tag) {
}
else if(not strblank(gesetup->mailpath)) {
aa.reset();
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[0];
@@ -152,7 +152,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _badboard = (ge_version >= 110) ? gesetup->badarea : gesetup->oldbadboard;
if(_badboard and _badboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = _badboard;
@@ -163,7 +163,7 @@ void gareafile::ReadGEcho(char* tag) {
}
else if(not strblank(gesetup->badecho_path)) {
aa.reset();
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka = _aka[0];
@@ -179,7 +179,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _dupboard = (ge_version >= 110) ? gesetup->reserved5 : gesetup->olddupboard;
if(_dupboard and _dupboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = _dupboard;
@@ -193,7 +193,7 @@ void gareafile::ReadGEcho(char* tag) {
// Recovery
if(gesetup->recoveryboard and gesetup->recoveryboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = gesetup->recoveryboard;
@@ -207,7 +207,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _rcvdboard = (ge_version >= 110) ? gesetup->rcvdarea : gesetup->oldrcvdboard;
if(_rcvdboard and _rcvdboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = _rcvdboard;
@@ -218,7 +218,7 @@ void gareafile::ReadGEcho(char* tag) {
}
else if(not strblank(gesetup->rcvdmailpath)) {
aa.reset();
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[0];
@@ -232,7 +232,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _sentboard = (ge_version >= 110) ? gesetup->sentarea : gesetup->oldsentboard;
if(gesetup->oldsentboard and gesetup->oldsentboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.board = _sentboard;
@@ -243,7 +243,7 @@ void gareafile::ReadGEcho(char* tag) {
}
else if(not strblank(gesetup->sentmailpath)) {
aa.reset();
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[0];
@@ -259,7 +259,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _persmailboard = (ge_version >= 110) ? gesetup->persmailarea[u] : gesetup->oldpersmailboard[u];
if(_persmailboard and _persmailboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka = _aka[0];
@@ -276,7 +276,7 @@ void gareafile::ReadGEcho(char* tag) {
// Personal mail
if(not strblank(gesetup->persmail_path)) {
aa.reset();
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka = _aka[0];
@@ -292,7 +292,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _userboard = (ge_version >= 110) ? gesetup->userarea[u] : gesetup->olduserboard[u];
if(_userboard and _userboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[0];
@@ -312,7 +312,7 @@ void gareafile::ReadGEcho(char* tag) {
uint _akaboard = (ge_version >= 110) ? gesetup->akaarea[a] : gesetup->oldakaboard[a];
if(_aka[a].net and _akaboard and _akaboard < 201) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = _aka[a];
@@ -355,39 +355,39 @@ void gareafile::ReadGEcho(char* tag) {
switch(area->areaformat) {
case FORMAT_HMB:
if(area->areanumber and area->areanumber < 201) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->areanumber;
break;
}
continue;
case FORMAT_SDM:
if(not strblank(area->path)) {
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.setpath(area->path);
break;
}
continue;
case FORMAT_JAM:
if(not strblank(area->path)) {
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(area->path);
break;
}
continue;
case FORMAT_SQUISH:
if(not strblank(area->path)) {
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(area->path);
break;
}
continue;
case FORMAT_PCB:
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
aa.board = area->areanumber;
aa.setpath(area->path);
break;
case FORMAT_WC:
aa.msgbase = GMB_WILDCAT;
aa.basetype = "WILDCAT";
aa.board = area->areanumber;
aa.setpath(area->path);
break;
@@ -395,11 +395,11 @@ void gareafile::ReadGEcho(char* tag) {
if(ge_version >= 102)
continue;
if(area->areanumber and area->areanumber < 201) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->areanumber;
}
else if((area->options & SDM) and not strblank(area->path)) {
aa.msgbase = _fidomsgtype;
aa.basetype = _fidomsgtype;
aa.setpath(area->path);
}
}

24
goldlib/gcfg/gxhpt.cpp
View File

@@ -182,7 +182,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
aa.reset();
aa.type = GMB_NONE;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.groupid = group;
std::string s;
@@ -244,7 +244,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
case CRC_ECHOAREADEFAULTS:
echoareadefaults.reset();
aa.type = GMB_DEFAULT;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.groupid = group;
break;
}
@@ -277,11 +277,11 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
while((*key == '-') or strieql(key, "Squish") or strieql(key, "Jam") or strieql(key, "MSG")) {
if(strieql(key, "Squish"))
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
else if(strieql(key, "Jam"))
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
else if(strieql(key, "MSG"))
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
else {
char *opt = key + 1;
@@ -341,20 +341,20 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
switch(aa.type) {
case GMB_NET:
aa.attr = attribsnet;
if(aa.msgbase == 0)
aa.msgbase = fidomsgtype;
if(*aa.basetype == '\0')
aa.basetype = fidomsgtype;
AddNewArea(aa);
break;
case GMB_ECHO:
aa.attr = attribsecho;
if(aa.msgbase == 0)
aa.msgbase = fidomsgtype;
if(*aa.basetype == '\0')
aa.basetype = fidomsgtype;
AddNewArea(aa);
break;
case GMB_LOCAL:
aa.attr = attribslocal;
if(aa.msgbase == 0)
aa.msgbase = fidomsgtype;
if(*aa.basetype == '\0')
aa.basetype = fidomsgtype;
AddNewArea(aa);
break;
case GMB_DEFAULT:
@@ -417,7 +417,7 @@ void gareafile::ReadHPT(char* tag) {
CfgJAMSMAPIHighwater(true);
echoareadefaults.type = GMB_NONE;
echoareadefaults.msgbase = fidomsgtype;
echoareadefaults.basetype = fidomsgtype;
echoareadefaults.groupid = defaultgroup;
ReadHPTFile(path, file, origin, defaultgroup);

10
goldlib/gcfg/gximail4.cpp
View File

@@ -58,7 +58,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
// Fido netmail
if(not strblank(CF->netmail)) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = CAST(ftn_addr, CF->aka[0]);
@@ -86,22 +86,22 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
switch(AR.msg_base_type & BASEMASK) {
case MSGTYPE_SDM:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_HUDSON:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {

10
goldlib/gcfg/gximail5.cpp
View File

@@ -68,7 +68,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
// Fido netmail
if(not strblank(CF->netmail)) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = CAST(ftn_addr, CF->aka[0]);
@@ -96,22 +96,22 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
switch(AR.msg_base_type & BASEMASK) {
case MSGTYPE_SDM:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_HUDSON:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {

10
goldlib/gcfg/gximail6.cpp
View File

@@ -68,7 +68,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
// Fido netmail
if(not strblank(CF->netmail)) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = CAST(ftn_addr, CF->aka[0]);
@@ -96,22 +96,22 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
switch(AR.msg_base_type & BASEMASK) {
case MSGTYPE_SDM:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
strcpy(aa.path, AR.msg_path);
break;
case MSGTYPE_HUDSON:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
if((AR.brd >= 1) and (AR.brd <= 200))
aa.board = AR.brd;
else {

35
goldlib/gcfg/gxinter.cpp
View File

@@ -83,7 +83,7 @@ void gareafile::ReadInterMail(char* tag) {
aa.reset();
aa.aka = CAST(ftn_addr, ctl->t.newaka[0]);
aa.type = GMB_NET;
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.attr.pvt(ctl->e.msgbits & MSGPRIVATE);
aa.attr.cra(ctl->e.msgbits & MSGCRASH);
aa.attr.k_s(ctl->e.msgbits & MSGKILL);
@@ -97,10 +97,10 @@ void gareafile::ReadInterMail(char* tag) {
aa.aka = CAST(ftn_addr, ctl->t.newaka[ctl->e.dupes.useaka]);
aa.type = GMB_ECHO;
switch(ctl->e.dupes.ftype) {
case F_MSG: aa.msgbase = GMB_OPUS; break;
case F_HUDSON: aa.msgbase = GMB_HUDSON; break;
case F_PCB15: aa.msgbase = GMB_PCBOARD; break;
case F_JAM: aa.msgbase = GMB_JAM; break;
case F_MSG: aa.basetype = "OPUS"; break;
case F_HUDSON: aa.basetype = "HUDSON"; break;
case F_PCB15: aa.basetype = "PCBOARD"; break;
case F_JAM: aa.basetype = "JAM"; break;
}
aa.attr.r_o(ctl->e.dupes.behave & EDREADONLY);
aa.board = ctl->e.dupes.board;
@@ -114,10 +114,10 @@ void gareafile::ReadInterMail(char* tag) {
aa.aka = CAST(ftn_addr, ctl->t.newaka[ctl->e.badecho.useaka]);
aa.type = GMB_ECHO;
switch(ctl->e.badecho.ftype) {
case F_MSG: aa.msgbase = GMB_OPUS; break;
case F_HUDSON: aa.msgbase = GMB_HUDSON; break;
case F_PCB15: aa.msgbase = GMB_PCBOARD; break;
case F_JAM: aa.msgbase = GMB_JAM; break;
case F_MSG: aa.basetype = "OPUS"; break;
case F_HUDSON: aa.basetype = "HUDSON"; break;
case F_PCB15: aa.basetype = "PCBOARD"; break;
case F_JAM: aa.basetype = "JAM"; break;
}
aa.attr.r_o(ctl->e.badecho.behave & EDREADONLY);
aa.board = ctl->e.badecho.board;
@@ -143,10 +143,10 @@ void gareafile::ReadInterMail(char* tag) {
aa.reset();
switch(_folder->ftype) {
case F_MSG: aa.msgbase = GMB_OPUS; break;
case F_HUDSON: aa.msgbase = GMB_HUDSON; break;
case F_PCB15: aa.msgbase = GMB_PCBOARD; break;
case F_JAM: aa.msgbase = GMB_JAM; break;
case F_MSG: aa.basetype = "OPUS"; break;
case F_HUDSON: aa.basetype = "HUDSON"; break;
case F_PCB15: aa.basetype = "PCBOARD"; break;
case F_JAM: aa.basetype = "JAM"; break;
default: continue;
}
long _behave = _folder->behave;
@@ -195,11 +195,14 @@ void gareafile::ReadInterMail(char* tag) {
aa.type = GMB_LOCAL;
else if(_behave & ECHOMAIL)
aa.type = GMB_ECHO;
aa.msgbase = (_behave & BOARDTYPE) ? GMB_HUDSON : GMB_OPUS;
if(aa.msgbase == GMB_HUDSON)
if(_behave & BOARDTYPE) {
aa.basetype = "HUDSON";
aa.board = _folder->board;
else
}
else {
aa.basetype = "OPUS";
aa.setpath(_folder->path);
}
aa.attr.pvt(_behave & PRIVATE);
aa.attr.r_o(_behave & READONLY);
aa.setdesc(_folder->title);

16
goldlib/gcfg/gxlora.cpp
View File

@@ -84,7 +84,7 @@ void gareafile::ReadLoraBBS(char* tag) {
// Netmail *.MSG
if(not strblank(cfg->netmail_dir)) {
aa.reset();
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.type = GMB_NET;
aa.aka = CAST(ftn_addr, cfg->alias[0]);
aa.setpath(cfg->netmail_dir);
@@ -96,7 +96,7 @@ void gareafile::ReadLoraBBS(char* tag) {
// Bad *.MSG
if(not strblank(cfg->bad_msgs)) {
aa.reset();
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.type = GMB_ECHO;
aa.aka = CAST(ftn_addr, cfg->alias[0]);
aa.setpath(cfg->bad_msgs);
@@ -108,7 +108,7 @@ void gareafile::ReadLoraBBS(char* tag) {
// Dupes *.MSG
if(not strblank(cfg->dupes)) {
aa.reset();
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.type = GMB_ECHO;
aa.aka = CAST(ftn_addr, cfg->alias[0]);
aa.setpath(cfg->dupes);
@@ -120,7 +120,7 @@ void gareafile::ReadLoraBBS(char* tag) {
// Personal mail *.MSG
if(cfg->save_my_mail and not strblank(cfg->my_mail)) {
aa.reset();
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.type = GMB_ECHO;
aa.aka = CAST(ftn_addr, cfg->alias[0]);
aa.setpath(cfg->my_mail);
@@ -147,11 +147,11 @@ void gareafile::ReadLoraBBS(char* tag) {
aa.reset();
if(sysmsg->gold_board) {
aa.msgbase = GMB_GOLDBASE;
aa.basetype = "GOLDBASE";
aa.board = sysmsg->gold_board;
}
else if(sysmsg->quick_board) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = sysmsg->quick_board;
}
else if(sysmsg->pip_board) {
@@ -159,11 +159,11 @@ void gareafile::ReadLoraBBS(char* tag) {
continue;
}
else if(sysmsg->squish) {
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(sysmsg->msg_path);
}
else {
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.setpath(sysmsg->msg_path);
}

4
goldlib/gcfg/gxmax3.cpp
View File

@@ -114,10 +114,10 @@ void gareafile::ReadMaximus3(char* mxpath, char* areafile, char* options) {
aa.reset();
switch(area->type) {
case MSGTYPE_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
break;
case MSGTYPE_SDM:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
break;
default:
continue;

2
goldlib/gcfg/gxme2.cpp
View File

@@ -72,7 +72,7 @@ void gareafile::ReadME2(char* tag) {
aa.reset();
aa.type = GMB_LOCAL;
aa.attr = attribslocal;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
ptr = strskip_wht(ptr+5);
ptr2 = strskip_to(++ptr, '\'');
if(*ptr2) *ptr2++ = NUL;

4
goldlib/gcfg/gxopus.cpp
View File

@@ -102,7 +102,7 @@ void gareafile::ReadOpus(char* tag) {
fseek(fp, (long)msgsys.Scan_Len*(long)sizeof(struct _ascan), SEEK_CUR);
fseek(fp, (long)msgsys.Other_Len, SEEK_CUR);
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = ((msgsys.Attrib & SYSMAIL) ? GMB_NET : (msgsys.Attrib & _ECHOMAIL) ? GMB_ECHO : GMB_LOCAL);
aa.attr = ((msgsys.Attrib & SYSMAIL) ? attribsnet : (msgsys.Attrib & _ECHOMAIL) ? attribsecho : attribslocal);
aa.setechoid(*msgsys.Echo_Name ? msgsys.Echo_Name : msgsys.Area_Name);
@@ -140,7 +140,7 @@ void gareafile::ReadOpus(char* tag) {
fread(&sysdat, sizeof(_systemdat), 1, fp);
if(*sysdat.msgpath and *sysdat.msgtitle) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(sysdat.msgpath);
aa.setdesc(sysdat.msgtitle);
aa.setechoid(sysdat.EchoName);

4
goldlib/gcfg/gxpcb.cpp
View File

@@ -224,7 +224,7 @@ void gareafile::ReadPCBoard(char* tag) {
strcpy(netmailpath, dir3->outgoing_msg);
if(*netmailpath) {
aa.reset();
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
if(fido_version == 2)
@@ -269,7 +269,7 @@ void gareafile::ReadPCBoard(char* tag) {
fp2.fread(_cnamesadd, sizeof(PcbAddConf));
if(*_cnames->name and *_cnames->msgfile) {
aa.reset();
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
switch(_cnamesadd->conftype) {
case PCBCONFTYPE_EMAIL:
case PCBCONFTYPE_USENETMOD:

10
goldlib/gcfg/gxportal.cpp
View File

@@ -97,7 +97,7 @@ void gareafile::ReadPortal(char* tag) {
if(popcfg->MailScanner.NetMailBoard and popcfg->MailScanner.NetMailBoard < 201) {
aa.reset();
aa.aka = CAST(ftn_addr, popcfg->Adresses[popcfg->MainAdrNum]);
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.board = popcfg->MailScanner.NetMailBoard;
@@ -108,7 +108,7 @@ void gareafile::ReadPortal(char* tag) {
else if(not strblank(popcfg->MailScanner.NetMailDir)) {
aa.reset();
aa.aka = CAST(ftn_addr, popcfg->Adresses[popcfg->MainAdrNum]);
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.setpath(popcfg->MailScanner.NetMailDir);
@@ -121,7 +121,7 @@ void gareafile::ReadPortal(char* tag) {
if(not strblank(popcfg->MailScanner.BadMsgs)) {
aa.reset();
aa.aka = CAST(ftn_addr, popcfg->Adresses[popcfg->MainAdrNum]);
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(popcfg->MailScanner.BadMsgs);
@@ -134,7 +134,7 @@ void gareafile::ReadPortal(char* tag) {
if(not strblank(popcfg->MailScanner.SaveDupesDir)) {
aa.reset();
aa.aka = CAST(ftn_addr, popcfg->Adresses[popcfg->MainAdrNum]);
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.setpath(popcfg->MailScanner.SaveDupesDir);
@@ -159,7 +159,7 @@ void gareafile::ReadPortal(char* tag) {
aa.aka = CAST(ftn_addr, poparea->UsedAka ? popcfg->Adresses[popcfg->MainAdrNum] : popcfg->Adresses[poparea->UsedAka]);
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setdesc(STRNP2C(poparea->Description));
aa.setechoid(STRNP2C(poparea->EchoNames[0]));
aa.setorigin(STRNP2C(poparea->Origin));

8
goldlib/gcfg/gxprobrd.cpp
View File

@@ -122,19 +122,19 @@ void gareafile::ReadProBoard(char* tag) {
aa.attr.pvt1();
switch(area->msgbasetype) {
case MSGBASE_HUDSON:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = area->areanum;
break;
case MSGBASE_SQUISH:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(area->path);
break;
case MSGBASE_SDM:
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
aa.setpath(area->path);
break;
case MSGBASE_JAM:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(area->path);
break;
}

2
goldlib/gcfg/gxqecho.cpp
View File

@@ -68,7 +68,7 @@ void gareafile::ReadQEchoFile(char* file, char* options, char* origin) {
if((ptr = strtok(NULL, " \t")) != NULL)
if(not strieql("Passthrough", ptr)) {
aa.setpath(ptr);
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
if((ptr = strtok(NULL, " \t")) != NULL)
if((*ptr == '*') and ((ptr = strtok(NULL, " \t")) != NULL)) {
CfgAddress(ptr);

2
goldlib/gcfg/gxqfront.cpp
View File

@@ -88,7 +88,7 @@ void gareafile::ReadQFront(char* tag) {
aa.attr = attribsecho;
STRNP2C(area->AreaName);
aa.board = area->ConfNum;
aa.msgbase = GMB_PCBOARD;
aa.basetype = "PCBOARD";
aa.setechoid(area->AreaName);
aa.setorigin(origin->OriginLine[area->OriginLine]);
AddNewArea(aa);

7
goldlib/gcfg/gxquick.cpp
View File

@@ -66,7 +66,7 @@ void gareafile::ReadQ260(char* qbpath, char* origin, char* options) {
aa.reset();
aa.board = n + 1;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.setdesc(STRNP2C(brd[n].Name));
aa.setorigin(*cfg->OriginLine ? cfg->OriginLine : origin);
@@ -160,7 +160,8 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
std::cout << "* Reading " << file << std::endl;
int _recs = (int)(filelength(fileno(fp)) / sizeof(Q276BrdRecT));
int _fmt = (_recs > 200) ? GMB_GOLDBASE : GMB_HUDSON;
// int _fmt = (_recs > 200) ? GMB_GOLDBASE : GMB_HUDSON;
const char *_fmt = (_recs > 200) ? "GOLDBASE" : "HUDSON";
for(int n=0; n<_recs; n++) {
@@ -171,7 +172,7 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
aa.reset();
aa.board = n + 1;
aa.msgbase = _fmt;
aa.basetype = _fmt;
//aa.groupid = brd->Group;
aa.setorigin(*brd->OriginLine ? STRNP2C(brd->OriginLine) : origin);

6
goldlib/gcfg/gxra.cpp
View File

@@ -142,7 +142,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
if(area->Attribute & 0x80) {
aa.setpath(STRNP2C(area->JAMbase));
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
AddNewArea(aa);
}
else {
@@ -150,7 +150,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
aa.board = area->AreaNum;
else
aa.board = n;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
AddNewArea(aa);
}
}
@@ -163,7 +163,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
fread(area, sizeof(_messagesra), 1, fp);
if(*area->name) {
aa.reset();
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = n+1;
aa.aka = CAST(ftn_addr, config->Address[area->akaaddress]);
switch(area->type) {

6
goldlib/gcfg/gxraecho.cpp
View File

@@ -98,14 +98,14 @@ void gareafile::ReadRaEcho(char* tag) {
STRNP2C(area.echoid);
STRNP2C(area.origin);
if(area.isopus and *area.path and stricmp(area.path, "P")) {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(area.path);
}
else if(areano <= 200) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = areano;
}
if(aa.msgbase) {
if(aa.basetype[0] != '\0') {
aa.aka = area.addr;
switch(area.type) {
case RAE_LOCAL:

18
goldlib/gcfg/gxspace.cpp
View File

@@ -39,20 +39,20 @@ static Path SpaceTossAreafile;
void gareafile::ParseSpaceArea(const char *type_path, AreaCfg &aa) {
if(strnieql(type_path, "msg", 3))
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
else if(strnieql(type_path, "hud", 3)) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = atoi(type_path+3);
return;
}
else if(strnieql(type_path, "jam", 3))
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
else if(strnieql(type_path, "sqh", 3))
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
else if(strnieql(type_path, "smb", 3))
aa.msgbase = GMB_SMB;
aa.basetype = "SMB";
else {
aa.msgbase = 0;
aa.basetype = "";
return;
}
aa.setpath(type_path+3);
@@ -145,7 +145,7 @@ void gareafile::ReadSpaceAr(const char* file) {
aa.groupid = toupper(*val);
break;
case CRC_ENDAREA:
if(aa.msgbase)
if(aa.basetype[0] != '\0')
AddNewArea(aa);
aa.reset();
break;
@@ -208,7 +208,7 @@ void gareafile::ReadSpaceNtm(const char* file) {
exportarea = GetYesno(val) ? true : false;
break;
case CRC_ENDNETMAIL:
if(exportarea and aa.msgbase)
if(exportarea and (aa.basetype[0] != '\0'))
AddNewArea(aa);
aa.reset();
break;
@@ -292,7 +292,7 @@ void gareafile::ReadSpaceCtl(const char* file) {
// Get type/path
ParseSpaceArea(val, aa);
if(aa.msgbase) {
if(aa.basetype[0] != '\0') {
AddNewArea(aa);
}
}

6
goldlib/gcfg/gxsquish.cpp
View File

@@ -110,13 +110,13 @@ void gareafile::ReadSquishFile(char* path, char* file, char* options, char* orig
// If not pass-through
if(not striinc("-0", val)) {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.groupid = group;
char* p = val;
while(*p) {
if(strnieql(p, "-$", 2)) {
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
p += 2;
if((tolower(*p) == 'g') and isalpha(p[1])) {
if(isdigit(p[1]))
@@ -132,7 +132,7 @@ void gareafile::ReadSquishFile(char* path, char* file, char* options, char* orig
}
}
else if(strnieql(p, "-f", 2)) {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
p += 2;
}
else if(strnieql(p, "-p", 2)) {

2
goldlib/gcfg/gxsuper.cpp
View File

@@ -114,7 +114,7 @@ void gareafile::ReadSuperBBS(char* tag) {
aa.reset();
aa.board = n + 1;
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.groupid = boards->Group;
aa.setorigin(*config->OriginLine ? config->OriginLine : origin);

2
goldlib/gcfg/gxsync.cpp
View File

@@ -112,7 +112,7 @@ void gareafile::ReadSynchronet(char* tag) {
aa.reset();
aa.type = (sub.misc & SUB_QNET) ? GMB_LOCAL : GMB_ECHO;
aa.attr = attribsecho;
aa.msgbase = GMB_SMB;
aa.basetype = "SMB";
aa.setechoid((sub.misc & SUB_FIDO) ? sub.sname : sub.code);
aa.setdesc(sub.lname);
aa.groupid = 0x8000 + sub.grp;

8
goldlib/gcfg/gxtimed.cpp
View File

@@ -177,13 +177,13 @@ void gareafile::ReadTimedFile(char* path, char* file, char* options, char* origi
aa.board = atoi(key);
if(striinc("-$", val))
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
else if(striinc("-J", val))
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
else if(striinc("-H", val))
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
else
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
const char* ptr2 = striinc("-p", val);
if(ptr2) {

2
goldlib/gcfg/gxtmail.cpp
View File

@@ -75,7 +75,7 @@ void gareafile::ReadTmailFile(char* file, char* options, char* origin) {
aa.reset();
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setdesc("Terminate Netmail");
aa.setautoid("NETMAIL");
adjustpath(val);

6
goldlib/gcfg/gxts.cpp
View File

@@ -95,7 +95,7 @@ void gareafile::ReadTosScan(char* tag) {
aa.reset();
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.attr.r_o(editor->netfolderflags & EDREADONLY);
aa.attr.pvt(editor->msgbits & MSGPRIVATE);
aa.attr.cra(editor->msgbits & MSGCRASH);
@@ -127,11 +127,11 @@ void gareafile::ReadTosScan(char* tag) {
aa.type = GMB_ECHO;
aa.attr = attribsecho;
if(areafile->board) {
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = areafile->board;
}
else {
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(areafile->path);
}
aa.setdesc(areafile->desc);

10
goldlib/gcfg/gxwmail.cpp
View File

@@ -81,7 +81,7 @@ void gareafile::ReadWMail(char* tag) {
aa.aka = wmprm->aka[0].addr;
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
STRNP2C(wmprm->dir.mail);
aa.setpath(wmprm->dir.mail);
aa.setdesc("WMail Netmail");
@@ -94,7 +94,7 @@ void gareafile::ReadWMail(char* tag) {
aa.aka = wmprm->aka[0].addr;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
STRNP2C(wmprm->dir.badecho);
aa.setpath(wmprm->dir.badecho);
aa.setdesc("WMail Bad Msgs Area");
@@ -108,7 +108,7 @@ void gareafile::ReadWMail(char* tag) {
aa.aka = wmprm->aka[0].addr;
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
STRNP2C(wmprm->dir.dupes);
aa.setpath(wmprm->dir.dupes);
aa.setdesc("WMail Dupes Area");
@@ -151,9 +151,9 @@ void gareafile::ReadWMail(char* tag) {
aa.setpath(arprm->path);
aa.board = atoi(aa.path);
if(aa.board and aa.board <= 200)
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
else
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
STRNP2C(arprm->titolo);
STRNP2C(arprm->tag);
aa.setdesc(arprm->titolo);

18
goldlib/gcfg/gxwtr.cpp
View File

@@ -34,15 +34,15 @@
// ------------------------------------------------------------------
uint gareafile::gettype(uint msgtype, const byte wtrtype) {
const char *gareafile::gettype(const char *msgtype, const byte wtrtype) {
switch(wtrtype) {
case 1: return msgtype;
case 2: return GMB_SQUISH;
case 3: return GMB_JAM;
case 4: return GMB_WILDCAT;
case 2: return "SQUISH";
case 3: return "JAM";
case 4: return "WILDCAT";
}
return 0;
return "";
}
@@ -65,7 +65,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
if(c.fidonetmailtype) {
aa.reset();
aa.msgbase = gettype(c.opusdateformat ? GMB_OPUS : GMB_FTS1, c.fidonetmailtype);
aa.basetype = gettype(c.opusdateformat ? "OPUS" : "FTS1", c.fidonetmailtype);
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = CAST(ftn_addr, c.nodenrs[0]);
@@ -77,7 +77,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
if(c.fidobadareatype) {
aa.reset();
aa.msgbase = gettype(c.opusdateformat ? GMB_OPUS : GMB_FTS1, c.fidobadareatype);
aa.basetype = gettype(c.opusdateformat ? "OPUS" : "FTS1", c.fidobadareatype);
aa.type = GMB_ECHO;
aa.attr = attribsecho;
aa.aka = CAST(ftn_addr, c.nodenrs[0]);
@@ -89,7 +89,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
if(c.fidodupeareatype) {
aa.reset();
aa.msgbase = gettype(c.opusdateformat ? GMB_OPUS : GMB_FTS1, c.fidodupeareatype);
aa.basetype = gettype(c.opusdateformat ? "OPUS" : "FTS1", c.fidodupeareatype);
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.aka = CAST(ftn_addr, c.nodenrs[0]);
@@ -128,7 +128,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
continue;
}
aa.msgbase = gettype(c.opusdateformat ? GMB_OPUS : GMB_FTS1, ar->fidomsgstyle);
aa.basetype = gettype(c.opusdateformat ? "OPUS" : "FTS1", ar->fidomsgstyle);
if(in_range(ar->originaka, (byte) 1, (byte) 20))
aa.aka = CAST(ftn_addr, c.nodenrs[ar->originaka-1]);
aa.setpath(strp2c(ar->fidomsgpath));

16
goldlib/gcfg/gxxbbs.cpp
View File

@@ -78,8 +78,12 @@ void gareafile::ReadAdeptXbbsFile(char* path, char* file, char* options) {
break;
case CRC_AREAEND:
aa.setechoid(*usenet ? usenet : name);
sprintf(buf, "%s%s", apath, name);
aa.setpath((aa.msgbase & GMB_FIDO) ? apath : buf);
if(streql(aa.basetype, "OPUS") or streql(aa.basetype, "FTS1"))
aa.setpath(apath);
else {
sprintf(buf, "%s%s", apath, name);
aa.setpath(buf);
}
AddNewArea(aa);
aa.reset();
break;
@@ -116,13 +120,13 @@ void gareafile::ReadAdeptXbbsFile(char* path, char* file, char* options) {
aa.attr = attribslocal;
}
if(flags & M_SQUISH)
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
else if(flags & M_FIDO)
aa.msgbase = GMB_OPUS;
aa.basetype = "OPUS";
else if(flags & M_JAM)
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
else
aa.msgbase = GMB_ADEPTXBBS;
aa.basetype = "ADEPTXBBS";
break;
case CRC_USENET:
strcpy(usenet, val);

10
goldlib/gcfg/gxxmail.cpp
View File

@@ -104,7 +104,7 @@ void gareafile::ReadxMailFile(char* file, char* options) {
aa.reset();
aa.type = GMB_NET;
aa.attr = attribsnet;
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setdesc("xMail Netmail");
aa.setautoid("NETMAIL");
aa.setpath(val);
@@ -178,19 +178,19 @@ void gareafile::ReadXMail(char* tag) {
switch(area.StoreType) {
case FmtHudson:
aa.msgbase = GMB_HUDSON;
aa.basetype = "HUDSON";
aa.board = areano;
break;
case FmtMsg:
aa.msgbase = fidomsgtype;
aa.basetype = fidomsgtype;
aa.setpath(ClipDosFilename(area.MsgDirectory));
break;
case FmtSquish:
aa.msgbase = GMB_SQUISH;
aa.basetype = "SQUISH";
aa.setpath(ClipDosFilename(area.MsgDirectory));
break;
case FmtJam:
aa.msgbase = GMB_JAM;
aa.basetype = "JAM";
aa.setpath(ClipDosFilename(area.MsgDirectory));
break;
default:

42
goldlib/gmb3/gmoarea.h
View File

@@ -81,7 +81,7 @@ public:
int areaid() const { return cfg.areaid; }
int groupid() const { return cfg.groupid; }
uint type() const { return cfg.type; }
uint msgbase() const { return cfg.msgbase; }
const char *basetype() const { return cfg.basetype; }
uint board() const { return cfg.board; }
const ftn_addr& aka() const { return cfg.aka; }
int originno() const { return cfg.originno; }
@@ -103,7 +103,7 @@ public:
void set_areaid(int a) { cfg.areaid = a; }
void set_groupid(int g) { cfg.groupid = g; }
void set_type(uint t) { cfg.type = t; }
void set_msgbase(uint m) { cfg.msgbase = m; }
void set_basetype(const char *m) { cfg.basetype = m; }
void set_board(uint b) { cfg.board = b; }
void set_aka(ftn_addr& a) { cfg.aka = a; }
void set_originno(int o) { cfg.originno = o; }
@@ -125,19 +125,17 @@ public:
// ----------------------------------------------------------------
// Determine msgbase format
int isfts1() const;
int isopus() const;
int isezycom() const;
int isfido() const;
int isgoldbase() const;
int ishudson() const;
int isjam() const;
int ispcboard() const;
int issquish() const;
int issmb() const;
int iswildcat() const;
int isadeptxbbs() const;
int isseparator() const;
bool isseparator() const;
// ----------------------------------------------------------------
// Determine area features
virtual bool issoftdelete() const { return false; }
virtual bool havearrivedstamp() const { return true; }
virtual bool havereceivedstamp() const { return true; }
virtual bool requirehardterm() const { return false; }
virtual bool requiresoftterm() const { return false; }
// ----------------------------------------------------------------
@@ -198,19 +196,7 @@ protected:
// ------------------------------------------------------------------
// Inline implementations
inline int gmo_area::isfts1() const { return cfg.isfts1(); }
inline int gmo_area::isopus() const { return cfg.isopus(); }
inline int gmo_area::isezycom() const { return cfg.isezycom(); }
inline int gmo_area::isfido() const { return cfg.isfido(); }
inline int gmo_area::isgoldbase() const { return cfg.isgoldbase(); }
inline int gmo_area::ishudson() const { return cfg.ishudson(); }
inline int gmo_area::isjam() const { return cfg.isjam(); }
inline int gmo_area::ispcboard() const { return cfg.ispcboard(); }
inline int gmo_area::issquish() const { return cfg.issquish(); }
inline int gmo_area::issmb() const { return cfg.issmb(); }
inline int gmo_area::iswildcat() const { return cfg.iswildcat(); }
inline int gmo_area::isadeptxbbs() const { return cfg.isadeptxbbs(); }
inline int gmo_area::isseparator() const { return cfg.isseparator(); }
inline bool gmo_area::isseparator() const { return cfg.isseparator(); }
inline int gmo_area::isnet() const { return cfg.isnet(); }
inline int gmo_area::isecho() const { return cfg.isecho(); }

3
goldlib/gmb3/gmoezyc.h
View File

@@ -209,6 +209,9 @@ public:
EzycomArea() { wide = NULL; data = NULL; }
virtual ~EzycomArea() {}
virtual bool havereceivedstamp() const { return false; }
virtual bool requiresoftterm() const { return true; }
// ----------------------------------------------------------------
// Messagebase member functions

5
goldlib/gmb3/gmofido.h
View File

@@ -139,6 +139,8 @@ protected:
FidoWide* wide;
FidoData* data;
inline bool isopus() const { return streql(cfg.basetype, "OPUS"); }
void data_open();
void data_close();
@@ -154,6 +156,9 @@ public:
FidoArea() { wide = NULL; data = NULL; }
virtual ~FidoArea() {}
virtual bool havearrivedstamp() const { return isopus() ? true : false; }
virtual bool havereceivedstamp() const { return false; }
// ----------------------------------------------------------------
// Messagebase member functions

24
goldlib/gmb3/gmofido3.cpp
View File

@@ -65,29 +65,27 @@ int FidoArea::load_message(int __mode, gmsg* __msg, FidoHdr& __hdr) {
strxcpy(__msg->to, __hdr.to, 36);
strxcpy(__msg->re, __hdr.re, 72);
__msg->orig.zone = __msg->oorig.zone = __hdr.ftsc.origzone;
__msg->orig.net = __msg->oorig.net = __hdr.orignet;
__msg->orig.node = __msg->oorig.node = __hdr.orignode;
__msg->orig.point = __msg->oorig.point = __hdr.ftsc.origpoint;
__msg->dest.zone = __msg->odest.zone = __hdr.ftsc.destzone;
__msg->dest.net = __msg->odest.net = __hdr.destnet;
__msg->dest.node = __msg->odest.node = __hdr.destnode;
__msg->dest.point = __msg->odest.point = __hdr.ftsc.destpoint;
if(isopus()) {
__msg->orig.zone = __msg->oorig.zone =
__msg->dest.zone = __msg->odest.zone =
__msg->orig.point = __msg->oorig.point =
__msg->dest.point = __msg->odest.point = 0;
}
// Convert datetime
if(isopus()) {
// Convert datetime
__msg->written = FTimeToTime(&__hdr.opus.written);
__msg->arrived = FTimeToTime(&__hdr.opus.arrived);
}
else {
__msg->orig.zone = __msg->oorig.zone = __hdr.ftsc.origzone;
__msg->orig.net = __msg->oorig.net = __hdr.orignet;
__msg->orig.node = __msg->oorig.node = __hdr.orignode;
__msg->orig.point = __msg->oorig.point = __hdr.ftsc.origpoint;
__msg->dest.zone = __msg->odest.zone = __hdr.ftsc.destzone;
__msg->dest.net = __msg->odest.net = __hdr.destnet;
__msg->dest.node = __msg->odest.node = __hdr.destnode;
__msg->dest.point = __msg->odest.point = __hdr.ftsc.destpoint;
__msg->written = __msg->arrived = 0;
}
__msg->written = __msg->written ? __msg->written : FidoTimeToUnix(__hdr.datetime);

3
goldlib/gmb3/gmohuds.h
View File

@@ -292,6 +292,9 @@ public:
_HudsArea() { wide = NULL; }
virtual ~_HudsArea() {}
virtual bool havearrivedstamp() const { return false; }
virtual bool havereceivedstamp() const { return false; }
// ----------------------------------------------------------------
// Messagebase member functions

4
goldlib/gmb3/gmojamm.h
View File

@@ -214,7 +214,7 @@ struct JamSubField {
struct JamIndex {
dword usercrc; // CRC-32 of destination username
ulong hdroffset; // Offset of header in .JHR file
ulong hdroffset; // Offset of header in .JHR file
};
@@ -302,6 +302,8 @@ public:
JamArea() { wide = NULL; data = NULL; just_scanning = false; }
virtual ~JamArea() {}
virtual bool issoftdelete() const { return (wide != NULL) ? not wide->harddelete : true; }
// ----------------------------------------------------------------
// Messagebase member functions

4
goldlib/gmb3/gmopcbd.h
View File

@@ -190,6 +190,10 @@ public:
PcbArea() { wide = NULL; data = NULL; just_scanning = false; }
virtual ~PcbArea() {}
virtual bool havearrivedstamp() const { return false; }
virtual bool havereceivedstamp() const { return false; }
virtual bool requirehardterm() const { return true; }
// ----------------------------------------------------------------
// Messagebase member functions

15
goldlib/gmb3/gmoprot.h
View File

@@ -35,9 +35,6 @@
void EzycomInit(const char* msgbasepath, const char* userbasepath, int userno);
void EzycomExit();
void EzycomWideOpen();
void EzycomWideClose();
// ------------------------------------------------------------------
@@ -45,9 +42,6 @@ void FidoInit(const char* fidolastread, int fidohwmarks, int fidonullfix, int fi
void FidoExit();
void FidoRenumberProgress(const char* s);
void FidoWideOpen();
void FidoWideClose();
// ------------------------------------------------------------------
@@ -75,9 +69,6 @@ void HGWarnRebuild();
void JamInit(const char* jampath, int harddelete, int smapihw);
void JamExit();
void JamWideOpen();
void JamWideClose();
// ------------------------------------------------------------------
@@ -106,18 +97,12 @@ void SMBExit();
void WCatInit(int userno);
void WCatExit();
void WCatWideOpen();
void WCatWideClose();
// ------------------------------------------------------------------
void XbbsInit(const char* path, int userno);
void XbbsExit();
void XbbsWideOpen();
void XbbsWideClose();
// ------------------------------------------------------------------

2
goldlib/gmb3/gmosmb.h
View File

@@ -54,6 +54,8 @@ public:
SMBArea() { data = NULL; }
virtual ~SMBArea() {}
virtual bool issoftdelete() const { return true; }
// ----------------------------------------------------------------
// Messagebase member functions

6
goldlib/gmb3/gmosmb1.cpp
View File

@@ -615,17 +615,17 @@ void SMBArea::save_hdr(int mode, gmsg* msg)
smb_hfield(&smsg, SENDER, strlen(msg->by), msg->by);
strcpy(buf, msg->by);
strlwr(buf);
smsg.idx.from = strCrc16(buf);
smsg.idx.from = strCrc16c(buf);
smb_hfield(&smsg, RECIPIENT, strlen(msg->to), msg->to);
strcpy(buf, msg->to);
strlwr(buf);
smsg.idx.to = strCrc16(buf);
smsg.idx.to = strCrc16c(buf);
smb_hfield(&smsg, SUBJECT, strlen(msg->re), msg->re);
strcpy(buf, msg->re);
strlwr(buf);
smsg.idx.subj = strCrc16(buf);
smsg.idx.subj = strCrc16c(buf);
// calculate maximum possible size of sbody/stail
for(l = 0, fbuf = msg->txt; *fbuf != NUL; l++, fbuf++)

3
goldlib/gmb3/gmowcat.h
View File

@@ -195,6 +195,9 @@ public:
WCatArea() { wide = NULL; data = NULL; }
virtual ~WCatArea() {}
virtual bool issoftdelete() const { return true; }
virtual bool requirehardterm() const { return true; }
// ----------------------------------------------------------------
// Messagebase member functions

24
goldlib/gmb3/gmoxbbs2.cpp
View File

@@ -52,30 +52,6 @@ void XbbsArea::refresh() {
}
// ------------------------------------------------------------------
void XbbsWideOpen() {
GFTRK("XbbsWideOpen");
// Open the personal mail index
GFTRK(NULL);
}
// ------------------------------------------------------------------
void XbbsWideClose() {
GFTRK("XbbsWideClose");
// Close the personal mail index
GFTRK(NULL);
}
// ------------------------------------------------------------------
void XbbsArea::raw_scan(int __keep_index, int __scanpm) {