paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 21:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Fix bug #33043

Browse Source 
git-svn-id: trunk@38017 -
This commit is contained in:
michael 2018-01-20 14:40:19 +00:00
parent b4d8ea7477
commit ea00dc02cc
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/fcl-base/src/streamio.pp
View File

@ -38,51 +38,53 @@ Type
---------------------------------------------------------------------} ---------------------------------------------------------------------}
Function StreamRead(var F: TTextRec) : longint; procedure StreamRead(var F: TTextRec);
begin begin
Result:=0; InOutRes:=0;
With F do With F do
Try Try
Bufend:=GetStream(F).Read(BufPtr^,BufSize); Bufend:=GetStream(F).Read(BufPtr^,BufSize);
BufPos:=0; BufPos:=0;
except except
Result:=100; InOutRes:=100;
end; end;
end; end;
Function StreamWrite(var F: TTextRec ): longint; procedure StreamWrite(var F: TTextRec );
begin begin
Result:=0; InOutRes:=0;
with F do with F do
if (BufPos>0) then if (BufPos>0) then
try try
GetStream(F).WriteBuffer(BufPtr^,BufPos); GetStream(F).WriteBuffer(BufPtr^,BufPos);
BufPos:=0; BufPos:=0;
except except
Result:=101; InOutRes:=101;
end; end;
end; end;
Function StreamFlush(var F: TTextRec): longint; {$PUSH}
{$WARN 5024 OFF : Parameter "$1" not used}
Procedure StreamFlush(var F: TTextRec);
begin begin
Result:=0; InOutRes:=0;
end; end;
Function StreamClose(var F: TTextRec): longint; procedure StreamClose(var F: TTextRec);
begin begin
Result:=0; InOutRes:=0;
end; end;
{$POP}
Procedure StreamOpen(var F: TTextRec );
Function StreamOpen(var F: TTextRec ): longint;
begin begin
Result := 0; InOutRes:=0;
with F do with F do
begin begin
BufPos:=0; BufPos:=0;
@ -101,7 +103,7 @@ begin
Try Try
GetStream(F).Seek(0,soFromEnd); GetStream(F).Seek(0,soFromEnd);
except except
Result:=156; InOutRes:=156;
end; end;
end; end;
end; end;
@ -130,11 +132,11 @@ begin
begin begin
OpenFunc:=@StreamOpen; OpenFunc:=@StreamOpen;
CloseFunc:=@StreamClose; CloseFunc:=@StreamClose;
Case DefaultTextLineBreakStyle Of Case DefaultTextLineBreakStyle Of
tlbsLF: TextRec(f).LineEnd := #10; tlbsLF: LineEnd:=#10;
tlbsCRLF: TextRec(f).LineEnd := #13#10; tlbsCRLF: LineEnd:=#13#10;
tlbsCR: TextRec(f).LineEnd := #13; tlbsCR: LineEnd:=#13;
End; End;
PStream(@UserData)^:=Stream; PStream(@UserData)^:=Stream;
Mode:=fmClosed; Mode:=fmClosed;
BufSize:=SizeOf(Buffer); BufSize:=SizeOf(Buffer);