Fennix/Kernel
1
0
Fork 0
mirror of https://github.com/Fennix-Project/Kernel.git synced 2025-05-27 23:14:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

linux: Fix newfstatat() syscall

Browse Source
This commit is contained in:
EnderIce2 2024-10-16 00:12:24 +03:00
parent beca151fa6
commit fa31ade889
Signed by untrusted user who does not match committer: enderice2
GPG Key ID: EACC3AD603BAB4DD
1 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
syscalls/linux.cpp
View File

@ -2887,12 +2887,9 @@ static int linux_openat(SysFrm *, int dirfd, const char *pathname, int flags, mo
return -linux_ENOSYS; return -linux_ENOSYS;
} }
/* Undocumented? */
static long linux_newfstatat(SysFrm *, int dirfd, const char *pathname, static long linux_newfstatat(SysFrm *, int dirfd, const char *pathname,
struct linux_kstat *statbuf, int flag) struct linux_kstat *statbuf, int flag)
{ {
/* FIXME: This function is not working at all? */
PCB *pcb = thisProcess; PCB *pcb = thisProcess;
vfs::FileDescriptorTable *fdt = pcb->FileDescriptors; vfs::FileDescriptorTable *fdt = pcb->FileDescriptors;
Memory::VirtualMemoryArea *vma = pcb->vma; Memory::VirtualMemoryArea *vma = pcb->vma;
@ -2907,31 +2904,44 @@ static long linux_newfstatat(SysFrm *, int dirfd, const char *pathname,
debug("%s %#lx %#lx", pPathname, pathname, statbuf); debug("%s %#lx %#lx", pPathname, pathname, statbuf);
if (dirfd == linux_AT_FDCWD && !fs->PathIsRelative(pPathname)) if (fs->PathIsAbsolute(pPathname))
{ {
FileNode *absoluteNode = fs->GetByPath(pPathname, pcb->CWD);
if (!absoluteNode)
return -linux_ENOENT;
const char *absPath = new char[strlen(absoluteNode->Path.c_str()) + 1];
strcpy((char *)absPath, absoluteNode->Path.c_str());
struct kstat nstat = KStatToStat(*pStatbuf); struct kstat nstat = KStatToStat(*pStatbuf);
int ret = fdt->usr_stat(absPath, &nstat); int ret = fdt->usr_stat(pPathname, &nstat);
*pStatbuf = StatToKStat(nstat); *pStatbuf = StatToKStat(nstat);
delete[] absPath;
return ConvertErrnoToLinux(ret); return ConvertErrnoToLinux(ret);
} }
auto it = fdt->FileMap.find(dirfd); switch (dirfd)
if (it == fdt->FileMap.end()) {
ReturnLogError(-linux_EBADF, "Invalid fd %d", dirfd); case linux_AT_FDCWD:
{
FileNode *node = fs->GetByPath(pPathname, pcb->CWD);
if (!node)
return -linux_ENOENT;
vfs::FileDescriptorTable::Fildes &fildes = it->second; struct kstat nstat = {};
int ret = fdt->usr_stat(node->GetPath().c_str(), &nstat);
*pStatbuf = StatToKStat(nstat);
return ConvertErrnoToLinux(ret);
}
default:
{
auto it = fdt->FileMap.find(dirfd);
if (it == fdt->FileMap.end())
ReturnLogError(-linux_EBADF, "Invalid fd %d", dirfd);
struct kstat nstat = KStatToStat(*pStatbuf); vfs::FileDescriptorTable::Fildes &fildes = it->second;
int ret = fdt->usr_stat(pPathname, &nstat); FileNode *node = fs->GetByPath(pPathname, fildes.Node);
*pStatbuf = StatToKStat(nstat); if (!node)
return ConvertErrnoToLinux(ret); return -linux_ENOENT;
struct kstat nstat = {};
int ret = fdt->usr_stat(node->GetPath().c_str(), &nstat);
*pStatbuf = StatToKStat(nstat);
return ConvertErrnoToLinux(ret);
}
}
} }
static int linux_pipe2(SysFrm *sf, int pipefd[2], int flags) static int linux_pipe2(SysFrm *sf, int pipefd[2], int flags)