RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-03 23:37:34 +00:00
Code Issues Activity Actions

Add a Unix namespace for foo_t types.

Browse source 
This allows me to keep prototyping things on a random desktop machine,
even if that machine has its own ideas about foo_t types.
This commit is contained in:
Andreas Kling 2018-10-14 22:57:41 +02:00
parent c6d6ba7512
commit 1f41a36c52
16 changed files with 116 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

48
VirtualFileSystem/FileHandle.cpp
View file

@ -2,6 +2,7 @@
#include "FileSystem.h"
#include "CharacterDevice.h"
#include "sys-errno.h"
#include "UnixTypes.h"
FileHandle::FileHandle(RetainPtr<VirtualFileSystem::Node>&& vnode)
: m_vnode(std::move(vnode))
@ -12,14 +13,38 @@ FileHandle::~FileHandle()
{
}
bool additionWouldOverflow(FileOffset a, FileOffset b)
bool additionWouldOverflow(Unix::off_t a, Unix::off_t b)
{
ASSERT(a > 0);
uint64_t ua = a;
return (ua + b) > maxFileOffset;
}
FileOffset FileHandle::lseek(FileOffset offset, SeekType seekType)
int FileHandle::stat(Unix::stat* buffer)
{
if (!m_vnode)
return -EBADF;
auto metadata = m_vnode->inode.metadata();
if (!metadata.isValid())
return -EIO;
buffer->st_dev = 0; // FIXME
buffer->st_ino = metadata.inode.index();
buffer->st_mode = metadata.mode;
buffer->st_nlink = metadata.linkCount;
buffer->st_uid = metadata.uid;
buffer->st_gid = metadata.gid;
buffer->st_rdev = 0; // FIXME
buffer->st_blksize = 0; // FIXME
buffer->st_blocks = 0; // FIXME
buffer->st_atime = metadata.atime;
buffer->st_mtime = metadata.mtime;
buffer->st_ctime = metadata.ctime;
return 0;
}
Unix::off_t FileHandle::seek(Unix::off_t offset, int whence)
{
if (!m_vnode)
return -EBADF;
@ -27,23 +52,26 @@ FileOffset FileHandle::lseek(FileOffset offset, SeekType seekType)
// FIXME: The file type should be cached on the vnode.
// It's silly that we have to do a full metadata lookup here.
auto metadata = m_vnode->inode.metadata();
if (!metadata.isValid())
return -EIO;
if (metadata.isSocket() || metadata.isFIFO())
return -ESPIPE;
FileOffset newOffset;
Unix::off_t newOffset;
switch (seekType) {
case SeekType::Absolute:
switch (whence) {
case SEEK_SET:
newOffset = offset;
break;
case SeekType::RelativeToCurrent:
case SEEK_CUR:
newOffset = m_currentOffset + offset;
if (additionWouldOverflow(m_currentOffset, offset))
return -EOVERFLOW;
if (newOffset < 0)
return -EINVAL;
break;
case SeekType::RelativeToEnd:
case SEEK_END:
// FIXME: Implement!
notImplemented();
break;
@ -55,13 +83,13 @@ FileOffset FileHandle::lseek(FileOffset offset, SeekType seekType)
return m_currentOffset;
}
ssize_t FileHandle::read(byte* buffer, size_t count)
Unix::ssize_t FileHandle::read(byte* buffer, Unix::size_t count)
{
if (m_vnode->isCharacterDevice()) {
// FIXME: What should happen to m_currentOffset?
return m_vnode->characterDevice()->read(buffer, count);
}
ssize_t nread = m_vnode->fileSystem()->readInodeBytes(m_vnode->inode, m_currentOffset, count, buffer);
Unix::ssize_t nread = m_vnode->fileSystem()->readInodeBytes(m_vnode->inode, m_currentOffset, count, buffer);
m_currentOffset += nread;
return nread;
}
@ -70,7 +98,7 @@ ByteBuffer FileHandle::readEntireFile()
{
if (m_vnode->isCharacterDevice()) {
auto buffer = ByteBuffer::createUninitialized(1024);
ssize_t nread = m_vnode->characterDevice()->read(buffer.pointer(), buffer.size());
Unix::ssize_t nread = m_vnode->characterDevice()->read(buffer.pointer(), buffer.size());
buffer.trim(nread);
return buffer;
}