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

pastojs: fixed DirectoryExists using FileAttr

Browse Source 
git-svn-id: trunk@43159 -
This commit is contained in:
Mattias Gaertner 2019-10-09 21:01:03 +00:00
parent e0041a8244
commit 01f82551a4
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/pastojs/src/pas2jsfilecache.pp
View File

@ -905,17 +905,25 @@ end;
function TPas2jsCachedDirectories.DirectoryExists(Filename: string): boolean;
var
Info: TFileInfo;
Dir: TPas2jsCachedDirectory;
begin
Dir:=GetDirectory(Filename,true,false);
if Dir<>nil then
Result:=Dir.Count>0
Info.Filename:=Filename;
if not GetFileInfo(Info) then exit(false);
if Info.Dir<>nil then
Result:=(Info.Dir.FileAttr(Info.ShortFilename) and faDirectory)>0
else
begin
Filename:=ChompPathDelim(ResolveDots(Filename));
if not FilenameIsAbsolute(Filename) then
Filename:=WorkingDirectory+Filename;
Result:={$IFDEF pas2js}NodeJSFS{$ELSE}SysUtils{$ENDIF}.DirectoryExists(Filename);
Dir:=GetDirectory(Filename,true,false);
if Dir<>nil then
Result:=Dir.Count>0
else
begin
Filename:=ChompPathDelim(ResolveDots(Filename));
if not FilenameIsAbsolute(Filename) then
Filename:=WorkingDirectory+Filename;
Result:={$IFDEF pas2js}NodeJSFS{$ELSE}SysUtils{$ENDIF}.DirectoryExists(Filename);
end;
end;
end;