mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-04-20 04:59:26 +02:00
* fixed case aware file searching in case filename also contains a path
(fixes webtbs/tw1279 regression after yesterday's changes) git-svn-id: trunk@7891 -
This commit is contained in:
parent
096d5b8485
commit
fb00c0e253
@ -321,7 +321,11 @@ implementation
|
||||
Result:=false;
|
||||
CachedDir:=GetDirectory(ExtractFileDir(AName));
|
||||
if assigned(CachedDir) then
|
||||
Result:=CachedDir.FileExistsCaseAware(ExtractFileName(AName),FoundName);
|
||||
begin
|
||||
Result:=CachedDir.FileExistsCaseAware(ExtractFileName(AName),FoundName);
|
||||
if Result then
|
||||
FoundName:=ExtractFilePath(AName)+FoundName;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
@ -505,11 +509,8 @@ implementation
|
||||
if allowcache then
|
||||
begin
|
||||
result:=DirCache.FileExistsCaseAware(FoundFile,fn2);
|
||||
if (result) then
|
||||
begin
|
||||
FoundFile:=path+fn2;
|
||||
exit
|
||||
end
|
||||
if result then
|
||||
exit
|
||||
end
|
||||
else
|
||||
{$endif usedircache}
|
||||
@ -517,7 +518,7 @@ implementation
|
||||
begin
|
||||
{ don't know the real name in this case }
|
||||
result:=true;
|
||||
exit;
|
||||
exit;
|
||||
end;
|
||||
end
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user