From 6cabe7740fb4c93178e40d323f5eaf945e555bb6 Mon Sep 17 00:00:00 2001 From: michaelangel007 Date: Fri, 25 Aug 2017 08:56:23 -0700 Subject: [PATCH] #481 Extend arguments from 55 chars to 127 chars --- source/Debugger/Debugger_Parser.cpp | 8 ++++++-- source/Debugger/Debugger_Types.h | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/Debugger/Debugger_Parser.cpp b/source/Debugger/Debugger_Parser.cpp index 5244d054..46edfeef 100644 --- a/source/Debugger/Debugger_Parser.cpp +++ b/source/Debugger/Debugger_Parser.cpp @@ -111,7 +111,7 @@ int _Arg_1( LPTSTR pName ) } else { - _tcsncpy( g_aArgs[1].sArg, pName, MAX_ARG_LEN - 1 ); + _tcsncpy( g_aArgs[1].sArg, pName, MAX_ARG_LEN ); } return 1; } @@ -304,7 +304,11 @@ int ArgsGet ( TCHAR * pInput ) if (nBuf > 0) { - nLen = MIN( nBuf, MAX_ARG_LEN-1 ); + // Does anyone actually "need" > 132 character output??? + // Technically, we are capped via ParseInput(), g_aArgs[ iArg ] = g_aArgRaw[ iArg ]; + //if (iTokenSrc == TOKEN_QUOTE_DOUBLE) + // nLen = nBuf; + nLen = MIN( nBuf, MAX_ARG_LEN ); // NOTE: see Arg_t.sArg[] // GH#481 _tcsncpy( pArg->sArg, pSrc, nLen ); pArg->sArg[ nLen ] = 0; pArg->nArgLen = nLen; diff --git a/source/Debugger/Debugger_Types.h b/source/Debugger/Debugger_Types.h index d50bdde8..2fa7f557 100644 --- a/source/Debugger/Debugger_Types.h +++ b/source/Debugger/Debugger_Types.h @@ -256,7 +256,7 @@ MAX_ARGS = 32, // was 40 ARG_SYNTAX_ERROR= -1, - MAX_ARG_LEN = 56, // was 12, extended to allow font names + MAX_ARG_LEN = 127, // extended to allow font names, GH#481, any value is good > CONSOLE_WIDTH=80 }; // NOTE: All Commands return flags of what needs to be redrawn @@ -1259,7 +1259,7 @@ const DisasmData_t* pDisasmData; // If != NULL then bytes are marked up as data struct Arg_t { - char sArg[ MAX_ARG_LEN ]; // Array chars comes first, for alignment + char sArg[ MAX_ARG_LEN+1 ]; // Array chars comes first, for alignment, GH#481 echo 55 char limit int nArgLen; // Needed for TextSearch "ABC\x00" WORD nValue ; // 2 // WORD nVal1 ; // 2