paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-07 22:47:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ also resolve absolute paths in ConvertToFdRelativePath

Browse Source 
git-svn-id: trunk@49535 -
This commit is contained in:
nickysn 2021-06-23 15:44:17 +00:00
parent 615e1c0431
commit ba1dcfc6a4
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
rtl/wasi/system.pp
View File

@ -100,8 +100,9 @@ end;
function ConvertToFdRelativePath(path: PChar; out fd: LongInt; out relfd_path: PChar): Boolean;
var
drive_nr: longint;
drive_nr,I,pdir_drive,longest_match,pdir_length: longint;
IsAbsolutePath: Boolean;
pdir, savepath: PChar;
begin
fd:=0;
relfd_path:=nil;
@ -115,10 +116,45 @@ begin
drive_nr:=current_drive;
if path[0] in ['/','\'] then
begin
{ todo: search absolute path in preopened dirs array }
{ path is absolute. Try to find it in the preopened dirs array }
InOutRes:=3;
ConvertToFdRelativePath:=false;
exit;
longest_match:=0;
savepath:=path;
for I:=0 to preopened_dirs_count-1 do
begin
path:=savepath;
pdir:=preopened_dirs[I];
if HasDriveLetter(pdir) then
begin
pdir_drive:=Ord(UpCase(pdir[0]))-(Ord('A')-1);
Inc(pdir,2);
end
else
pdir_drive:=0;
if pdir_drive<>drive_nr then
continue;
pdir_length:=StrLen(pdir);
if pdir_length>StrLen(path) then
continue;
if CompareByte(path^,pdir^,pdir_length)<>0 then
continue;
Inc(path,pdir_length);
if not (path^ in [#0,'/','\']) then
continue;
if pdir_length>longest_match then
begin
longest_match:=pdir_length;
while path^ in ['/','\'] do
Inc(path);
fd:=I+3;
FreeMem(relfd_path);
relfd_path:=GetMem(StrLen(path)+1);
Move(path^,relfd_path^,StrLen(path)+1);
InOutRes:=0;
ConvertToFdRelativePath:=true;
end;
end;
end
else
begin