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

Fix garbage screen output on Linux

Browse Source
This commit is contained in:
Stas Degteff
2006-01-20 11:55:12 +00:00
parent 10f34e6765
commit a9cfb10027
51 changed files with 177 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
golded3/gcarea.cpp
View File

@@ -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)) {

26
golded3/gccfgg.cpp
View File

@@ -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);
}

20
golded3/gccfgg0.cpp
View File

@@ -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++;
}

2
golded3/gccfgg1.cpp
View File

@@ -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;

6
golded3/gccfgg7.cpp
View File

@@ -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);
}
// ------------------------------------------------------------------

4
golded3/gccfgg8.cpp
View File

@@ -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++;
}
}

12
golded3/gckeys.cpp
View File

@@ -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;

4
golded3/gclang.cpp
View File

@@ -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++;
}

10
golded3/gcmisc.cpp
View File

@@ -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);
}

4
golded3/gedoss.cpp
View File

@@ -192,12 +192,12 @@ void Cleanup(void) {
int smax = MinV((int)GLOG_STORELINES, LOG.storelines);
for (int s=0; s<smax; s++)
STD_PRINT(LOG.storeline[s] << std::endl);
STD_PRINTNL(LOG.storeline[s]);
if (CFG)
{
if (LOG.storelines > 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);

62
golded3/geinit.cpp
View File

@@ -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<configfile> Use a different configuration file.\r\n");
STD_PRINT("-D Disable old obsolete configuration keywords.\r\n");
STD_PRINT("-E<echoid> 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<configfile> Use a different configuration file.");
STD_PRINTNL("-D Disable old obsolete configuration keywords.");
STD_PRINTNL("-E<echoid> 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<sortspec> Sorts all mail areas according to the sort specs.\r\n");
STD_PRINT("-T<seconds> 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<sortspec> Sorts all mail areas according to the sort specs.");
STD_PRINTNL("-T<seconds> 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();
}

4
golded3/geplay.cpp
View File

@@ -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;