paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-12 06:26:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed case aware file searching in case filename also contains a path

Browse Source 
(fixes webtbs/tw1279 regression after yesterday's changes)

git-svn-id: trunk@7891 -
This commit is contained in:
Jonas Maebe 2007-07-01 09:56:55 +00:00
parent 096d5b8485
commit fb00c0e253
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/cfileutl.pas
View File

@ -321,7 +321,11 @@ implementation
Result:=false; Result:=false;
CachedDir:=GetDirectory(ExtractFileDir(AName)); CachedDir:=GetDirectory(ExtractFileDir(AName));
if assigned(CachedDir) then 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; end;
@ -505,11 +509,8 @@ implementation
if allowcache then if allowcache then
begin begin
result:=DirCache.FileExistsCaseAware(FoundFile,fn2); result:=DirCache.FileExistsCaseAware(FoundFile,fn2);
if (result) then if result then
begin exit
FoundFile:=path+fn2;
exit
end
end end
else else
{$endif usedircache} {$endif usedircache}
@ -517,7 +518,7 @@ implementation
begin begin
{ don't know the real name in this case } { don't know the real name in this case }
result:=true; result:=true;
exit; exit;
end; end;
end end
else else