From de3ab7e46b6c7f50723da61aa992b04145cb2472 Mon Sep 17 00:00:00 2001 From: Nikolay Nikolov Date: Tue, 19 Oct 2021 09:39:25 +0300 Subject: [PATCH] * added the fpc_wasi_path_readlink_ansistring helper function to unit wasiutil --- rtl/wasi/Makefile | 2 +- rtl/wasi/Makefile.fpc | 2 +- rtl/wasi/sysutils.pp | 6 ------ rtl/wasi/wasiutil.pp | 4 ++++ 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile index 161bbf57d9..25956cc57d 100644 --- a/rtl/wasi/Makefile +++ b/rtl/wasi/Makefile @@ -2665,7 +2665,7 @@ si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< wasiapi$(PPUEXT) : wasiapi.pp wasiinc/wasitypes.inc wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< -Fiwasiinc -wasiutil$(PPUEXT) : wasiutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +wasiutil$(PPUEXT) : wasiutil.pp wasiapi$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/wasi/Makefile.fpc b/rtl/wasi/Makefile.fpc index 6da266026c..90c0921b37 100644 --- a/rtl/wasi/Makefile.fpc +++ b/rtl/wasi/Makefile.fpc @@ -90,7 +90,7 @@ si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT) wasiapi$(PPUEXT) : wasiapi.pp wasiinc/wasitypes.inc wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< -Fiwasiinc -wasiutil$(PPUEXT) : wasiutil.pp objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) +wasiutil$(PPUEXT) : wasiutil.pp wasiapi$(PPUEXT) objpas$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/wasi/sysutils.pp b/rtl/wasi/sysutils.pp index 8f29fa5e1f..9b34e7bbd8 100644 --- a/rtl/wasi/sysutils.pp +++ b/rtl/wasi/sysutils.pp @@ -52,12 +52,6 @@ implementation {$DEFINE executeprocuni} (* Only 1 byte version of ExecuteProcess is provided by the OS *) -function fpc_wasi_path_readlink_ansistring( - fd: __wasi_fd_t; - const path: PChar; - path_len: size_t; - out link: rawbytestring): __wasi_errno_t; external name 'FPC_WASI_PATH_READLINK_ANSISTRING'; - Function UniversalToEpoch(year,month,day,hour,minute,second:Word):int64; const days_in_month: array [boolean, 1..12] of Byte = diff --git a/rtl/wasi/wasiutil.pp b/rtl/wasi/wasiutil.pp index 5db0aff1b9..a72c1711f4 100644 --- a/rtl/wasi/wasiutil.pp +++ b/rtl/wasi/wasiutil.pp @@ -19,7 +19,11 @@ unit wasiutil; interface +uses + wasiapi; + function ConvertToFdRelativePath(path: RawByteString; out fd: LongInt; out relfd_path: RawByteString): Word; external name 'FPC_WASI_CONVERTTOFDRELATIVEPATH'; +function fpc_wasi_path_readlink_ansistring(fd: __wasi_fd_t; const path: PChar; path_len: size_t; out link: rawbytestring): __wasi_errno_t; external name 'FPC_WASI_PATH_READLINK_ANSISTRING'; implementation