paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-07 09:16:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Debugger: Strip LineEnd when scanning debugger output

Browse Source 
git-svn-id: trunk@24481 -
This commit is contained in:
marc 2010-04-06 23:23:40 +00:00
parent d855a69649
commit 24bd03d778
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debugger/cmdlinedebugger.pp
View File

@ -319,8 +319,8 @@ begin
if MinIdx < MaxInt if MinIdx < MaxInt
then begin then begin
n := MinIdx + Length(LineEndMatch) - 1; Dec(MinIdx);
Result := Copy(FOutputBuf, 1, n); Result := Copy(FOutputBuf, 1, MinIdx);
if APeek if APeek
then begin then begin
if PeekCount = FPeekOffset if PeekCount = FPeekOffset
@ -330,7 +330,7 @@ begin
Continue; Continue;
end; end;
end end
else Delete(FOutputBuf, 1, n); else Delete(FOutputBuf, 1, MinIdx + Length(LineEndMatch));
DoDbgOutput(Result); DoDbgOutput(Result);
Break; Break;

8
debugger/gdbmidebugger.pp
View File

@ -3442,11 +3442,11 @@ begin
// Get initial debugger lines // Get initial debugger lines
S := ''; S := '';
Line := StripLN(ReadLine); Line := ReadLine;
while DebugProcessRunning and (Line <> '(gdb) ') do while DebugProcessRunning and (Line <> '(gdb) ') do
begin begin
S := S + Line + LineEnding; S := S + Line + LineEnding;
Line := StripLN(ReadLine); Line := ReadLine;
end; end;
if S <> '' if S <> ''
then MessageDlg('Debugger', 'Initialization output: ' + LineEnding + S, then MessageDlg('Debugger', 'Initialization output: ' + LineEnding + S,
@ -3574,7 +3574,7 @@ begin
AResult.Flags := []; AResult.Flags := [];
AResult.State := dsNone; AResult.State := dsNone;
repeat repeat
S := StripLN(ReadLine); S := ReadLine;
if S = '' then Continue; if S = '' then Continue;
if S = '(gdb) ' then Break; if S = '(gdb) ' then Break;
@ -3660,7 +3660,7 @@ begin
Result := True; Result := True;
while DebugProcessRunning do while DebugProcessRunning do
begin begin
S := StripLN(ReadLine); S := ReadLine;
if S = '(gdb) ' then Break; if S = '(gdb) ' then Break;
while S <> '' do while S <> '' do