Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

Kernel/LibC: Update SYS_SEEK to return new offset and implement lseek

This commit is contained in:
Bananymous 2024-05-23 14:49:23 +03:00
parent 7630170ed6
commit 83e3409bd8
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/include/kernel/OpenFileDescriptorSet.h
View File

@ -33,7 +33,7 @@ namespace Kernel
BAN::ErrorOr<int> fcntl(int fd, int cmd, int extra);
BAN::ErrorOr<void> seek(int fd, off_t offset, int whence);
BAN::ErrorOr<off_t> seek(int fd, off_t offset, int whence);
BAN::ErrorOr<off_t> tell(int) const;
BAN::ErrorOr<void> fstat(int fd, struct stat*) const;

4
kernel/kernel/OpenFileDescriptorSet.cpp
View File

@ -207,7 +207,7 @@ namespace Kernel
return BAN::Error::from_errno(ENOTSUP);
}
BAN::ErrorOr<void> OpenFileDescriptorSet::seek(int fd, off_t offset, int whence)
BAN::ErrorOr<off_t> OpenFileDescriptorSet::seek(int fd, off_t offset, int whence)
{
TRY(validate_fd(fd));
@ -233,7 +233,7 @@ namespace Kernel
m_open_files[fd]->offset = new_offset;
return {};
return new_offset;
}
BAN::ErrorOr<off_t> OpenFileDescriptorSet::tell(int fd) const

3
kernel/kernel/Process.cpp
View File

@ -1136,8 +1136,7 @@ namespace Kernel
BAN::ErrorOr<long> Process::sys_seek(int fd, off_t offset, int whence)
{
LockGuard _(m_process_lock);
TRY(m_open_file_descriptors.seek(fd, offset, whence));
return 0;
return TRY(m_open_file_descriptors.seek(fd, offset, whence));
}
BAN::ErrorOr<long> Process::sys_tell(int fd)

5
libc/unistd.cpp
View File

@ -93,6 +93,11 @@ ssize_t pread(int fildes, void* buf, size_t nbyte, off_t offset)
return syscall(SYS_PREAD, fildes, buf, nbyte, offset);
}
off_t lseek(int fildes, off_t offset, int whence)
{
return syscall(SYS_SEEK, fildes, offset, whence);
}
int dup(int fildes)
{
return syscall(SYS_DUP, fildes);