Handle #13#10 line ending for Windows

git-svn-id: trunk@29727 -
This commit is contained in:
pierre 2015-02-16 20:45:18 +00:00
parent b823ac6755
commit 6e2b97a15c

View File

@ -59,11 +59,20 @@ begin
while FProcess.Running do
begin
FProcess.Output.Read(C, 1);
if C = #10 then
begin
DebugLn(Result);
exit;
end;
{$ifdef windows}
{ On windows we expect both #13 and #10 }
if C = #13 then
begin
FPRocess.Output.Read(C,1);
{$endif windows}
if C = #10 then
begin
DebugLn(Result);
exit;
end;
{$ifdef windows}
end;
{$endif windows}
Result := Result + C;
end;
end;