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

Add process cwd

Browse Source
This commit is contained in:
Alex 2023-05-05 19:40:01 +03:00
parent dd232a3721
commit 7d939c001b
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Execute/Elf/BaseLoad.cpp
View File

@ -212,6 +212,7 @@ namespace Execute
/* ------------------------------------------------------------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------------------------------------------------------------ */
PCB *Process = TaskManager->CreateProcess(TaskManager->GetCurrentProcess(), BaseName, TaskTrustLevel::User, ElfFile); PCB *Process = TaskManager->CreateProcess(TaskManager->GetCurrentProcess(), BaseName, TaskTrustLevel::User, ElfFile);
Process->SetWorkingDirectory(vfs->GetNodeFromPath(Path)->Parent);
Memory::Virtual pV = Memory::Virtual(Process->PageTable); Memory::Virtual pV = Memory::Virtual(Process->PageTable);
for (size_t i = 0; i < TO_PAGES(ExFileSize); i++) for (size_t i = 0; i < TO_PAGES(ExFileSize); i++)
pV.Remap((void *)((uintptr_t)ElfFile + (i * PAGE_SIZE)), (void *)((uintptr_t)ElfFile + (i * PAGE_SIZE)), Memory::PTFlag::RW | Memory::PTFlag::US); pV.Remap((void *)((uintptr_t)ElfFile + (i * PAGE_SIZE)), (void *)((uintptr_t)ElfFile + (i * PAGE_SIZE)), Memory::PTFlag::RW | Memory::PTFlag::US);

6
SystemCalls/Native.cpp
View File

@ -250,7 +250,7 @@ static int sys_ipc(SyscallsFrame *Frame, enum IPCCommand Command, enum IPCType T
static uint64_t sys_file_open(SyscallsFrame *Frame, const char *Path, uint64_t Flags) static uint64_t sys_file_open(SyscallsFrame *Frame, const char *Path, uint64_t Flags)
{ {
debug("(Path: %s, Flags: %#lx)", Path, Flags); debug("(Path: %s, Flags: %#lx)", Path, Flags);
VirtualFileSystem::File KPObj = vfs->Open(Path); VirtualFileSystem::File KPObj = vfs->Open(Path, TaskManager->GetCurrentProcess()->CurrentWorkingDirectory);
if (!KPObj.IsOK()) if (!KPObj.IsOK())
{ {
debug("Failed to open file %s (%d)", Path, KPObj.Status); debug("Failed to open file %s (%d)", Path, KPObj.Status);
@ -307,13 +307,13 @@ static uint64_t sys_file_seek(SyscallsFrame *Frame, void *KernelPrivate, uint64_
if (KernelPrivate == nullptr) if (KernelPrivate == nullptr)
return 0; return 0;
debug("(KernelPrivate: %#lx, Offset: %#lx, Whence: %#lx)", KernelPrivate, Offset, Whence); debug("(KernelPrivate: %#lx, Offset: %#lx, Whence: %d)", KernelPrivate, Offset, Whence);
VirtualFileSystem::File *KPObj = (VirtualFileSystem::File *)KernelPrivate; VirtualFileSystem::File *KPObj = (VirtualFileSystem::File *)KernelPrivate;
if (KPObj->node->Operator->Seek == nullptr) if (KPObj->node->Operator->Seek == nullptr)
return SYSCALL_INTERNAL_ERROR; return SYSCALL_INTERNAL_ERROR;
return KPObj->node->Operator->Seek(KPObj->node, Offset, Whence); return KPObj->node->Operator->Seek(KPObj->node, Offset, (uint8_t)Whence);
UNUSED(Frame); UNUSED(Frame);
} }

8
include/task.hpp
View File

@ -190,8 +190,16 @@ namespace Tasking
InterProcessCommunication::IPC *IPC; InterProcessCommunication::IPC *IPC;
Memory::PageTable *PageTable; Memory::PageTable *PageTable;
SymbolResolver::Symbols *ELFSymbolTable; SymbolResolver::Symbols *ELFSymbolTable;
VirtualFileSystem::Node *CurrentWorkingDirectory;
VirtualFileSystem::Node *ProcessDirectory; VirtualFileSystem::Node *ProcessDirectory;
VirtualFileSystem::Node *memDirectory; VirtualFileSystem::Node *memDirectory;
void SetWorkingDirectory(VirtualFileSystem::Node *node)
{
CriticalSection cs;
trace("Setting working directory of process %s to %#lx (%s)", Name, node, node->Name);
CurrentWorkingDirectory = node;
}
}; };
/** @brief Token Trust Level */ /** @brief Token Trust Level */