|
@@ -61,20 +61,21 @@ begin
|
|
|
while FProcess.Running do
|
|
|
begin
|
|
|
FProcess.Output.Read(C, 1);
|
|
|
- {$ifdef windows}
|
|
|
- { On windows we expect both #13 and #10 }
|
|
|
+{$ifdef windows}
|
|
|
+ { On windows we expect both #13#10 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}
|
|
|
+ begin
|
|
|
+ FProcess.Output.Read(C, 1);
|
|
|
+ if C <> #10 then
|
|
|
+ { #13 not followed by #10, what should we do? }
|
|
|
+ Result := Result + #13;
|
|
|
+ end;
|
|
|
+{$endif windows}
|
|
|
+ if C = #10 then
|
|
|
+ begin
|
|
|
+ DebugLn(Result);
|
|
|
+ exit;
|
|
|
+ end;
|
|
|
Result := Result + C;
|
|
|
end;
|
|
|
end;
|