Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-28 15:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update ustar functions

Browse Source
This commit is contained in:
Alex 2023-05-22 01:48:10 +03:00
parent fedccbfd79
commit 3d93f9d919
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
FileSystem/FS/ustar.cpp
View File

@ -76,15 +76,29 @@ namespace VirtualFileSystem
.Seek = USTAR_Seek, .Seek = USTAR_Seek,
}; };
USTAR::USTAR(uintptr_t Address, Virtual *vfs_ctx) bool USTAR::TestArchive(uintptr_t Address)
{ {
trace("Initializing USTAR with address %#llx", Address); if (!Memory::Virtual().Check((void *)Address))
{
error("Address %#lx is not mapped!", Address);
return false;
}
if (memcmp(((FileHeader *)(uintptr_t)Address)->signature, "ustar", 5) != 0) if (memcmp(((FileHeader *)(uintptr_t)Address)->signature, "ustar", 5) != 0)
{ {
error("ustar signature invalid!"); error("ustar signature invalid!");
return; return false;
} }
return true;
}
void USTAR::ReadArchive(uintptr_t Address, Virtual *vfs_ctx)
{
trace("Initializing USTAR with address %#llx", Address);
if (!this->TestArchive(Address))
return; /* Check whether the archive is deflated */
debug("USTAR signature valid! Name:%s Signature:%s Mode:%c Size:%lu", debug("USTAR signature valid! Name:%s Signature:%s Mode:%c Size:%lu",
((FileHeader *)Address)->name, ((FileHeader *)Address)->name,
((FileHeader *)Address)->signature, ((FileHeader *)Address)->signature,
@ -168,5 +182,7 @@ namespace VirtualFileSystem
} }
} }
USTAR::~USTAR() { warn("Destroyed"); } USTAR::USTAR() {}
USTAR::~USTAR() {}
} }

6
Kernel.cpp
View File

@ -412,7 +412,11 @@ EXTERNC NIF void Main()
debug("Found initrd at %p", bInfo.Modules[i].Address); debug("Found initrd at %p", bInfo.Modules[i].Address);
static char initrd = 0; static char initrd = 0;
if (!initrd++) if (!initrd++)
new VirtualFileSystem::USTAR((uintptr_t)bInfo.Modules[i].Address, vfs); {
uintptr_t initrdAddress = (uintptr_t)bInfo.Modules[i].Address;
VirtualFileSystem::USTAR *ustar = new VirtualFileSystem::USTAR;
ustar->ReadArchive(initrdAddress, vfs);
}
} }
} }

4
include/filesystem/ustar.hpp
View File

@ -80,7 +80,9 @@ namespace VirtualFileSystem
} }
public: public:
USTAR(uintptr_t Address, Virtual *vfs_ctx); bool TestArchive(uintptr_t Address);
void ReadArchive(uintptr_t Address, Virtual *vfs_ctx);
USTAR();
~USTAR(); ~USTAR();
}; };
} }