diff --git a/Userland/Libraries/LibCore/CMakeLists.txt b/Userland/Libraries/LibCore/CMakeLists.txt index 27913a799a..2acb32b655 100644 --- a/Userland/Libraries/LibCore/CMakeLists.txt +++ b/Userland/Libraries/LibCore/CMakeLists.txt @@ -13,7 +13,6 @@ set(SOURCES EventLoopImplementation.cpp EventLoopImplementationUnix.cpp File.cpp - IODevice.cpp LockFile.cpp MappedFile.cpp MimeData.cpp diff --git a/Userland/Libraries/LibCore/Forward.h b/Userland/Libraries/LibCore/Forward.h index 0e672ec62f..2e1092f7f1 100644 --- a/Userland/Libraries/LibCore/Forward.h +++ b/Userland/Libraries/LibCore/Forward.h @@ -21,7 +21,6 @@ class ElapsedTimer; class Event; class EventLoop; class File; -class IODevice; class LocalServer; class LocalSocket; class MappedFile; diff --git a/Userland/Libraries/LibCore/IODevice.cpp b/Userland/Libraries/LibCore/IODevice.cpp deleted file mode 100644 index f3fef7dccf..0000000000 --- a/Userland/Libraries/LibCore/IODevice.cpp +++ /dev/null @@ -1,279 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * Copyright (c) 2022, the SerenityOS developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Core { - -IODevice::IODevice(Object* parent) - : Object(parent) -{ -} - -char const* IODevice::error_string() const -{ - return strerror(m_error); -} - -int IODevice::read(u8* buffer, int length) -{ - auto read_buffer = read(length); - memcpy(buffer, read_buffer.data(), length); - return read_buffer.size(); -} - -ByteBuffer IODevice::read(size_t max_size) -{ - if (m_fd < 0) - return {}; - if (!max_size) - return {}; - - if (m_buffered_data.size() < max_size) - populate_read_buffer(max(max_size - m_buffered_data.size(), 1024)); - - auto size = min(max_size, m_buffered_data.size()); - auto buffer_result = ByteBuffer::create_uninitialized(size); - if (buffer_result.is_error()) { - dbgln("IODevice::read: Not enough memory to allocate a buffer of {} bytes", size); - return {}; - } - auto buffer = buffer_result.release_value(); - auto* buffer_ptr = (char*)buffer.data(); - - memcpy(buffer_ptr, m_buffered_data.data(), size); - m_buffered_data.remove(0, size); - - return buffer; -} - -bool IODevice::can_read_from_fd() const -{ - // FIXME: Can we somehow remove this once Core::Socket is implemented using non-blocking sockets? - fd_set rfds {}; - FD_ZERO(&rfds); - FD_SET(m_fd, &rfds); - struct timeval timeout { - 0, 0 - }; - - for (;;) { - if (select(m_fd + 1, &rfds, nullptr, nullptr, &timeout) < 0) { - if (errno == EINTR) - continue; - perror("IODevice::can_read_from_fd: select"); - return false; - } - break; - } - return FD_ISSET(m_fd, &rfds); -} - -bool IODevice::can_read_line() const -{ - if (m_eof && !m_buffered_data.is_empty()) - return true; - - if (m_buffered_data.contains_slow('\n')) - return true; - - if (!can_read_from_fd()) - return false; - - while (true) { - // Populate buffer until a newline is found or we reach EOF. - - auto previous_buffer_size = m_buffered_data.size(); - populate_read_buffer(); - auto new_buffer_size = m_buffered_data.size(); - - if (m_error) - return false; - - if (m_eof) - return !m_buffered_data.is_empty(); - - if (m_buffered_data.contains_in_range('\n', previous_buffer_size, new_buffer_size - 1)) - return true; - } -} - -ByteBuffer IODevice::read_all() -{ - off_t file_size = 0; - struct stat st; - int rc = fstat(fd(), &st); - if (rc == 0) - file_size = st.st_size; - - Vector data; - data.ensure_capacity(file_size); - - if (!m_buffered_data.is_empty()) { - data.append(m_buffered_data.data(), m_buffered_data.size()); - m_buffered_data.clear(); - } - - while (true) { - char read_buffer[4096]; - int nread = ::read(m_fd, read_buffer, sizeof(read_buffer)); - if (nread < 0) { - set_error(errno); - break; - } - if (nread == 0) { - set_eof(true); - break; - } - data.append((u8 const*)read_buffer, nread); - } - - auto result = ByteBuffer::copy(data); - if (!result.is_error()) - return result.release_value(); - - set_error(ENOMEM); - return {}; -} - -DeprecatedString IODevice::read_line(size_t max_size) -{ - if (m_fd < 0) - return {}; - if (!max_size) - return {}; - if (!can_read_line()) - return {}; - if (m_eof) { - if (m_buffered_data.size() > max_size) { - dbgln("IODevice::read_line: At EOF but there's more than max_size({}) buffered", max_size); - return {}; - } - auto line = DeprecatedString((char const*)m_buffered_data.data(), m_buffered_data.size(), Chomp); - m_buffered_data.clear(); - return line; - } - auto line_result = ByteBuffer::create_uninitialized(max_size + 1); - if (line_result.is_error()) { - dbgln("IODevice::read_line: Not enough memory to allocate a buffer of {} bytes", max_size + 1); - return {}; - } - auto line = line_result.release_value(); - size_t line_index = 0; - while (line_index < max_size) { - u8 ch = m_buffered_data[line_index]; - line[line_index++] = ch; - if (ch == '\n') { - Vector new_buffered_data; - new_buffered_data.append(m_buffered_data.data() + line_index, m_buffered_data.size() - line_index); - m_buffered_data = move(new_buffered_data); - line.resize(line_index); - return DeprecatedString::copy(line, Chomp); - } - } - return {}; -} - -bool IODevice::populate_read_buffer(size_t size) const -{ - if (m_fd < 0) - return false; - if (!size) - return false; - - auto buffer_result = ByteBuffer::create_uninitialized(size); - if (buffer_result.is_error()) { - dbgln("IODevice::populate_read_buffer: Not enough memory to allocate a buffer of {} bytes", size); - return {}; - } - auto buffer = buffer_result.release_value(); - auto* buffer_ptr = (char*)buffer.data(); - - int nread = ::read(m_fd, buffer_ptr, size); - if (nread < 0) { - set_error(errno); - return false; - } - if (nread == 0) { - set_eof(true); - return false; - } - m_buffered_data.append(buffer.data(), nread); - return true; -} - -bool IODevice::close() -{ - if (fd() < 0 || m_mode == OpenMode::NotOpen) - return false; - int rc = ::close(fd()); - if (rc < 0) { - set_error(errno); - return false; - } - set_fd(-1); - set_mode(OpenMode::NotOpen); - return true; -} - -bool IODevice::seek(i64 offset, SeekMode mode, off_t* pos) -{ - int m = SEEK_SET; - switch (mode) { - case SeekMode::SetPosition: - m = SEEK_SET; - break; - case SeekMode::FromCurrentPosition: - m = SEEK_CUR; - offset -= m_buffered_data.size(); - break; - case SeekMode::FromEndPosition: - m = SEEK_END; - break; - } - off_t rc = lseek(m_fd, offset, m); - if (rc < 0) { - set_error(errno); - if (pos) - *pos = -1; - return false; - } - m_buffered_data.clear(); - m_eof = false; - if (pos) - *pos = rc; - return true; -} - -bool IODevice::write(u8 const* data, int size) -{ - int rc = ::write(m_fd, data, size); - if (rc < 0) { - set_error(errno); - perror("IODevice::write: write"); - return false; - } - return rc == size; -} - -void IODevice::set_fd(int fd) -{ - if (m_fd == fd) - return; - - m_fd = fd; -} - -} diff --git a/Userland/Libraries/LibCore/IODevice.h b/Userland/Libraries/LibCore/IODevice.h deleted file mode 100644 index 2cc825a2e6..0000000000 --- a/Userland/Libraries/LibCore/IODevice.h +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * Copyright (c) 2022, the SerenityOS developers. - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include -#include - -namespace Core { - -enum class OpenMode : unsigned { - NotOpen = 0, - ReadOnly = 1, - WriteOnly = 2, - ReadWrite = 3, - Append = 4, - Truncate = 8, - MustBeNew = 16, - KeepOnExec = 32, -}; - -AK_ENUM_BITWISE_OPERATORS(OpenMode) - -class IODevice : public Object { - C_OBJECT_ABSTRACT(IODevice) -public: - virtual ~IODevice() override = default; - - int fd() const { return m_fd; } - OpenMode mode() const { return m_mode; } - bool eof() const { return m_eof; } - - int error() const { return m_error; } - char const* error_string() const; - - int read(u8* buffer, int length); - - ByteBuffer read(size_t max_size); - ByteBuffer read_all(); - DeprecatedString read_line(size_t max_size = 16384); - - bool write(u8 const*, int size); - - bool can_read_line() const; - - bool seek(i64, SeekMode = SeekMode::SetPosition, off_t* = nullptr); - - virtual bool open(OpenMode) = 0; - virtual bool close(); - -protected: - explicit IODevice(Object* parent = nullptr); - - void set_fd(int); - void set_mode(OpenMode mode) { m_mode = mode; } - void set_error(int error) const { m_error = error; } - void set_eof(bool eof) const { m_eof = eof; } - -private: - bool populate_read_buffer(size_t size = 1024) const; - bool can_read_from_fd() const; - - int m_fd { -1 }; - OpenMode m_mode { OpenMode::NotOpen }; - mutable int m_error { 0 }; - mutable bool m_eof { false }; - mutable Vector m_buffered_data; -}; - -}