Fix garbage screen output on Linux
This commit is contained in:
@@ -338,7 +338,7 @@ void gareafile::GetAreasBBS(char* name, char* origin, char* options) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << areafile << std::endl);
|
||||
STD_PRINTNL("* Reading " << areafile);
|
||||
|
||||
bool firstline = true;
|
||||
|
||||
|
@@ -85,7 +85,7 @@ void gareafile::ReadCrashmailCfg(const char* file) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char buf[4000];
|
||||
char key[30];
|
||||
|
@@ -56,7 +56,7 @@ void gareafile::ReadDB130(char* tag, char* dbpath) {
|
||||
setvbuf(fp1, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file1 << std::endl);
|
||||
STD_PRINTNL("* Reading " << file1);
|
||||
|
||||
fp2 = fsopen(file2, "rb", sharemode);
|
||||
if (fp2)
|
||||
@@ -64,7 +64,7 @@ void gareafile::ReadDB130(char* tag, char* dbpath) {
|
||||
setvbuf(fp2, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file2 << std::endl);
|
||||
STD_PRINTNL("* Reading " << file2);
|
||||
|
||||
while(fread(&AA1, sizeof(DB130_AA1), 1, fp1) == 1) {
|
||||
|
||||
@@ -128,7 +128,7 @@ void gareafile::ReadDB1046(char* file, char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(ADF, sizeof(DB1046_ADF), 1, fp) == 1) {
|
||||
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
|
||||
@@ -192,7 +192,7 @@ void gareafile::ReadDB1047A22(char* file, int reclen, char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(ADF, reclen, 1, fp) == 1) {
|
||||
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
|
||||
@@ -257,7 +257,7 @@ void gareafile::ReadDB2011(char* file, int reclen, char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(ADF, reclen, 1, fp) == 1) {
|
||||
if(ADF->allocated and strchr("QFqf", ADF->msgbase)) {
|
||||
@@ -345,7 +345,7 @@ void gareafile::ReadDBridge(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
// Read netmail storage method etc
|
||||
for(line=1; line <= 2; line++)
|
||||
|
@@ -72,7 +72,7 @@ void gareafile::ReadDutchie(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fgets(buf, 255, fp)) {
|
||||
|
||||
|
@@ -55,7 +55,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(constant, sizeof(CONSTANTRECORD), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -196,7 +196,7 @@ void gareafile::ReadEzycom102(FILE* fp, char* path, char* file, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
int record = 1;
|
||||
|
||||
|
@@ -56,7 +56,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(constant, sizeof(CONSTANTRECORD), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -197,7 +197,7 @@ void gareafile::ReadEzycom110(FILE* fp, char* path, char* file, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
int record = 1;
|
||||
|
||||
@@ -315,7 +315,7 @@ void gareafile::ReadEzycom(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char _verstr[9];
|
||||
fread(_verstr, 9, 1, fp);
|
||||
@@ -325,7 +325,7 @@ void gareafile::ReadEzycom(char* tag) {
|
||||
|
||||
if (strnicmp(_verstr, "1.02", 4) < 0)
|
||||
{
|
||||
STD_PRINT("* Error: Ezycom v" << _verstr << " is not supported - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: Ezycom v" << _verstr << " is not supported - Skipping.");
|
||||
return;
|
||||
}
|
||||
else if(strnicmp(_verstr, "1.10", 4) >= 0)
|
||||
|
@@ -86,7 +86,7 @@ void gareafile::ReadFrontDoor(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(buf, 5, 1, fp);
|
||||
if(streql(buf, "JoHo")) { // Check to see that it is v1.99b or higher
|
||||
@@ -126,7 +126,7 @@ void gareafile::ReadFrontDoor(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(folder, sizeof(FD_Folder), 1, fp) == 1) {
|
||||
behave = folder->behave;
|
||||
|
@@ -199,7 +199,7 @@ void gareafile::ReadFastecho(char* tag) {
|
||||
if (fh != -1)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
read(fh, &revision, sizeof(revision));
|
||||
lseek(fh, 0L, SEEK_SET); // rewind
|
||||
@@ -211,7 +211,7 @@ void gareafile::ReadFastecho(char* tag) {
|
||||
else if(revision == 6)
|
||||
ReadFastecho142(fh);
|
||||
else
|
||||
STD_PRINT("* Error: FastEcho system file revision level " << revision << " is not supported - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: FastEcho system file revision level " << revision << " is not supported - Skipping.");
|
||||
|
||||
close(fh);
|
||||
}
|
||||
|
@@ -94,7 +94,7 @@ void gareafile::ReadFidoPCB(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
int areas = 0;
|
||||
fparea* area = NULL;
|
||||
|
@@ -305,7 +305,7 @@ void gareafile::ReadFMail(char* tag) {
|
||||
else
|
||||
{
|
||||
char buff[56+sizeof(uint)*2];
|
||||
sprintf(buff, "* Error: Unknown FMail config revision %04Xh - Skipping.\n", ar_rev);
|
||||
sprintf(buff, "* Error: Unknown FMail config revision %04Xh - Skipping." NL, ar_rev);
|
||||
STD_PRINT(buff);
|
||||
}
|
||||
}
|
||||
|
@@ -91,7 +91,7 @@ void gareafile::ReadGEcho(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(&sysrev, sizeof(word), 1, fp);
|
||||
rewind(fp);
|
||||
@@ -116,9 +116,9 @@ void gareafile::ReadGEcho(char* tag) {
|
||||
_fidomsgtype = (gesetup->extraoptions & OPUSDATES) ? "OPUS" : "FTS1";
|
||||
if((streql(_fidomsgtype, "FTS1")) and (streql(fidomsgtype, "OPUS")))
|
||||
{
|
||||
STD_PRINT("* Warning - FTS-1 format is used for *.MSG. For better compatibility set this" << std::endl);
|
||||
STD_PRINT("* in GSETUP: Miscellanous->GEcho Options->MSG compatibilty = Opus (not Fido)." << std::endl);
|
||||
STD_PRINT("* To disable this warning, set FIDOMSGTYPE FTS1 in your GoldED setup." << std::endl);
|
||||
STD_PRINTNL("* Warning - FTS-1 format is used for *.MSG. For better compatibility set this");
|
||||
STD_PRINTNL("* in GSETUP: Miscellanous->GEcho Options->MSG compatibilty = Opus (not Fido).");
|
||||
STD_PRINTNL("* To disable this warning, set FIDOMSGTYPE FTS1 in your GoldED setup.");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -341,7 +341,7 @@ void gareafile::ReadGEcho(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(&ahdr, sizeof(AREAFILE_HDR), 1, fp);
|
||||
uint arearecsize = (ahdr.maxconnections * sizeof(CONNECTION)) + ahdr.recsize;
|
||||
@@ -442,7 +442,7 @@ void gareafile::ReadGEcho(char* tag) {
|
||||
}
|
||||
}
|
||||
else
|
||||
STD_PRINT("* Error: GEcho system file revision level " << sysrev << " is not supported - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: GEcho system file revision level " << sysrev << " is not supported - Skipping.");
|
||||
}
|
||||
throw_free(gesetup);
|
||||
}
|
||||
|
@@ -183,7 +183,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
aa.type = GMB_NONE;
|
||||
@@ -208,7 +208,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
|
||||
sscanf(val, "%d.%d", &ver_maj, &ver_min);
|
||||
if ((ver_maj != 0) and (ver_min != 15))
|
||||
{
|
||||
STD_PRINT("* Error: Unknown fidoconfig version " << ver_maj << '.' << ver_min << " - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: Unknown fidoconfig version " << ver_maj << '.' << ver_min << " - Skipping.");
|
||||
throw_xfree(alptr);
|
||||
goto skip_config;
|
||||
}
|
||||
|
@@ -51,7 +51,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(CF, sizeof(im_config_type), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -80,7 +80,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(&AR, sizeof(areas_record_type), 1, fp) == 1) {
|
||||
|
||||
@@ -111,7 +111,7 @@ void gareafile::ReadIMail160(char* options, char* file, char* impath) {
|
||||
aa.board = AR.brd;
|
||||
else
|
||||
{
|
||||
STD_PRINT("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping.");
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
|
@@ -61,7 +61,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(CF, sizeof(im_config_type), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -90,7 +90,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(&AR, sizeof(areas_record_type), 1, fp) == 1) {
|
||||
|
||||
@@ -121,7 +121,7 @@ void gareafile::ReadIMail170(char* options, char* file, char* impath) {
|
||||
aa.board = AR.brd;
|
||||
else
|
||||
{
|
||||
STD_PRINT("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping.");
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
|
@@ -61,7 +61,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(CF, sizeof(im_config_type), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -90,7 +90,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(&AR, sizeof(mail_area_type), 1, fp) == 1) {
|
||||
|
||||
@@ -121,7 +121,7 @@ void gareafile::ReadIMail185(char* options, char* file, char* impath) {
|
||||
aa.board = AR.brd;
|
||||
else
|
||||
{
|
||||
STD_PRINT("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Warning: Invalid board " << AR.brd << " (" << AR.aname << ") in IMAIL.AR - Skipping.");
|
||||
continue;
|
||||
}
|
||||
break;
|
||||
@@ -225,7 +225,7 @@ void gareafile::ReadIMail(char* tag) {
|
||||
}
|
||||
}
|
||||
char buff[78];
|
||||
sprintf(buff, "* Error: IMAIL %u.%02u (structure revision %u.%02u) is not supported - Skipping.\n",
|
||||
sprintf(buff, "* Error: IMAIL %u.%02u (structure revision %u.%02u) is not supported - Skipping." NL,
|
||||
unsigned(imver[0]), unsigned(imver[1]), unsigned(imstructver[0]), unsigned(imstructver[1]) );
|
||||
STD_PRINT(buff);
|
||||
}
|
||||
|
@@ -73,7 +73,7 @@ void gareafile::ReadInterMail(char* tag) {
|
||||
_ctl* ctl = (_ctl*)throw_calloc(1, sizeof(_ctl));
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
fp.fread(ctl, sizeof(_ctl));
|
||||
|
||||
@@ -140,7 +140,7 @@ void gareafile::ReadInterMail(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
FOLDER* _folder = (FOLDER*)throw_calloc(1, sizeof(FOLDER));
|
||||
|
||||
@@ -184,7 +184,7 @@ void gareafile::ReadInterMail(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
OLDFOLDER* _folder = (OLDFOLDER*)throw_calloc(1, sizeof(OLDFOLDER));
|
||||
|
||||
@@ -223,7 +223,7 @@ void gareafile::ReadInterMail(char* tag) {
|
||||
else
|
||||
{
|
||||
char buff[62+sizeof(ctl->sysrev)*2];
|
||||
sprintf(buff, "* Error: InterMail revision %04Xh is not supported - Skipping.\n", ctl->sysrev);
|
||||
sprintf(buff, "* Error: InterMail revision %04Xh is not supported - Skipping." NL, ctl->sysrev);
|
||||
STD_PRINT(buff);
|
||||
}
|
||||
throw_free(ctl);
|
||||
|
@@ -72,7 +72,7 @@ void gareafile::ReadLoraBBS(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
_configuration* cfg = (_configuration*)throw_calloc(1, sizeof(_configuration));
|
||||
fp.fread(cfg, sizeof(_configuration));
|
||||
@@ -140,7 +140,7 @@ void gareafile::ReadLoraBBS(char* tag) {
|
||||
fp.setvbuf(NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
_sysmsg* sysmsg = (_sysmsg*)throw_calloc(1, sizeof(_sysmsg));
|
||||
|
||||
|
@@ -53,7 +53,7 @@ void gareafile::ReadMaximus3(char* mxpath, char* areafile, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << areafile << std::endl);
|
||||
STD_PRINTNL("* Reading " << areafile);
|
||||
|
||||
m_pointers* prmp = (m_pointers*)throw_calloc(1, sizeof(m_pointers));
|
||||
m_pointers& prm = *prmp;
|
||||
@@ -77,7 +77,7 @@ void gareafile::ReadMaximus3(char* mxpath, char* areafile, char* options) {
|
||||
setvbuf(fp, NULL, _IOFBF, 32000);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << areafile << std::endl);
|
||||
STD_PRINTNL("* Reading " << areafile);
|
||||
|
||||
long areasize = fsize(fp)-4;
|
||||
|
||||
|
@@ -65,7 +65,7 @@ void gareafile::ReadME2(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fgets(buf, 255, fp)) {
|
||||
|
||||
|
@@ -84,7 +84,7 @@ void gareafile::ReadOpus(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(&msgsys, sizeof(_msgsys), 1, fp) == 1) {
|
||||
|
||||
@@ -141,7 +141,7 @@ void gareafile::ReadOpus(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(&sysdat, sizeof(_systemdat), 1, fp);
|
||||
if(*sysdat.msgpath and *sysdat.msgtitle) {
|
||||
|
@@ -90,7 +90,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
int _line = 0;
|
||||
|
||||
@@ -121,7 +121,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
// Get configuration file version
|
||||
fp.fread(&fido_version, 2);
|
||||
@@ -168,7 +168,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
word cfgver = 0;
|
||||
fp.fread(&cfgver, 2);
|
||||
@@ -186,7 +186,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
word cfgver = 0;
|
||||
fp.fread(&cfgver, 2);
|
||||
@@ -210,7 +210,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
word cfgver = 0;
|
||||
fp.fread(&cfgver, 2);
|
||||
@@ -259,7 +259,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
gfile fp2;
|
||||
_file = AddPath(_cnamespath, ".add");
|
||||
@@ -267,7 +267,7 @@ void gareafile::ReadPCBoard(char* tag) {
|
||||
if (fp2.isopen())
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << _file << std::endl);
|
||||
STD_PRINTNL("* Reading " << _file);
|
||||
|
||||
word _recsize = 0;
|
||||
fp.fread(&_recsize, 2);
|
||||
|
@@ -69,7 +69,7 @@ void gareafile::ReadProBoard(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(cfg, sizeof(Config), 1, fp);
|
||||
|
||||
@@ -85,7 +85,7 @@ void gareafile::ReadProBoard(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(aka, akasz, 1, fp);
|
||||
fclose(fp);
|
||||
@@ -99,7 +99,7 @@ void gareafile::ReadProBoard(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(area, sizeof(MsgAreas), 1, fp) == 1) {
|
||||
aa.reset();
|
||||
|
@@ -48,7 +48,7 @@ void gareafile::ReadQEchoFile(char* file, char* options, char* origin) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fgets(buf, sizeof(buf), fp)) {
|
||||
|
||||
|
@@ -69,7 +69,7 @@ void gareafile::ReadQFront(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(origin, sizeof(OriginLineRecord), 1, fp);
|
||||
for(int n=0; n<MaxOrigins; n++)
|
||||
@@ -85,7 +85,7 @@ void gareafile::ReadQFront(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
while(fread(area, sizeof(EchoMailConferenceRecord), 1, fp) == 1) {
|
||||
if(not area->Deleted) {
|
||||
|
@@ -57,7 +57,7 @@ void gareafile::ReadQ260(char* qbpath, char* origin, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(cfg, sizeof(Q260CfgRecT), 1, fp);
|
||||
|
||||
@@ -145,7 +145,7 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(cfg, sizeof(Q276CfgRecT), 1, fp);
|
||||
|
||||
@@ -161,7 +161,7 @@ void gareafile::ReadQ276(char* qbpath, char* origin, char* options) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
int _recs = (int)(filelength(fileno(fp)) / sizeof(Q276BrdRecT));
|
||||
// int _fmt = (_recs > 200) ? GMB_GOLDBASE : GMB_HUDSON;
|
||||
|
@@ -79,7 +79,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(config, sizeof(CONFIGrecord), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -103,7 +103,7 @@ void gareafile::ReadRemoteAccess(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
if(config->VersionID >= 0x200) {
|
||||
MESSAGErecord* area = new MESSAGErecord; throw_new(area);
|
||||
|
@@ -81,7 +81,7 @@ void gareafile::ReadRaEcho(char* tag) {
|
||||
if (raever == 0)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Could not determine version of RA-ECHO - skipping." << std::endl);
|
||||
STD_PRINTNL("* Could not determine version of RA-ECHO - skipping.");
|
||||
|
||||
return;
|
||||
}
|
||||
@@ -92,7 +92,7 @@ void gareafile::ReadRaEcho(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
areano = 1;
|
||||
while(fread(&area, raever, 1, fp) == 1) {
|
||||
|
@@ -83,7 +83,7 @@ void gareafile::ReadSpaceAr(const char* file) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char buf[4000];
|
||||
AreaCfg aa;
|
||||
@@ -179,7 +179,7 @@ void gareafile::ReadSpaceNtm(const char* file) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char buf[4000];
|
||||
AreaCfg aa;
|
||||
@@ -245,7 +245,7 @@ void gareafile::ReadSpaceCtl(const char* file) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char buf[4000];
|
||||
AreaCfg aa;
|
||||
|
@@ -59,7 +59,7 @@ void gareafile::ReadSquishFile(char* path, char* file, char* options, char* orig
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
|
||||
|
@@ -80,7 +80,7 @@ void gareafile::ReadSuperBBS(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(config, sizeof(ConfigRecordT), 1, fp);
|
||||
STRNP2C(config->OriginLine);
|
||||
@@ -91,7 +91,7 @@ void gareafile::ReadSuperBBS(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(sconfig, sizeof(ExtraConfigT), 1, fp);
|
||||
fclose(fp);
|
||||
@@ -107,7 +107,7 @@ void gareafile::ReadSuperBBS(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
for(int n=0; n<200; n++) {
|
||||
|
||||
@@ -175,7 +175,7 @@ void gareafile::ReadSuperBBS(char* tag) {
|
||||
}
|
||||
}
|
||||
else
|
||||
STD_PRINT("* Error: Unsupported version of SuperBBS: " << (word)(sconfig->VersionNumber >> 8) << '.' << (word)(sconfig->VersionNumber & 0xFF) << std::endl);
|
||||
STD_PRINTNL("* Error: Unsupported version of SuperBBS: " << (word)(sconfig->VersionNumber >> 8) << '.' << (word)(sconfig->VersionNumber & 0xFF));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -92,7 +92,7 @@ void gareafile::ReadSynchronet(char* tag) {
|
||||
setvbuf(in, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
// Skip header:
|
||||
// max_qwkmsgs 4
|
||||
|
@@ -79,7 +79,7 @@ void gareafile::ReadTimedFile(char* path, char* file, char* options, char* origi
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
|
||||
|
@@ -56,7 +56,7 @@ void gareafile::ReadTmailFile(char* file, char* options, char* origin) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
|
||||
|
@@ -85,7 +85,7 @@ void gareafile::ReadTosScan(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(buf, 5, 1, fp);
|
||||
if(streql(buf, "JoHo")) { // Check to see that it is v1.99b or higher
|
||||
@@ -120,7 +120,7 @@ void gareafile::ReadTosScan(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fseek(fp, 4L, SEEK_SET); // Skip CRC32
|
||||
|
||||
|
@@ -76,7 +76,7 @@ void gareafile::ReadWMail(char* tag) {
|
||||
if (fh != -1)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
read(fh, wmprm, sizeof(TWmailPrm));
|
||||
|
||||
@@ -131,7 +131,7 @@ void gareafile::ReadWMail(char* tag) {
|
||||
if (fh != -1)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
// All the echomail areas
|
||||
while(read(fh, arprm, sizeof(TAreasPrm)) == sizeof(TAreasPrm)) {
|
||||
|
@@ -113,7 +113,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
|
||||
char header[26];
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
fread(header, 26, 1, fp2);
|
||||
strp2c(header);
|
||||
@@ -150,7 +150,7 @@ void gareafile::ReadWtrGteFile(char* options, FILE* fp) {
|
||||
throw_delete(ar);
|
||||
}
|
||||
else
|
||||
STD_PRINT("* Error: WaterGate Areabase \"" << header << "\" is not supported - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: WaterGate Areabase \"" << header << "\" is not supported - Skipping.");
|
||||
|
||||
fclose(fp2);
|
||||
}
|
||||
@@ -192,7 +192,7 @@ void gareafile::ReadWtrGte(char* tag) {
|
||||
if (fp)
|
||||
{
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
char header[26];
|
||||
fread(header, 26, 1, fp); strp2c(header);
|
||||
@@ -200,7 +200,7 @@ void gareafile::ReadWtrGte(char* tag) {
|
||||
if(streql(header, ConfigHeader))
|
||||
ReadWtrGteFile(options, fp);
|
||||
else
|
||||
STD_PRINT("* Error: WaterGate \"" << header << "\" is not supported - Skipping." << std::endl);
|
||||
STD_PRINTNL("* Error: WaterGate \"" << header << "\" is not supported - Skipping.");
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
|
@@ -64,7 +64,7 @@ void gareafile::ReadAdeptXbbsFile(char* path, char* file, char* options) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
|
||||
|
@@ -86,7 +86,7 @@ void gareafile::ReadxMailFile(char* file, char* options) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
aa.reset();
|
||||
|
||||
@@ -171,7 +171,7 @@ void gareafile::ReadXMail(char* tag) {
|
||||
setvbuf(fp, NULL, _IOFBF, 8192);
|
||||
|
||||
if (not quiet)
|
||||
STD_PRINT("* Reading " << file << std::endl);
|
||||
STD_PRINTNL("* Reading " << file);
|
||||
|
||||
areano = 1;
|
||||
while(fread(&area, sizeof(EchoAreaRec), 1, fp) == 1) {
|
||||
|
Reference in New Issue
Block a user