Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Debugger: CmdOutputRun: 

. for scripts that can be loaded: output script pathname to console.
. for scripts that can't be loaded: don't truncate pathname that's output to console.
This commit is contained in:
tomcw 2024-01-01 11:11:51 +00:00
parent 06cc8b46e2
commit fea4173b43
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/Debugger/Debug.cpp
View File

@ -6408,6 +6408,9 @@ Update_t CmdOutputRun (int nArgs)
{ {
g_bScriptReadOk = true; g_bScriptReadOk = true;
ConsolePrintFormat("%sRun script: ", CHC_INFO);
ConsolePrintFormat("%s%s", CHC_PATH, sFileName.c_str()); // Output pathname to console to indicate the script has been read
int nLine = script.GetNumLines(); int nLine = script.GetNumLines();
Update_t bUpdateDisplay = UPDATE_NOTHING; Update_t bUpdateDisplay = UPDATE_NOTHING;
@ -6421,9 +6424,8 @@ Update_t CmdOutputRun (int nArgs)
} }
else else
{ {
std::string sMiniFileName = sFileName.substr(0, MIN(sFileName.size(), CONSOLE_WIDTH)); ConsolePrintFormat("%sCouldn't load script:", CHC_WARNING);
ConsolePrintFormat("%sCouldn't load filename:", CHC_ERROR); ConsolePrintFormat("%s%s", CHC_STRING, sFileName.c_str());
ConsolePrintFormat("%s%s", CHC_STRING, sMiniFileName.c_str());
} }
return ConsoleUpdate(); return ConsoleUpdate();
@ -9011,28 +9013,28 @@ void DebugInitialize ()
// Look in g_sCurrentDir, otherwise try g_sProgramDir // Look in g_sCurrentDir, otherwise try g_sProgramDir
std::string pathname = g_sCurrentDir + debuggerAutoRunName; std::string pathname = g_sCurrentDir + debuggerAutoRunName;
if (pathname.size() >= MAX_PATH) errno_t error = strncpy_s(g_aArgs[1].sArg, MAX_PATH, pathname.c_str(), pathname.size());
if (error != 0)
{ {
ConsolePrintFormat("%sPathname too long:", CHC_ERROR); ConsolePrintFormat("%sPathname too long:", CHC_ERROR);
ConsolePrintFormat("%s%s", CHC_STRING, pathname.c_str()); ConsolePrintFormat("%s%s", CHC_STRING, pathname.c_str());
} }
else else
{ {
strncpy_s(g_aArgs[1].sArg, MAX_PATH, pathname.c_str(), _TRUNCATE);
CmdOutputRun(1); CmdOutputRun(1);
} }
if (!g_bScriptReadOk) if (!g_bScriptReadOk)
{ {
pathname = g_sProgramDir + debuggerAutoRunName; pathname = g_sProgramDir + debuggerAutoRunName;
if (pathname.size() >= MAX_PATH) error = strncpy_s(g_aArgs[1].sArg, MAX_PATH, pathname.c_str(), pathname.size());
if (error != 0)
{ {
ConsolePrintFormat("%sPathname too long:", CHC_ERROR); ConsolePrintFormat("%sPathname too long:", CHC_ERROR);
ConsolePrintFormat("%s%s", CHC_STRING, pathname.c_str()); ConsolePrintFormat("%s%s", CHC_STRING, pathname.c_str());
} }
else else
{ {
strncpy_s(g_aArgs[1].sArg, MAX_PATH, pathname.c_str(), _TRUNCATE);
CmdOutputRun(1); CmdOutputRun(1);
} }
} }

1
source/Debugger/Debugger_Symbols.cpp
View File

@ -646,7 +646,6 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
{ {
bFileDisplayed = true; bFileDisplayed = true;
// TODO: Must check for buffer overflow !
ConsolePrintFormat( "%s%s" ConsolePrintFormat( "%s%s"
, CHC_PATH , CHC_PATH
, pPathFileName.c_str() , pPathFileName.c_str()