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

Kernel: Implement TIOCSWINSZ for pseudo terminals 

I have no idea how I had forgotten this
This commit is contained in:
Bananymous 2024-12-21 03:22:48 +02:00
parent 9caa3030ea
commit 69137cddab
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/include/kernel/Terminal/PseudoTerminal.h
View File

@ -30,6 +30,8 @@ namespace Kernel
bool can_write_impl() const override { SpinLockGuard _(m_buffer_lock); return m_buffer_size < m_buffer->size(); } bool can_write_impl() const override { SpinLockGuard _(m_buffer_lock); return m_buffer_size < m_buffer->size(); }
bool has_error_impl() const override { return false; } bool has_error_impl() const override { return false; }
BAN::ErrorOr<long> ioctl_impl(int, void*) override;
private: private:
PseudoTerminalMaster(BAN::UniqPtr<VirtualRange>, mode_t, uid_t, gid_t); PseudoTerminalMaster(BAN::UniqPtr<VirtualRange>, mode_t, uid_t, gid_t);
~PseudoTerminalMaster(); ~PseudoTerminalMaster();
@ -61,6 +63,8 @@ namespace Kernel
protected: protected:
void putchar_impl(uint8_t ch) override; void putchar_impl(uint8_t ch) override;
BAN::ErrorOr<long> ioctl_impl(int, void*) override;
private: private:
PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t, uid_t, gid_t); PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t, uid_t, gid_t);
~PseudoTerminalSlave(); ~PseudoTerminalSlave();

25
kernel/kernel/Terminal/PseudoTerminal.cpp
View File

@ -4,6 +4,7 @@
#include <BAN/ScopeGuard.h> #include <BAN/ScopeGuard.h>
#include <sys/ioctl.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
namespace Kernel namespace Kernel
@ -139,6 +140,14 @@ namespace Kernel
return buffer.size(); return buffer.size();
} }
BAN::ErrorOr<long> PseudoTerminalMaster::ioctl_impl(int request, void* argument)
{
auto slave = m_slave.lock();
if (!slave)
return BAN::Error::from_errno(ENODEV);
return slave->ioctl(request, argument);
}
PseudoTerminalSlave::PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t mode, uid_t uid, gid_t gid) PseudoTerminalSlave::PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t mode, uid_t uid, gid_t gid)
: TTY(mode, uid, gid) : TTY(mode, uid, gid)
, m_name(BAN::move(name)) , m_name(BAN::move(name))
@ -163,4 +172,20 @@ namespace Kernel
master->putchar(ch); master->putchar(ch);
} }
BAN::ErrorOr<long> PseudoTerminalSlave::ioctl_impl(int request, void* argument)
{
switch (request)
{
case TIOCSWINSZ:
{
const auto* winsize = static_cast<struct winsize*>(argument);
m_width = winsize->ws_col;
m_height = winsize->ws_row;
return 0;
}
}
return TTY::ioctl_impl(request, argument);
}
} }