RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 06:07:44 +00:00
Code Issues Activity Actions

Kernel: Make all syscall functions return KResultOr<T>

Browse source 
This makes it a lot easier to return errors since we no longer have to
worry about negating EFOO errors and can just return them flat.
This commit is contained in:
Andreas Kling 2021-03-01 13:49:16 +01:00
parent 9af1e1a3bf
commit ac71775de5
70 changed files with 747 additions and 742 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Kernel/Syscalls/ttyname.cpp
View file

@ -31,36 +31,36 @@
namespace Kernel {
int Process::sys$ttyname(int fd, Userspace<char*> buffer, size_t size)
KResultOr<int> Process::sys$ttyname(int fd, Userspace<char*> buffer, size_t size)
{
REQUIRE_PROMISE(tty);
auto description = file_description(fd);
if (!description)
return -EBADF;
return EBADF;
if (!description->is_tty())
return -ENOTTY;
return ENOTTY;
auto tty_name = description->tty()->tty_name();
if (size < tty_name.length() + 1)
return -ERANGE;
return ERANGE;
if (!copy_to_user(buffer, tty_name.characters(), tty_name.length() + 1))
return -EFAULT;
return EFAULT;
return 0;
}
int Process::sys$ptsname(int fd, Userspace<char*> buffer, size_t size)
KResultOr<int> Process::sys$ptsname(int fd, Userspace<char*> buffer, size_t size)
{
REQUIRE_PROMISE(tty);
auto description = file_description(fd);
if (!description)
return -EBADF;
return EBADF;
auto* master_pty = description->master_pty();
if (!master_pty)
return -ENOTTY;
return ENOTTY;
auto pts_name = master_pty->pts_name();
if (size < pts_name.length() + 1)
return -ERANGE;
return ERANGE;
if (!copy_to_user(buffer, pts_name.characters(), pts_name.length() + 1))
return -EFAULT;
return EFAULT;
return 0;
}