RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 12:05:08 +00:00
Code Issues Activity Actions

VFS: Resolve FIXME in Inode::read_entire() about using dynamic allocation.

Browse source
This commit is contained in:
Andreas Kling 2019-01-28 22:55:55 +01:00
parent f83a94ca39
commit cc906a2897
3 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Kernel/FileSystem.cpp
View file

@ -1,5 +1,6 @@
#include <AK/Assertions.h>
#include <AK/HashMap.h>
#include <AK/StringBuilder.h>
#include <LibC/errno_numbers.h>
#include "FileSystem.h"
#include "MemoryManager.h"
@ -51,29 +52,25 @@ FS* FS::from_fsid(dword id)
ByteBuffer Inode::read_entire(FileDescriptor* descriptor) const
{
size_t initial_size = metadata().size ? metadata().size : 4096;
auto contents = ByteBuffer::create_uninitialized(initial_size);
StringBuilder builder(initial_size);
ssize_t nread;
byte buffer[4096];
byte* out = contents.pointer();
off_t offset = 0;
for (;;) {
nread = read_bytes(offset, sizeof(buffer), buffer, descriptor);
ASSERT(nread <= (ssize_t)sizeof(buffer));
if (nread <= 0)
break;
memcpy(out, buffer, nread);
out += nread;
builder.append((const char*)buffer, nread);
offset += nread;
ASSERT(offset <= (ssize_t)initial_size); // FIXME: Support dynamically growing the buffer.
}
if (nread < 0) {
kprintf("Inode::read_entire: ERROR: %d\n", nread);
return nullptr;
}
contents.trim(offset);
return contents;
return builder.to_byte_buffer();
}
FS::DirectoryEntry::DirectoryEntry(const char* n, InodeIdentifier i, byte ft)