* Debugger: Strip LineEnd when scanning debugger output

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

View File

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

View File

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