Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kernel/LibC: Fix dirent functions 

dirent functions used to fail if a directory contained more than 128
files :D
This commit is contained in:
Bananymous 2025-01-28 17:15:11 +02:00
parent cbe3f2a4ac
commit 7c57d736c6
2 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/kernel/OpenFileDescriptorSet.cpp
View File

@ -330,8 +330,11 @@ namespace Kernel
return BAN::Error::from_errno(EACCES); return BAN::Error::from_errno(EACCES);
for (;;) for (;;)
{ {
auto ret = open_file.inode()->list_next_inodes(open_file.offset()++, list, list_len); auto ret = open_file.inode()->list_next_inodes(open_file.offset(), list, list_len);
if (ret.is_error() && ret.error().get_error_code() == ENODATA) if (ret.is_error() && ret.error().get_error_code() != ENODATA)
return ret;
open_file.offset()++;
if (ret.is_error())
continue; continue;
return ret; return ret;
} }

30
userspace/libraries/LibC/dirent.cpp
View File

@ -10,9 +10,10 @@ struct __DIR
int fd { -1 }; int fd { -1 };
size_t entry_count { 0 }; size_t entry_count { 0 };
size_t entry_index { 0 }; size_t entry_index { 0 };
// FIXME: we should probably allocate entries dynamically size_t entries_size { 0 };
// based if syscall returns ENOBUFS dirent* entries { nullptr };
dirent entries[128];
static constexpr size_t default_entries_size { 128 };
}; };
int closedir(DIR* dirp) int closedir(DIR* dirp)
@ -42,10 +43,18 @@ int dirfd(DIR* dirp)
DIR* fdopendir(int fd) DIR* fdopendir(int fd)
{ {
DIR* dirp = (DIR*)malloc(sizeof(DIR)); DIR* dirp = static_cast<DIR*>(malloc(sizeof(DIR)));
if (dirp == nullptr) if (dirp == nullptr)
return nullptr; return nullptr;
dirp->entries = static_cast<dirent*>(malloc(DIR::default_entries_size * sizeof(dirent)));
dirp->entries_size = DIR::default_entries_size;
if (dirp->entries == nullptr)
{
free(dirp);
return nullptr;
}
dirp->fd = fd; dirp->fd = fd;
dirp->entry_count = 0; dirp->entry_count = 0;
dirp->entry_index = 0; dirp->entry_index = 0;
@ -73,7 +82,18 @@ struct dirent* readdir(DIR* dirp)
if (dirp->entry_index < dirp->entry_count) if (dirp->entry_index < dirp->entry_count)
return &dirp->entries[dirp->entry_index]; return &dirp->entries[dirp->entry_index];
long entry_count = syscall(SYS_READ_DIR, dirp->fd, dirp->entries, sizeof(dirp->entries) / sizeof(dirp->entries[0])); readdir_do_syscall:
long entry_count = syscall(SYS_READ_DIR, dirp->fd, dirp->entries, dirp->entries_size);
if (entry_count == -1 && errno == ENOBUFS)
{
const size_t new_entries_size = dirp->entries_size * 2;
dirent* new_entries = static_cast<dirent*>(malloc(new_entries_size * sizeof(dirent)));
if (new_entries == nullptr)
return nullptr;
dirp->entries = new_entries;
dirp->entries_size = new_entries_size;
goto readdir_do_syscall;
}
if (entry_count <= 0) if (entry_count <= 0)
return nullptr; return nullptr;