From a9cfb1002773ccd8ff0e35451a3ef575b6c57cb2 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Fri, 20 Jan 2006 11:55:12 +0000 Subject: [PATCH] Fix garbage screen output on Linux --- golded3/gcarea.cpp | 4 +-- golded3/gccfgg.cpp | 26 ++++++++-------- golded3/gccfgg0.cpp | 20 ++++++------- golded3/gccfgg1.cpp | 2 +- golded3/gccfgg7.cpp | 6 ++-- golded3/gccfgg8.cpp | 4 +-- golded3/gckeys.cpp | 12 ++++---- golded3/gclang.cpp | 4 +-- golded3/gcmisc.cpp | 10 +++---- golded3/gedoss.cpp | 4 +-- golded3/geinit.cpp | 62 +++++++++++++++++++-------------------- golded3/geplay.cpp | 4 +-- goldlib/gall/gdefs.h | 6 ++++ goldlib/gcfg/gedacfg.cpp | 2 +- goldlib/gcfg/gxcrash.cpp | 2 +- goldlib/gcfg/gxdb.cpp | 12 ++++---- goldlib/gcfg/gxdutch.cpp | 2 +- goldlib/gcfg/gxezy102.cpp | 4 +-- goldlib/gcfg/gxezy110.cpp | 8 ++--- goldlib/gcfg/gxfd.cpp | 4 +-- goldlib/gcfg/gxfecho6.cpp | 4 +-- goldlib/gcfg/gxfidpcb.cpp | 2 +- goldlib/gcfg/gxfm116.cpp | 2 +- goldlib/gcfg/gxgecho.cpp | 12 ++++---- goldlib/gcfg/gxhpt.cpp | 4 +-- goldlib/gcfg/gximail4.cpp | 6 ++-- goldlib/gcfg/gximail5.cpp | 6 ++-- goldlib/gcfg/gximail6.cpp | 8 ++--- goldlib/gcfg/gxinter.cpp | 8 ++--- goldlib/gcfg/gxlora.cpp | 4 +-- goldlib/gcfg/gxmax3.cpp | 4 +-- goldlib/gcfg/gxme2.cpp | 2 +- goldlib/gcfg/gxopus.cpp | 4 +-- goldlib/gcfg/gxpcb.cpp | 14 ++++----- goldlib/gcfg/gxprobrd.cpp | 6 ++-- goldlib/gcfg/gxqecho.cpp | 2 +- goldlib/gcfg/gxqfront.cpp | 4 +-- goldlib/gcfg/gxquick.cpp | 6 ++-- goldlib/gcfg/gxra.cpp | 4 +-- goldlib/gcfg/gxraecho.cpp | 4 +-- goldlib/gcfg/gxspace.cpp | 6 ++-- goldlib/gcfg/gxsquish.cpp | 2 +- goldlib/gcfg/gxsuper.cpp | 8 ++--- goldlib/gcfg/gxsync.cpp | 2 +- goldlib/gcfg/gxtimed.cpp | 2 +- goldlib/gcfg/gxtmail.cpp | 2 +- goldlib/gcfg/gxts.cpp | 4 +-- goldlib/gcfg/gxwmail.cpp | 4 +-- goldlib/gcfg/gxwtr.cpp | 8 ++--- goldlib/gcfg/gxxbbs.cpp | 2 +- goldlib/gcfg/gxxmail.cpp | 4 +-- 51 files changed, 177 insertions(+), 171 deletions(-) diff --git a/golded3/gcarea.cpp b/golded3/gcarea.cpp index 5909103..8568a7a 100644 --- a/golded3/gcarea.cpp +++ b/golded3/gcarea.cpp @@ -154,7 +154,7 @@ void AreaList::AddNewArea(AreaCfg* aa) STD_PRINT(" fmt=" << aa->basetype << ", eid=\"" << aa->echoid); STD_PRINT("\", pth=\"" << aa->path << "\", brd=" << aa->board); STD_PRINT(", gid=" << aa->groupid << ", aka=" << aa->aka.make_string(temp)); - STD_PRINT(" " << aa->attr.make_string(temp) << std::endl); + STD_PRINTNL(" " << aa->attr.make_string(temp)); } Desc desc; @@ -849,7 +849,7 @@ void AreaList::ReadEcholist(char* val) { tok = getkeyval; if (not quiet) - STD_PRINT("* Reading " << file << std::endl); + STD_PRINTNL("* Reading " << file); while(fgets((val=buf), sizeof(buf), fp)) { diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp index 8ef7a21..8b2b06c 100644 --- a/golded3/gccfgg.cpp +++ b/golded3/gccfgg.cpp @@ -136,7 +136,7 @@ bool ReadGoldedCfg(int& force) { if (strieql(CFG->semaphore.exportlist, AddPath(CFG->jampath, "echomail.jam"))) { - STD_PRINT("* Warning: SEMAPHORE EXPORTLIST must not be the same as ECHOMAIL.JAM!" << std::endl); + STD_PRINTNL("* Warning: SEMAPHORE EXPORTLIST must not be the same as ECHOMAIL.JAM!"); SayBibi(); cfgerrors++; } @@ -236,7 +236,7 @@ void WriteGoldGed() { #if !defined(__GOLD_GUI__) static int EnterString(char* prompt, char* string, uint length) { - STD_PRINT(prompt << std::endl << "> " << std::flush); + STD_PRINT(prompt << NL << "> " << std::flush); *string = NUL; char* ptr = string; @@ -252,12 +252,12 @@ static int EnterString(char* prompt, char* string, uint length) } } else if(k == Key_Esc) { - STD_PRINT(std::endl); + STD_PRINT(NL); *string = NUL; return -1; } else if(k == Key_Ent) { - STD_PRINT(std::endl); + STD_PRINT(NL); *ptr = NUL; break; } @@ -332,10 +332,10 @@ void InstallDetect(char* path) { if(fexist(cmdlinecfgbak)) remove(cmdlinecfgbak); rename(CFG->goldcfg, cmdlinecfgbak); - STD_PRINT("Warning: Existing config backed up to " << cmdlinecfgbak << "!!!" << std::endl); + STD_PRINTNL("Warning: Existing config backed up to " << cmdlinecfgbak << "!!!"); } - STD_PRINT("Please wait while GoldED+ is detecting your software." << std::endl); + STD_PRINTNL("Please wait while GoldED+ is detecting your software."); FILE* fp = fopen(CFG->goldcfg, "wt"); if(fp) { @@ -364,7 +364,7 @@ void InstallDetect(char* path) { } if(fexist(AddPath(pth, idetect[i].configname))) { fprintf(fp, "AREAFILE %s %s\n", idetect[i].name, pth); - STD_PRINT("Found " << idetect[i].name << (ptr ? "." : " (unreliable).") << std::endl); + STD_PRINTNL("Found " << idetect[i].name << (ptr ? "." : " (unreliable).")); if(streql(idetect[i].name, "Squish")) gotsquish = true; detected = true; @@ -378,7 +378,7 @@ void InstallDetect(char* path) { PathCopy(pth, ptr); if(fexist(AddPath(pth, "im.exe")) or fexist(AddPath(pth, "intrecho.exe"))) { fprintf(fp, "AREAFILE InterMail %s\n", pth); - STD_PRINT("Found InterMail and/or InterEcho." << std::endl); + STD_PRINTNL("Found InterMail and/or InterEcho."); detected = true; } @@ -393,12 +393,12 @@ void InstallDetect(char* path) { } if(fexist(AddPath(pth, "max.prm"))) { fprintf(fp, "AREAFILE Maximus %s\n", pth); - STD_PRINT("Found Maximus." << std::endl); + STD_PRINTNL("Found Maximus."); detected = true; } if(not gotsquish and fexist(AddPath(pth, "squish.cfg"))) { fprintf(fp, "AREAFILE Squish %s\n", pth); - STD_PRINT("Found Squish." << std::endl); + STD_PRINTNL("Found Squish."); detected = true; } @@ -406,7 +406,7 @@ void InstallDetect(char* path) { strcpy(pth, CFG->areapath); if(fexist(AddPath(pth, "areadesc.me2"))) { fprintf(fp, "AREAFILE ME2 %sareadesc.me2 %sareas.bbs\n", pth, pth); - STD_PRINT("Found ME2." << std::endl); + STD_PRINTNL("Found ME2."); gotareasbbs = true; detected = true; } @@ -416,13 +416,13 @@ void InstallDetect(char* path) { strcpy(pth, CFG->areapath); if(fexist(AddPath(pth, "areas.bbs"))) { fprintf(fp, "AREAFILE AreasBBS %sareas.bbs\n", pth); - STD_PRINT("Found AREAS.BBS." << std::endl); + STD_PRINTNL("Found AREAS.BBS."); detected = true; } } if(not detected) - STD_PRINT("Sorry, could not find any supported software. Try another path." << std::endl); + STD_PRINTNL("Sorry, could not find any supported software. Try another path."); fclose(fp); } diff --git a/golded3/gccfgg0.cpp b/golded3/gccfgg0.cpp index 097a1f2..5bc6b6d 100644 --- a/golded3/gccfgg0.cpp +++ b/golded3/gccfgg0.cpp @@ -736,7 +736,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { inuse++; if (not quiet) - STD_PRINT("* Reading " << cfg << std::endl); + STD_PRINTNL("* Reading " << cfg); // Assign file buffer setvbuf(fp, NULL, _IOFBF, 8192); @@ -761,7 +761,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { case CRC_IF: if (in_if) { - STD_PRINT("* " << cfgname << ": Misplaced IF at line " << line << ". IF's cannot be nested." << std::endl); + STD_PRINTNL("* " << cfgname << ": Misplaced IF at line " << line << ". IF's cannot be nested."); cfgerrors++; } in_if = true; @@ -772,7 +772,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { case CRC_ELSEIF: if (not in_if or in_else) { - STD_PRINT("* " << cfgname << ": Misplaced ELIF/ELSEIF at line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Misplaced ELIF/ELSEIF at line " << line << "."); cfgerrors++; } if(if_status) @@ -785,7 +785,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { case CRC_ELSE: if (not in_if or in_else) { - STD_PRINT("* " << cfgname << ": Misplaced ELSE at line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Misplaced ELSE at line " << line << "."); cfgerrors++; } in_else = true; @@ -795,7 +795,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { case CRC_ENDIF: if (not in_if) { - STD_PRINT("* " << cfgname << ": Misplaced ENDIF at line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Misplaced ENDIF at line " << line << "."); cfgerrors++; } cfgignore = false; @@ -825,12 +825,12 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { MapPath(val); if (not quiet) - STD_PRINT("* Including " << val << std::endl); + STD_PRINTNL("* Including " << val); ReadCfg(val); // NOTE! This is a recursive call! if (not quiet) - STD_PRINT("* Resuming " << cfg << std::endl); + STD_PRINTNL("* Resuming " << cfg); break; case CRC_AREAFILE: @@ -838,12 +838,12 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { MapPath(val); if (not quiet) - STD_PRINT("* Handling " << key << " " << val << std::endl); + STD_PRINTNL("* Handling " << key << " " << val); AL.GetAreafile(val); if (not quiet) - STD_PRINT("* Resuming " << cfg << std::endl); + STD_PRINTNL("* Resuming " << cfg); break; case CRC_APP: @@ -857,7 +857,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) { { if (not ignoreunknown) { - STD_PRINT("* " << cfgname << ": Unknown keyword \"" << key << "\" at line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Unknown keyword \"" << key << "\" at line " << line << "."); SayBibi(); cfgerrors++; } diff --git a/golded3/gccfgg1.cpp b/golded3/gccfgg1.cpp index d450893..9f7e0fe 100644 --- a/golded3/gccfgg1.cpp +++ b/golded3/gccfgg1.cpp @@ -41,7 +41,7 @@ void CfgAddress(char* v) if (not strblank(v)) { if (veryverbose) - STD_PRINT(" CfgAddress(" << v << ")" << std::endl); + STD_PRINTNL(" CfgAddress(" << v << ")"); gaka aka; aka.domain[0] = NUL; diff --git a/golded3/gccfgg7.cpp b/golded3/gccfgg7.cpp index c7ec1bd..7a8e05c 100644 --- a/golded3/gccfgg7.cpp +++ b/golded3/gccfgg7.cpp @@ -405,7 +405,7 @@ void CfgSeqMsgId() { void CfgSeqOutRun_Error() { - STD_PRINT("* Warning: Bad SeqOutrun value \'" << val << "\', ignored."<< std::endl); + STD_PRINTNL("* Warning: Bad SeqOutrun value \'" << val << "\', ignored."); } void CfgSeqOutRun() { @@ -427,7 +427,7 @@ void CfgSeqOutRun() { CFG->seqoutrun = s; if (veryverbose) - STD_PRINT(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun << std::endl); + STD_PRINTNL(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun); return; } @@ -456,7 +456,7 @@ void CfgSeqOutRun() { CFG->seqoutrun = s; if (veryverbose) - STD_PRINT(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun << std::endl); + STD_PRINTNL(" SeqOutRun: \'" << val << "\' --> " << CFG->seqoutrun); } // ------------------------------------------------------------------ diff --git a/golded3/gccfgg8.cpp b/golded3/gccfgg8.cpp index 4c662df..f9dc2f3 100644 --- a/golded3/gccfgg8.cpp +++ b/golded3/gccfgg8.cpp @@ -641,7 +641,7 @@ void CfgXlatexport() { if (CFG->usecharset and (strieql(buf, "IBMPC") or strieql(buf, "+7_FIDO"))) { - STD_PRINT("* Warning: Charset " << buf << " is obsolete. Consider using CPxxx form." << std::endl); + STD_PRINTNL("* Warning: Charset " << buf << " is obsolete. Consider using CPxxx form."); cfgerrors++; } } @@ -666,7 +666,7 @@ void CfgXlatlocalset() { if (CFG->usecharset and (strieql(CFG->xlatlocalset, "IBMPC") or strieql(CFG->xlatlocalset, "+7_FIDO"))) { - STD_PRINT("* Warning: Charset " << CFG->xlatlocalset << " is obsolete. Consider using CPxxx form." << std::endl); + STD_PRINTNL("* Warning: Charset " << CFG->xlatlocalset << " is obsolete. Consider using CPxxx form."); cfgerrors++; } } diff --git a/golded3/gckeys.cpp b/golded3/gckeys.cpp index c586bd5..ae2adbf 100644 --- a/golded3/gckeys.cpp +++ b/golded3/gckeys.cpp @@ -1018,7 +1018,7 @@ int ReadKeysCfg(int force) { cfgname = cfgname ? cfgname+1 : cfg; if (not quiet) - STD_PRINT("* Reading " << cfg << std::endl); + STD_PRINTNL("* Reading " << cfg); CFG->macro.clear(); CFG->cmdkey.clear(); @@ -1034,7 +1034,7 @@ int ReadKeysCfg(int force) { ptr = strskip_txt(ptr); if (*ptr == NUL) { - STD_PRINT("* " << cfgname << ": Incomplete line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Incomplete line " << line << "."); SayBibi(); cfgerrors++; continue; @@ -1053,7 +1053,7 @@ int ReadKeysCfg(int force) { keycmd = SwitchKeyDefs(strCrc16(strupr(ptr2)), &keytype); if (not keycmd or keytype) { - STD_PRINT("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "."); SayBibi(); cfgerrors++; continue; @@ -1101,7 +1101,7 @@ int ReadKeysCfg(int force) { } else { - STD_PRINT("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "."); SayBibi(); cfgerrors++; continue; @@ -1132,7 +1132,7 @@ int ReadKeysCfg(int force) { KeyCmdAdd(keycmd, keyval, keytype); else { - STD_PRINT("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "."); SayBibi(); cfgerrors++; continue; @@ -1140,7 +1140,7 @@ int ReadKeysCfg(int force) { } else { - STD_PRINT("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "." << std::endl); + STD_PRINTNL("* " << cfgname << ": Invalid key \"" << ptr2 << "\" in line " << line << "."); SayBibi(); cfgerrors++; continue; diff --git a/golded3/gclang.cpp b/golded3/gclang.cpp index 7746861..5464d36 100644 --- a/golded3/gclang.cpp +++ b/golded3/gclang.cpp @@ -711,7 +711,7 @@ bool ReadLangCfg(int force) { setvbuf(fpi, NULL, _IOFBF, 8192); if (not quiet) - STD_PRINT("* Reading " << cfgname << std::endl); + STD_PRINTNL("* Reading " << cfgname); cfgname = CleanFilename(cfgname); @@ -734,7 +734,7 @@ bool ReadLangCfg(int force) { { if (cmdlineoldkeyw == false) { - STD_PRINT("* " << cfgname << " line " << line << ": \"" << ptr << "\" is obsolete or unknown." << std::endl); + STD_PRINTNL("* " << cfgname << " line " << line << ": \"" << ptr << "\" is obsolete or unknown."); SayBibi(); cfgerrors++; } diff --git a/golded3/gcmisc.cpp b/golded3/gcmisc.cpp index 80d2f94..16d7f90 100644 --- a/golded3/gcmisc.cpp +++ b/golded3/gcmisc.cpp @@ -53,7 +53,7 @@ int ReadHelpCfg(int force) { CFG->helpcfg.ft = GetFiletime(AddPath(CFG->goldpath, CFG->helpcfg.fn)); if (not quiet) - STD_PRINT("* Reading " << AddPath(CFG->goldpath, CFG->helpcfg.fn) << std::endl); + STD_PRINTNL("* Reading " << AddPath(CFG->goldpath, CFG->helpcfg.fn)); setvbuf(ofp, NULL, _IOFBF, 8192); @@ -644,7 +644,7 @@ void ReadXlatTables() { if (ifp) { if (not quiet) - STD_PRINT("* Reading " << buf << std::endl); + STD_PRINTNL("* Reading " << buf); // Read the definition file line = 1; @@ -726,7 +726,7 @@ void ReadXlatTables() { fclose(ifp); } else - STD_PRINT("* XLAT table " << buf << " could not be opened." << std::endl); + STD_PRINTNL("* XLAT table " << buf << " could not be opened."); fwrite(&ChsTable, sizeof(Chs), 1, ofp); } @@ -741,7 +741,7 @@ void ReadXlatTables() { if (ifp) { if (not quiet) - STD_PRINT("* Reading " << buf << std::endl); + STD_PRINTNL("* Reading " << buf); // Read the definition file line = 1; @@ -805,7 +805,7 @@ void ReadXlatTables() { fclose(ifp); } else - STD_PRINT("* XLAT table " << buf << " could not be opened." << std::endl); + STD_PRINTNL("* XLAT table " << buf << " could not be opened."); fwrite(&EscTable, sizeof(Esc), 1, ofp); } diff --git a/golded3/gedoss.cpp b/golded3/gedoss.cpp index 89cce2c..aad2e46 100644 --- a/golded3/gedoss.cpp +++ b/golded3/gedoss.cpp @@ -192,12 +192,12 @@ void Cleanup(void) { int smax = MinV((int)GLOG_STORELINES, LOG.storelines); for (int s=0; s GLOG_STORELINES) - STD_PRINT("(See also " << CFG->logfile << ")" << std::endl); + STD_PRINTNL("(See also " << CFG->logfile << ")"); if (errorlevel > EXIT_NONAME) MakeNoise(SND_S_O_S); diff --git a/golded3/geinit.cpp b/golded3/geinit.cpp index 0772bf7..daa17ff 100644 --- a/golded3/geinit.cpp +++ b/golded3/geinit.cpp @@ -83,7 +83,7 @@ static void InitCmdline(char* val) { if (*val) strcpy(cmdlinecfg, val); else - STD_PRINT("Warning: configuration filename missed for -C option, ignored.\r\n"); + STD_PRINTNL("Warning: configuration filename missed for -C option, ignored."); break; case 'D': cmdlineoldkeyw = (*val == '-'); @@ -152,7 +152,7 @@ static void InitCmdline(char* val) { gftrk_set_max = atoi(val); if (gftrk_set_max == 0) { - STD_PRINT("Warning: Invalid parameter for -Z option, fixed.\r\n"); + STD_PRINTNL("Warning: Invalid parameter for -Z option, fixed."); gftrk_set_max = 1; } break; @@ -520,7 +520,7 @@ void Initialize(int argc, char* argv[]) { srand(gtime(NULL)); // Display startup banner - STD_PRINT(__gver_longpid__ << " " << __gver_ver__ << "\r\n"); + STD_PRINTNL(__gver_longpid__ << " " << __gver_ver__ ); // Check environment commandline ptr = getenv("GEDCMD"); @@ -562,32 +562,32 @@ void Initialize(int argc, char* argv[]) { // Print commandline help and exit if requested if (cmdlinehelp) { - STD_PRINT("Copyright (C) 1990-2005 Odinn Sorensen, Alexander Aganichev, Jacobo Tarrio,\r\n"); - STD_PRINT(" Stas Degteff and others\r\n"); - STD_PRINT("-------------------------------------------------------------------------------\r\n"); - STD_PRINT("\r\n"); - STD_PRINT("Invocation: " << argv[0] << " [-options] [keystacking]\r\n"); - STD_PRINT("\r\n"); - STD_PRINT("-C Use a different configuration file.\r\n"); - STD_PRINT("-D Disable old obsolete configuration keywords.\r\n"); - STD_PRINT("-E Start directly in the specified mail area.\r\n"); - STD_PRINT("-EXPORTSOUP Export SOUP packets during startup.\r\n"); - STD_PRINT("-F or -FF Force recompile of most (or all with -FF) configuration files.\r\n"); - STD_PRINT("-INSTALL[=path] Start the quick install procedure. Look in path, if given.\r\n"); - STD_PRINT("-IMPORTSOUP Import SOUP packets during startup.\r\n"); - STD_PRINT("-M Mute sounds. Disables all noises in GoldED+.\r\n"); - STD_PRINT("-N Disable share-compatible file opens during startup.\r\n"); - STD_PRINT("-NOSCAN Temporarily disable area scan during startup.\r\n"); + STD_PRINTNL("Copyright (C) 1990-2005 Odinn Sorensen, Alexander Aganichev, Jacobo Tarrio,"); + STD_PRINTNL(" Stas Degteff and others"); + STD_PRINTNL("-------------------------------------------------------------------------------"); + STD_PRINTNL(""); + STD_PRINTNL("Invocation: " << argv[0] << " [-options] [keystacking]"); + STD_PRINTNL(""); + STD_PRINTNL("-C Use a different configuration file."); + STD_PRINTNL("-D Disable old obsolete configuration keywords."); + STD_PRINTNL("-E Start directly in the specified mail area."); + STD_PRINTNL("-EXPORTSOUP Export SOUP packets during startup."); + STD_PRINTNL("-F or -FF Force recompile of most (or all with -FF) configuration files."); + STD_PRINTNL("-INSTALL[=path] Start the quick install procedure. Look in path, if given."); + STD_PRINTNL("-IMPORTSOUP Import SOUP packets during startup."); + STD_PRINTNL("-M Mute sounds. Disables all noises in GoldED+."); + STD_PRINTNL("-N Disable share-compatible file opens during startup."); + STD_PRINTNL("-NOSCAN Temporarily disable area scan during startup."); #if defined(GUTLOS_FUNCS) && !defined(__MSDOS__) - STD_PRINT("-P Increase program priority to run faster.\r\n"); + STD_PRINTNL("-P Increase program priority to run faster."); #endif - STD_PRINT("-S Sorts all mail areas according to the sort specs.\r\n"); - STD_PRINT("-T Set a timeout value. GoldED+ will auto-exit after timeout.\r\n"); - STD_PRINT("-V or -VV Verbose or Very verbose (-VV) config compile. Use -VV to debug.\r\n"); - STD_PRINT("-W Write a GOLDAREA.INC file with AREADEF's of all mail areas.\r\n"); - STD_PRINT("-X, -Y, -Z Reserved for debugging purposes.\r\n"); - STD_PRINT("\r\n"); - STD_PRINT("Any non-option parameter is stuffed into the keyboard buffer.\r\n"); + STD_PRINTNL("-S Sorts all mail areas according to the sort specs."); + STD_PRINTNL("-T Set a timeout value. GoldED+ will auto-exit after timeout."); + STD_PRINTNL("-V or -VV Verbose or Very verbose (-VV) config compile. Use -VV to debug."); + STD_PRINTNL("-W Write a GOLDAREA.INC file with AREADEF's of all mail areas."); + STD_PRINTNL("-X, -Y, -Z Reserved for debugging purposes."); + STD_PRINTNL(""); + STD_PRINTNL("Any non-option parameter is stuffed into the keyboard buffer."); exit(0); } @@ -681,7 +681,7 @@ void Initialize(int argc, char* argv[]) { if (not fexist(CFG->goldcfg)) { - STD_PRINT("*** Cannot start: " << CFG->goldcfg << " not found! ***\r\n"); + STD_PRINTNL("*** Cannot start: " << CFG->goldcfg << " not found! ***"); errorlevel = EXIT_NONAME; exit(0); } @@ -692,7 +692,7 @@ void Initialize(int argc, char* argv[]) { // Call install finish procedure if (cmdlineinstall && InstallFinish()) { - STD_PRINT("*** INSTALL NOT COMPLETED ***\r\n"); + STD_PRINTNL("*** INSTALL NOT COMPLETED ***"); remove(CFG->goldcfg); errorlevel = EXIT_NONAME; exit(0); @@ -741,11 +741,11 @@ void Initialize(int argc, char* argv[]) { // Report detected multitasker if (!quiet && gmtsk.detected) - STD_PRINT("* Running under " << gmtsk.name << ".\r\n"); + STD_PRINTNL("* Running under " << gmtsk.name << "."); if (cfgerrors) { - STD_PRINT("* Total CFG errors found: " << cfgerrors << ". Press almost any key to continue.\r\n"); + STD_PRINTNL("* Total CFG errors found: " << cfgerrors << ". Press almost any key to continue."); kbclear(); waitkey(); } diff --git a/golded3/geplay.cpp b/golded3/geplay.cpp index 8edb6e3..3832a8f 100644 --- a/golded3/geplay.cpp +++ b/golded3/geplay.cpp @@ -96,13 +96,13 @@ void InitSound() { if (snd->is_installed()) { if (not quiet) - STD_PRINT("* Soundcard support was successfully initialized." << std::endl); + STD_PRINTNL("* Soundcard support was successfully initialized."); atexit(ResetSound); } else { if (not quiet) - STD_PRINT("* Soundcard support could NOT be initialized!" << std::endl); + STD_PRINTNL("* Soundcard support could NOT be initialized!"); ResetSound(); } break; diff --git a/goldlib/gall/gdefs.h b/goldlib/gall/gdefs.h index 2fb0bc1..a3971e0 100644 --- a/goldlib/gall/gdefs.h +++ b/goldlib/gall/gdefs.h @@ -169,8 +169,14 @@ typedef uint32_t time32_t; /* 32-bit time_t type */ str << out; \ GUI_Print(str); \ } +#define STD_PRINTNL(out) { \ + std::strstream str; \ + str << out << NL; \ + GUI_Print(str); \ + } #else #define STD_PRINT(out) std::cout << out; +#define STD_PRINTNL(out) std::cout << out << NL; #endif diff --git a/goldlib/gcfg/gedacfg.cpp b/goldlib/gcfg/gedacfg.cpp index 5619822..ccd4546 100644 --- a/goldlib/gcfg/gedacfg.cpp +++ b/goldlib/gcfg/gedacfg.cpp @@ -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; diff --git a/goldlib/gcfg/gxcrash.cpp b/goldlib/gcfg/gxcrash.cpp index 8d1f378..cd652ea 100644 --- a/goldlib/gcfg/gxcrash.cpp +++ b/goldlib/gcfg/gxcrash.cpp @@ -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]; diff --git a/goldlib/gcfg/gxdb.cpp b/goldlib/gcfg/gxdb.cpp index 0db9a80..c379ab6 100644 --- a/goldlib/gcfg/gxdb.cpp +++ b/goldlib/gcfg/gxdb.cpp @@ -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++) diff --git a/goldlib/gcfg/gxdutch.cpp b/goldlib/gcfg/gxdutch.cpp index 46a2a33..83488a1 100644 --- a/goldlib/gcfg/gxdutch.cpp +++ b/goldlib/gcfg/gxdutch.cpp @@ -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)) { diff --git a/goldlib/gcfg/gxezy102.cpp b/goldlib/gcfg/gxezy102.cpp index 98ec120..ef78f18 100644 --- a/goldlib/gcfg/gxezy102.cpp +++ b/goldlib/gcfg/gxezy102.cpp @@ -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; diff --git a/goldlib/gcfg/gxezy110.cpp b/goldlib/gcfg/gxezy110.cpp index 3d5dedb..bee8776 100644 --- a/goldlib/gcfg/gxezy110.cpp +++ b/goldlib/gcfg/gxezy110.cpp @@ -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) diff --git a/goldlib/gcfg/gxfd.cpp b/goldlib/gcfg/gxfd.cpp index 60f252d..6999817 100644 --- a/goldlib/gcfg/gxfd.cpp +++ b/goldlib/gcfg/gxfd.cpp @@ -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; diff --git a/goldlib/gcfg/gxfecho6.cpp b/goldlib/gcfg/gxfecho6.cpp index 15bdbbc..6032398 100644 --- a/goldlib/gcfg/gxfecho6.cpp +++ b/goldlib/gcfg/gxfecho6.cpp @@ -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); } diff --git a/goldlib/gcfg/gxfidpcb.cpp b/goldlib/gcfg/gxfidpcb.cpp index 1974f8f..9938aa9 100644 --- a/goldlib/gcfg/gxfidpcb.cpp +++ b/goldlib/gcfg/gxfidpcb.cpp @@ -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; diff --git a/goldlib/gcfg/gxfm116.cpp b/goldlib/gcfg/gxfm116.cpp index cfa04e8..73f0b47 100644 --- a/goldlib/gcfg/gxfm116.cpp +++ b/goldlib/gcfg/gxfm116.cpp @@ -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); } } diff --git a/goldlib/gcfg/gxgecho.cpp b/goldlib/gcfg/gxgecho.cpp index 78ea964..89ab2a1 100644 --- a/goldlib/gcfg/gxgecho.cpp +++ b/goldlib/gcfg/gxgecho.cpp @@ -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); } diff --git a/goldlib/gcfg/gxhpt.cpp b/goldlib/gcfg/gxhpt.cpp index 6e7bdab..75c699d 100644 --- a/goldlib/gcfg/gxhpt.cpp +++ b/goldlib/gcfg/gxhpt.cpp @@ -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; } diff --git a/goldlib/gcfg/gximail4.cpp b/goldlib/gcfg/gximail4.cpp index 24e368a..375fc92 100644 --- a/goldlib/gcfg/gximail4.cpp +++ b/goldlib/gcfg/gximail4.cpp @@ -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; diff --git a/goldlib/gcfg/gximail5.cpp b/goldlib/gcfg/gximail5.cpp index 9b63eb9..f9fb56c 100644 --- a/goldlib/gcfg/gximail5.cpp +++ b/goldlib/gcfg/gximail5.cpp @@ -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; diff --git a/goldlib/gcfg/gximail6.cpp b/goldlib/gcfg/gximail6.cpp index e5b51d8..f94170c 100644 --- a/goldlib/gcfg/gximail6.cpp +++ b/goldlib/gcfg/gximail6.cpp @@ -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); } diff --git a/goldlib/gcfg/gxinter.cpp b/goldlib/gcfg/gxinter.cpp index 39d341b..b9bb7fd 100644 --- a/goldlib/gcfg/gxinter.cpp +++ b/goldlib/gcfg/gxinter.cpp @@ -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); diff --git a/goldlib/gcfg/gxlora.cpp b/goldlib/gcfg/gxlora.cpp index 912508f..e67d8b8 100644 --- a/goldlib/gcfg/gxlora.cpp +++ b/goldlib/gcfg/gxlora.cpp @@ -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)); diff --git a/goldlib/gcfg/gxmax3.cpp b/goldlib/gcfg/gxmax3.cpp index bf6da6a..181d425 100644 --- a/goldlib/gcfg/gxmax3.cpp +++ b/goldlib/gcfg/gxmax3.cpp @@ -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; diff --git a/goldlib/gcfg/gxme2.cpp b/goldlib/gcfg/gxme2.cpp index d1a0f45..d343d30 100644 --- a/goldlib/gcfg/gxme2.cpp +++ b/goldlib/gcfg/gxme2.cpp @@ -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)) { diff --git a/goldlib/gcfg/gxopus.cpp b/goldlib/gcfg/gxopus.cpp index 88a7680..1262413 100644 --- a/goldlib/gcfg/gxopus.cpp +++ b/goldlib/gcfg/gxopus.cpp @@ -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) { diff --git a/goldlib/gcfg/gxpcb.cpp b/goldlib/gcfg/gxpcb.cpp index ad6e5e3..416a793 100644 --- a/goldlib/gcfg/gxpcb.cpp +++ b/goldlib/gcfg/gxpcb.cpp @@ -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); diff --git a/goldlib/gcfg/gxprobrd.cpp b/goldlib/gcfg/gxprobrd.cpp index efc7b0d..bfd7ba1 100644 --- a/goldlib/gcfg/gxprobrd.cpp +++ b/goldlib/gcfg/gxprobrd.cpp @@ -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(); diff --git a/goldlib/gcfg/gxqecho.cpp b/goldlib/gcfg/gxqecho.cpp index 5e5ee11..8ee3bbd 100644 --- a/goldlib/gcfg/gxqecho.cpp +++ b/goldlib/gcfg/gxqecho.cpp @@ -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)) { diff --git a/goldlib/gcfg/gxqfront.cpp b/goldlib/gcfg/gxqfront.cpp index 291d771..f734c2b 100644 --- a/goldlib/gcfg/gxqfront.cpp +++ b/goldlib/gcfg/gxqfront.cpp @@ -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; nDeleted) { diff --git a/goldlib/gcfg/gxquick.cpp b/goldlib/gcfg/gxquick.cpp index 1464cc2..52592eb 100644 --- a/goldlib/gcfg/gxquick.cpp +++ b/goldlib/gcfg/gxquick.cpp @@ -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; diff --git a/goldlib/gcfg/gxra.cpp b/goldlib/gcfg/gxra.cpp index 11b07b4..6285c8d 100644 --- a/goldlib/gcfg/gxra.cpp +++ b/goldlib/gcfg/gxra.cpp @@ -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); diff --git a/goldlib/gcfg/gxraecho.cpp b/goldlib/gcfg/gxraecho.cpp index 1bd0ee8..85564d8 100644 --- a/goldlib/gcfg/gxraecho.cpp +++ b/goldlib/gcfg/gxraecho.cpp @@ -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) { diff --git a/goldlib/gcfg/gxspace.cpp b/goldlib/gcfg/gxspace.cpp index 7bc9322..fdf208b 100644 --- a/goldlib/gcfg/gxspace.cpp +++ b/goldlib/gcfg/gxspace.cpp @@ -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; diff --git a/goldlib/gcfg/gxsquish.cpp b/goldlib/gcfg/gxsquish.cpp index 74a45e6..8c4318a 100644 --- a/goldlib/gcfg/gxsquish.cpp +++ b/goldlib/gcfg/gxsquish.cpp @@ -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(); diff --git a/goldlib/gcfg/gxsuper.cpp b/goldlib/gcfg/gxsuper.cpp index 4a42256..99b583f 100644 --- a/goldlib/gcfg/gxsuper.cpp +++ b/goldlib/gcfg/gxsuper.cpp @@ -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)); } } diff --git a/goldlib/gcfg/gxsync.cpp b/goldlib/gcfg/gxsync.cpp index 7152ddd..3786bbc 100644 --- a/goldlib/gcfg/gxsync.cpp +++ b/goldlib/gcfg/gxsync.cpp @@ -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 diff --git a/goldlib/gcfg/gxtimed.cpp b/goldlib/gcfg/gxtimed.cpp index 27cf137..77cee59 100644 --- a/goldlib/gcfg/gxtimed.cpp +++ b/goldlib/gcfg/gxtimed.cpp @@ -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(); diff --git a/goldlib/gcfg/gxtmail.cpp b/goldlib/gcfg/gxtmail.cpp index 6c17ee2..2a153fd 100644 --- a/goldlib/gcfg/gxtmail.cpp +++ b/goldlib/gcfg/gxtmail.cpp @@ -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(); diff --git a/goldlib/gcfg/gxts.cpp b/goldlib/gcfg/gxts.cpp index 666ae06..1933265 100644 --- a/goldlib/gcfg/gxts.cpp +++ b/goldlib/gcfg/gxts.cpp @@ -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 diff --git a/goldlib/gcfg/gxwmail.cpp b/goldlib/gcfg/gxwmail.cpp index 63f0975..0e08c33 100644 --- a/goldlib/gcfg/gxwmail.cpp +++ b/goldlib/gcfg/gxwmail.cpp @@ -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)) { diff --git a/goldlib/gcfg/gxwtr.cpp b/goldlib/gcfg/gxwtr.cpp index 86a7a07..419d19a 100644 --- a/goldlib/gcfg/gxwtr.cpp +++ b/goldlib/gcfg/gxwtr.cpp @@ -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); } diff --git a/goldlib/gcfg/gxxbbs.cpp b/goldlib/gcfg/gxxbbs.cpp index 8936be4..97c8b86 100644 --- a/goldlib/gcfg/gxxbbs.cpp +++ b/goldlib/gcfg/gxxbbs.cpp @@ -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(); diff --git a/goldlib/gcfg/gxxmail.cpp b/goldlib/gcfg/gxxmail.cpp index f1fe857..bf5ce5b 100644 --- a/goldlib/gcfg/gxxmail.cpp +++ b/goldlib/gcfg/gxxmail.cpp @@ -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) {