IMP: Support fork based operations inside the file manager, update PEF

loader to load from forks, we might need a non-fork loader class though.

Signed-off-by: Amlal EL Mahrouss <amlalelmahrouss@icloud.com>

1 files changed, 26 insertions, 12 deletions

diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx
index ee285ae1..9f81c260 100644
--- a/Kernel/Sources/FileManager.cxx
+++ b/Kernel/Sources/FileManager.cxx
@@ -81,6 +81,26 @@ namespace NewOS
 	/// @return
 	Void NewFilesystemManager::Write(NodePtr node, VoidPtr data, Int32 flags, SizeT size)
 	{
+		auto dataForkName = kNewFSDataFork;
+		this->Write(dataForkName, node, data, flags, size);
+	}
+
+	/// @brief Read from filesystem fork.
+	/// @param node the catalog node.
+	/// @param flags the flags with it.
+	/// @param sz the size to read.
+	/// @return
+	VoidPtr NewFilesystemManager::Read(NodePtr node, Int32 flags, SizeT sz)
+	{
+		auto dataForkName = kNewFSDataFork;
+		return this->Read(dataForkName, node, flags, sz);
+	}
+
+	Void NewFilesystemManager::Write(_Input const Char* name,
+			   _Input NodePtr node, _Input VoidPtr data,
+			   _Input Int32 flags,
+			   _Input SizeT size)
+	{
 		if (!size ||
 			size > kNewFSForkSize)
 			return;
@@ -90,19 +110,15 @@ namespace NewOS
 
 		NEWOS_UNUSED(flags);
 
-		auto dataForkName = kNewFSDataFork;
-
 		if ((reinterpret_cast<NewCatalog*>(node))->Kind == kNewFSCatalogKindFile)
 			fImpl->WriteCatalog(reinterpret_cast<NewCatalog*>(node), data, size,
-								dataForkName);
+								name);
 	}
 
-	/// @brief Read from filesystem fork.
-	/// @param node the catalog node.
-	/// @param flags the flags with it.
-	/// @param sz the size to read.
-	/// @return
-	VoidPtr NewFilesystemManager::Read(NodePtr node, Int32 flags, SizeT sz)
+	_Output VoidPtr NewFilesystemManager::Read(_Input const Char* name,
+						 _Input NodePtr node,
+						 _Input Int32 flags,
+						 _Input SizeT sz)
 	{
 		if (sz > kNewFSForkSize)
 			return nullptr;
@@ -112,11 +128,9 @@ namespace NewOS
 
 		NEWOS_UNUSED(flags);
 
-		auto dataForkName = kNewFSDataFork;
-
 		if ((reinterpret_cast<NewCatalog*>(node))->Kind == kNewFSCatalogKindFile)
 			return fImpl->ReadCatalog(reinterpret_cast<NewCatalog*>(node), sz,
-									  dataForkName);
+									  name);
 
 		return nullptr;
 	}