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

lazutils: simplified

Browse Source 
git-svn-id: branches/fixes_1_6@53411 -
This commit is contained in:
mattias 2016-11-21 16:21:18 +00:00
parent d41ab3e619
commit 6b5cd40de6
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/lazutils/fileutil.inc
View File

@ -958,17 +958,16 @@ begin
if (FileInfo.Name='.') or (FileInfo.Name='..') or (FileInfo.Name='')
then
continue;
if LazFileUtils.CompareFilenamesIgnoreCase(FileInfo.Name,ShortFilename)=0 then begin
if FileInfo.Name=ShortFilename then begin
// fits exactly
//Don't return (unaltered) Filename: otherwise possible changes by ResolveDots get lost
Result:=CurDir+FileInfo.Name;
break;
end;
// fits case insensitive
if LazFileUtils.CompareFilenamesIgnoreCase(FileInfo.Name,ShortFilename)<>0 then
continue;
if FileInfo.Name=ShortFilename then begin
// fits exactly
//Don't return (unaltered) Filename: otherwise possible changes by ResolveDots get lost
Result:=CurDir+FileInfo.Name;
// search further
break;
end;
// fits case insensitive
Result:=CurDir+FileInfo.Name;
until LazFileUtils.FindNextUTF8(FileInfo)<>0;
end;
LazFileUtils.FindCloseUTF8(FileInfo);