lazutils: simplified

git-svn-id: trunk@53403 -
This commit is contained in:
mattias 2016-11-21 16:05:02 +00:00
parent 0e82e34295
commit e53ad0a63b
2 changed files with 8 additions and 9 deletions

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);

Binary file not shown.