paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-10 14:56:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Add function UTF8CompareTextP, use it in CompareFilenamesP.

Browse Source 
git-svn-id: trunk@64391 -
This commit is contained in:
juha 2021-01-14 21:54:49 +00:00
parent 5d09547a8f
commit 4c27531f6f
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
components/lazutils/lazfileutils.pas
View File

@ -319,16 +319,12 @@ end;
function CompareFilenamesP(Filename1, Filename2: PChar; function CompareFilenamesP(Filename1, Filename2: PChar;
IgnoreCase: boolean = false): integer; IgnoreCase: boolean = false): integer;
{$IFDEF darwin}
var var
{$IFDEF darwin}
F1: CFStringRef; F1: CFStringRef;
F2: CFStringRef; F2: CFStringRef;
Flags: CFStringCompareFlags; Flags: CFStringCompareFlags;
{$ELSE} {$ENDIF}
File1, File2: string;
Len1: SizeInt;
Len2: SizeInt;
{$ENDIF}
begin begin
if (Filename1=nil) or (Filename1^=#0) then begin if (Filename1=nil) or (Filename1^=#0) then begin
if (Filename2=nil) or (Filename2^=#0) then begin if (Filename2=nil) or (Filename2^=#0) then begin
@ -356,19 +352,12 @@ begin
CFRelease(F1); CFRelease(F1);
CFRelease(F2); CFRelease(F2);
{$ELSE} {$ELSE}
if IgnoreCase then begin if IgnoreCase then // compare case insensitive
// compare case insensitive Result:=UTF8CompareTextP(Filename1, Filename2)
Len1:=StrLen(Filename1); else begin
SetLength(File1,Len1);
System.Move(Filename1^,File1[1],Len1);
Len2:=StrLen(Filename2);
SetLength(File2,Len2);
System.Move(Filename2^,File2[1],Len2);
Result:=UTF8CompareText(File1,File2);
end else begin
// compare literally // compare literally
while (Filename1^=Filename2^) and (Filename1^<>#0) do begin while (Filename1^=Filename2^) and (Filename1^<>#0) do begin
inc(Filename1); Inc(Filename1);
Inc(Filename2); Inc(Filename2);
end; end;
Result:=ord(Filename1^)-ord(Filename2^); Result:=ord(Filename1^)-ord(Filename2^);

6
components/lazutils/lazutf8.pas
View File

@ -173,6 +173,7 @@ function UTF8CompareStr(const S1, S2: string): PtrInt; inline;
function UTF8CompareStrP(S1, S2: PChar): PtrInt; function UTF8CompareStrP(S1, S2: PChar): PtrInt;
function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt): PtrInt; function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt): PtrInt;
function UTF8CompareText(const S1, S2: string): PtrInt; function UTF8CompareText(const S1, S2: string): PtrInt;
function UTF8CompareTextP(S1, S2: PChar): PtrInt;
function UTF8CompareLatinTextFast(const S1, S2: String): PtrInt; function UTF8CompareLatinTextFast(const S1, S2: String): PtrInt;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt; {$IFnDEF ACP_RTL}inline;{$endif} function UTF8CompareStrCollated(const S1, S2: string): PtrInt; {$IFnDEF ACP_RTL}inline;{$endif}
function CompareStrListUTF8LowerCase(List: TStringList; Index1, Index2: Integer): Integer; function CompareStrListUTF8LowerCase(List: TStringList; Index1, Index2: Integer): Integer;
@ -3400,6 +3401,11 @@ begin
Result := WideCompareText(UTF8ToUTF16(S1),UTF8ToUTF16(S2)); Result := WideCompareText(UTF8ToUTF16(S1),UTF8ToUTF16(S2));
end; end;
function UTF8CompareTextP(S1, S2: PChar): PtrInt;
begin
Result := WideCompareText(UTF8ToUTF16(S1,StrLen(S1)), UTF8ToUTF16(S2,StrLen(S2)));
end;
function UTF8CompareLatinTextFast(const S1, S2: String): PtrInt; function UTF8CompareLatinTextFast(const S1, S2: String): PtrInt;
// Like UTF8CompareText but does not return strict alphabetical order. // Like UTF8CompareText but does not return strict alphabetical order.
// The order is deterministic and good for binary search and such uses. // The order is deterministic and good for binary search and such uses.