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

lazutils: use GetPhysicalFilename instead of readalllinks

Browse Source 
git-svn-id: trunk@45242 -
This commit is contained in:
mattias 2014-05-30 12:40:24 +00:00
parent 0d7fcf4e66
commit 9f680e7c26
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazutils/fileutil.inc
View File

@ -229,10 +229,8 @@ begin
File1:=Filename1;
File2:=Filename2;
if ResolveLinks then begin
File1:=ReadAllLinks(File1,false);
if (File1='') then File1:=Filename1;
File2:=ReadAllLinks(File2,false);
if (File2='') then File2:=Filename2;
File1:=GetPhysicalFilename(File1,pfeOriginal);
File2:=GetPhysicalFilename(File2,pfeOriginal);
end;
Result:=CompareFilenames(File1,File2);
end;
@ -468,7 +466,7 @@ begin
Result:=SearchFileInPath(Result,'',GetEnvironmentVariableUTF8('PATH'),':',Flags);
end;
// resolve links
Result:=ReadAllLinks(Result,false);
Result:=GetPhysicalFilename(Result,pfeOriginal);
// extract file path and expand to full name
Result:=ExpandFileNameUTF8(ExtractFilePath(Result));
end;

1
components/lazutils/unixlazfileutils.inc
View File

@ -158,6 +158,7 @@ begin
end;
end;
until false;
Result:=ResolveDots(Result);
end;
function CreateDirUTF8(const NewDir: String): Boolean;