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

Compare commits

base: Bananymous:6f8f99f42ca71cf462585e23115513fedaa88271
Branches Tags
Bananymous:main
..
compare: Bananymous:9caa3030eab396a36f0ac627f836f624ee466ec3
Branches Tags
Bananymous:main

No commits in common. "6f8f99f42ca71cf462585e23115513fedaa88271" and "9caa3030eab396a36f0ac627f836f624ee466ec3" have entirely different histories.
6f8f99f42c ... 9caa3030ea

3 changed files with 0 additions and 38 deletions
Show Stats Expand all files Collapse all files

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

@ -30,8 +30,6 @@ namespace Kernel
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; }
BAN::ErrorOr<long> ioctl_impl(int, void*) override;
private:
PseudoTerminalMaster(BAN::UniqPtr<VirtualRange>, mode_t, uid_t, gid_t);
~PseudoTerminalMaster();
@ -63,8 +61,6 @@ namespace Kernel
protected:
void putchar_impl(uint8_t ch) override;
BAN::ErrorOr<long> ioctl_impl(int, void*) override;
private:
PseudoTerminalSlave(BAN::String&& name, uint32_t number, mode_t, uid_t, gid_t);
~PseudoTerminalSlave();

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

@ -4,7 +4,6 @@
#include <BAN/ScopeGuard.h>
#include <sys/ioctl.h>
#include <sys/sysmacros.h>
namespace Kernel
@ -140,14 +139,6 @@ namespace Kernel
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)
: TTY(mode, uid, gid)
, m_name(BAN::move(name))
@ -172,20 +163,4 @@ namespace Kernel
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);
}
}

9
userspace/programs/Terminal/Terminal.cpp
View File

@ -6,7 +6,6 @@
#include <ctype.h>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/select.h>
#include <unistd.h>
@ -120,14 +119,6 @@ void Terminal::run()
m_font = MUST(LibFont::Font::load("/usr/share/fonts/lat0-16.psfu"_sv));
{
winsize winsize;
winsize.ws_col = cols();
winsize.ws_row = rows();
if (ioctl(m_shell_info.pts_master, TIOCSWINSZ, &winsize) == -1)
perror("ioctl");
}
{
timespec ts;
clock_gettime(CLOCK_MONOTONIC, &ts);