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

Kernel: Cleanup TTY::read()

This commit is contained in:
Bananymous 2023-09-07 15:27:21 +03:00
parent b30af0edca
commit 4648f6718e
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/kernel/Terminal/TTY.cpp
View File

@ -251,7 +251,7 @@ namespace Kernel
BAN::ErrorOr<size_t> TTY::read(size_t, void* buffer, size_t count) BAN::ErrorOr<size_t> TTY::read(size_t, void* buffer, size_t count)
{ {
m_lock.lock(); LockGuard _(m_lock);
while (!m_output.flush) while (!m_output.flush)
{ {
m_lock.unlock(); m_lock.unlock();
@ -259,6 +259,12 @@ namespace Kernel
m_lock.lock(); m_lock.lock();
} }
if (m_output.bytes == 0)
{
m_output.flush = false;
return 0;
}
size_t to_copy = BAN::Math::min<size_t>(count, m_output.bytes); size_t to_copy = BAN::Math::min<size_t>(count, m_output.bytes);
memcpy(buffer, m_output.buffer.data(), to_copy); memcpy(buffer, m_output.buffer.data(), to_copy);
@ -270,8 +276,6 @@ namespace Kernel
m_output.semaphore.unblock(); m_output.semaphore.unblock();
m_lock.unlock();
return to_copy; return to_copy;
} }