RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 12:42:45 +00:00
Code Issues Activity Actions

GIODevice: Add a read_all() that returns a ByteBuffer with all we can read.

Browse source 
Use this to implement file opening in TextEditor.
This commit is contained in:
Andreas Kling 2019-03-18 14:38:30 +01:00
parent 8e3d0a23d5
commit 9ad076178a
6 changed files with 58 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

33
LibGUI/GIODevice.cpp
View file

@ -46,7 +46,7 @@ ByteBuffer GIODevice::read(int max_size)
return buffer;
}
bool GIODevice::can_read() const
bool GIODevice::can_read_from_fd() const
{
// FIXME: Can we somehow remove this once GSocket is implemented using non-blocking sockets?
fd_set rfds;
@ -68,12 +68,41 @@ bool GIODevice::can_read_line()
return true;
if (m_buffered_data.contains_slow('\n'))
return true;
if (!can_read())
if (!can_read_from_fd())
return false;
populate_read_buffer();
return m_buffered_data.contains_slow('\n');
}
bool GIODevice::can_read() const
{
return !m_buffered_data.is_empty() || can_read_from_fd();
}
ByteBuffer GIODevice::read_all()
{
ByteBuffer buffer;
if (!m_buffered_data.is_empty()) {
buffer = ByteBuffer::copy(m_buffered_data.data(), m_buffered_data.size());
m_buffered_data.clear();
}
while (can_read_from_fd()) {
char read_buffer[4096];
int nread = ::read(m_fd, read_buffer, sizeof(read_buffer));
if (nread < 0) {
set_error(nread);
return buffer;
}
if (nread == 0) {
set_eof(true);
break;
}
buffer.append(read_buffer, nread);
}
return buffer;
}
ByteBuffer GIODevice::read_line(int max_size)
{
if (m_fd < 0)