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

* implement FollowLink=False handling for DirectoryExists and FileExists on *nix systems

Browse Source 
git-svn-id: trunk@43112 -
This commit is contained in:
svenbarth 2019-10-03 12:07:28 +00:00
parent 46dac1419e
commit 2a38d07d8f
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rtl/unix/sysutils.pp
View File

@ -619,25 +619,39 @@ Function FileExists (Const FileName : RawByteString; FollowLink : Boolean) : Boo
var
Info : Stat;
SystemFileName: RawByteString;
isdir: Boolean;
begin
SystemFileName:=ToSingleByteFileSystemEncodedFileName(FileName);
// Don't use stat. It fails on files >2 GB.
// Access obeys the same access rules, so the result should be the same.
FileExists:=fpAccess(pointer(SystemFileName),F_OK)=0;
{ we need to ensure however that we aren't dealing with a directory }
isdir:=False;
if FileExists then begin
if (fpstat(pointer(SystemFileName),Info)>=0) and fpS_ISDIR(Info.st_mode) then
if (fpstat(pointer(SystemFileName),Info)>=0) and fpS_ISDIR(Info.st_mode) then begin
FileExists:=False;
isdir:=True;
end;
end;
{ if we shall not follow the link we only need to check for a symlink if the
target file itself should not exist }
if not FileExists and not isdir and not FollowLink then
FileExists:=(fplstat(pointer(SystemFileName),Info)>=0) and fpS_ISLNK(Info.st_mode);
end;
Function DirectoryExists (Const Directory : RawByteString; FollowLink : Boolean) : Boolean;
Var
Info : Stat;
SystemFileName: RawByteString;
exists: Boolean;
begin
SystemFileName:=ToSingleByteFileSystemEncodedFileName(Directory);
DirectoryExists:=(fpstat(pointer(SystemFileName),Info)>=0) and fpS_ISDIR(Info.st_mode);
exists:=fpstat(pointer(SystemFileName),Info)>=0;
DirectoryExists:=exists and fpS_ISDIR(Info.st_mode);
{ if we shall not follow the link we only need to check for a symlink if the
target directory itself should not exist }
if not exists and not FollowLink then
DirectoryExists:=(fplstat(pointer(SystemFileName),Info)>=0) and fpS_ISLNK(Info.st_mode);
end;
Function LinuxToWinAttr (const FN : RawByteString; Const Info : Stat) : Longint;