mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-11 18:58:17 +02:00
LCL: fixed FileIsText to skip BOMs
git-svn-id: trunk@27523 -
This commit is contained in:
parent
5ad19b1d4b
commit
250603ab78
@ -86,6 +86,7 @@ function FileIsExecutable(const AFilename: string): boolean;
|
||||
function FileIsReadable(const AFilename: string): boolean;
|
||||
function FileIsWritable(const AFilename: string): boolean;
|
||||
function FileIsText(const AFilename: string): boolean;
|
||||
function FileIsText(const AFilename: string; out FileReadable: boolean): boolean;
|
||||
function FilenameIsTrimmed(const TheFilename: string): boolean;
|
||||
function FilenameIsTrimmed(StartPos: PChar; NameLen: integer): boolean;
|
||||
function TrimFilename(const AFilename: string): string;
|
||||
@ -1092,32 +1093,54 @@ begin
|
||||
end;
|
||||
|
||||
function FileIsText(const AFilename: string): boolean;
|
||||
var fs: TFileStream;
|
||||
var
|
||||
FileReadable: Boolean;
|
||||
begin
|
||||
Result:=FileIsText(AFilename,FileReadable);
|
||||
if FileReadable then ;
|
||||
end;
|
||||
|
||||
function FileIsText(const AFilename: string; out FileReadable: boolean): boolean;
|
||||
var
|
||||
fs: TFileStream;
|
||||
Buf: string;
|
||||
Len, i: integer;
|
||||
Len: integer;
|
||||
NewLine: boolean;
|
||||
Size: Int64;
|
||||
p: PChar;
|
||||
begin
|
||||
Result:=false;
|
||||
FileReadable:=true;
|
||||
try
|
||||
fs:=TFileStream.Create(UTF8ToSys(AFilename),fmOpenRead or fmShareDenyNone);
|
||||
fs := TFileStream.Create(UTF8ToSys(AFilename), fmOpenRead or fmShareDenyNone);
|
||||
try
|
||||
// read the first 1024 bytes
|
||||
Len:=1024;
|
||||
Size:=fs.Size;
|
||||
if Len>Size then Len:=integer(Size);
|
||||
SetLength(Buf,1024+1);
|
||||
Len:=fs.Read(Buf[1],length(Buf));
|
||||
if Len>0 then begin
|
||||
SetLength(Buf,Len);
|
||||
fs.Read(Buf[1],length(Buf));
|
||||
Buf[Len+1]:=#0;
|
||||
p:=PChar(Buf);
|
||||
if (p[0]=#$EF) and (p[1]=#$BB) and (p[2]=#$BF) then begin
|
||||
// UTF-8 BOM (Byte Order Mark)
|
||||
inc(p,3);
|
||||
end else if (p[0]=#$FF) and (p[1]=#$FE) then begin
|
||||
// ucs-2le BOM FF FE
|
||||
inc(p,2);
|
||||
end else if (p[0]=#$FE) and (p[1]=#$FF) then begin
|
||||
// ucs-2be BOM FE FF
|
||||
inc(p,2);
|
||||
end;
|
||||
NewLine:=false;
|
||||
for i:=1 to length(Buf) do begin
|
||||
case Buf[i] of
|
||||
while true do begin
|
||||
case p^ of
|
||||
#0: if p-PChar(Buf)>=Len then break;
|
||||
// #10,#13: new line
|
||||
// #12: form feed
|
||||
// #26: end of file
|
||||
#0..#8,#11,#14..#25,#27..#31: exit;
|
||||
#1..#8,#11,#14..#25,#27..#31: exit;
|
||||
#10,#13: NewLine:=true;
|
||||
end;
|
||||
inc(p);
|
||||
end;
|
||||
if NewLine or (Len<1024) then
|
||||
Result:=true;
|
||||
@ -1127,6 +1150,9 @@ begin
|
||||
fs.Free;
|
||||
end;
|
||||
except
|
||||
on E: Exception do begin
|
||||
FileReadable:=false;
|
||||
end;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
@ -558,9 +558,9 @@ function FileIsText(const AFilename: string; out FileReadable: boolean): boolean
|
||||
var
|
||||
fs: TFileStream;
|
||||
Buf: string;
|
||||
Len, i: integer;
|
||||
Len: integer;
|
||||
NewLine: boolean;
|
||||
Size: Int64;
|
||||
p: PChar;
|
||||
begin
|
||||
Result:=false;
|
||||
FileReadable:=true;
|
||||
@ -569,20 +569,32 @@ begin
|
||||
try
|
||||
// read the first 1024 bytes
|
||||
Len:=1024;
|
||||
Size:=fs.Size;
|
||||
if Len>Size then Len:=integer(Size);
|
||||
SetLength(Buf,1024+1);
|
||||
Len:=fs.Read(Buf[1],length(Buf));
|
||||
if Len>0 then begin
|
||||
SetLength(Buf,Len);
|
||||
fs.Read(Buf[1],length(Buf));
|
||||
Buf[Len+1]:=#0;
|
||||
p:=PChar(Buf);
|
||||
if (p[0]=#$EF) and (p[1]=#$BB) and (p[2]=#$BF) then begin
|
||||
// UTF-8 BOM (Byte Order Mark)
|
||||
inc(p,3);
|
||||
end else if (p[0]=#$FF) and (p[1]=#$FE) then begin
|
||||
// ucs-2le BOM FF FE
|
||||
inc(p,2);
|
||||
end else if (p[0]=#$FE) and (p[1]=#$FF) then begin
|
||||
// ucs-2be BOM FE FF
|
||||
inc(p,2);
|
||||
end;
|
||||
NewLine:=false;
|
||||
for i:=1 to length(Buf) do begin
|
||||
case Buf[i] of
|
||||
while true do begin
|
||||
case p^ of
|
||||
#0: if p-PChar(Buf)>=Len then break;
|
||||
// #10,#13: new line
|
||||
// #12: form feed
|
||||
// #26: end of file
|
||||
#0..#8,#11,#14..#25,#27..#31: exit;
|
||||
#1..#8,#11,#14..#25,#27..#31: exit;
|
||||
#10,#13: NewLine:=true;
|
||||
end;
|
||||
inc(p);
|
||||
end;
|
||||
if NewLine or (Len<1024) then
|
||||
Result:=true;
|
||||
|
@ -5841,19 +5841,19 @@ begin
|
||||
exit;
|
||||
end;
|
||||
|
||||
// try BOM (Byte Order Mark)
|
||||
// try UTF-8 BOM (Byte Order Mark)
|
||||
if CompareI(@s[1],#$EF#$BB#$BF,3) then begin
|
||||
Result:=EncodingUTF8BOM;
|
||||
exit;
|
||||
end;
|
||||
|
||||
// try BOM FF FE for ucs-2le
|
||||
// try ucs-2le BOM FF FE
|
||||
if (length(s)>=2) and (s[1]=#$FF) and (s[2]=#$FE) then begin
|
||||
Result:=EncodingUCS2LE;
|
||||
exit;
|
||||
end;
|
||||
|
||||
// try BOM FE FF for ucs-2be
|
||||
// try ucs-2be BOM FE FF
|
||||
if (length(s)>=2) and (s[1]=#$FE) and (s[2]=#$FF) then begin
|
||||
Result:=EncodingUCS2BE;
|
||||
exit;
|
||||
|
Loading…
Reference in New Issue
Block a user