RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 06:27:45 +00:00
Code Issues Activity Actions

LibCore: Add option to Stream::File to not close the file on destruction

Browse source
This commit is contained in:
davidot 2022-10-12 11:31:34 +02:00 • committed by Andrew Kaster
parent 279121fa10
commit e0cccaa583
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibCore/Stream.cpp
View file

@ -127,7 +127,7 @@ ErrorOr<NonnullOwnPtr<File>> File::open(StringView filename, OpenMode mode, mode
return file; return file;
} }
ErrorOr<NonnullOwnPtr<File>> File::adopt_fd(int fd, OpenMode mode) ErrorOr<NonnullOwnPtr<File>> File::adopt_fd(int fd, OpenMode mode, ShouldCloseFileDescriptor should_close_file_descriptor)
{ {
if (fd < 0) { if (fd < 0) {
return Error::from_errno(EBADF); return Error::from_errno(EBADF);
@ -138,7 +138,7 @@ ErrorOr<NonnullOwnPtr<File>> File::adopt_fd(int fd, OpenMode mode)
return Error::from_errno(EINVAL); return Error::from_errno(EINVAL);
} }
auto file = TRY(adopt_nonnull_own_or_enomem(new (nothrow) File(mode))); auto file = TRY(adopt_nonnull_own_or_enomem(new (nothrow) File(mode, should_close_file_descriptor)));
file->m_fd = fd; file->m_fd = fd;
return file; return file;
} }

17
Userland/Libraries/LibCore/Stream.h
View file

@ -183,6 +183,11 @@ enum class OpenMode : unsigned {
Nonblocking = 64, Nonblocking = 64,
}; };
enum class ShouldCloseFileDescriptor {
Yes,
No,
};
AK_ENUM_BITWISE_OPERATORS(OpenMode) AK_ENUM_BITWISE_OPERATORS(OpenMode)
class File final : public SeekableStream { class File final : public SeekableStream {
@ -190,7 +195,7 @@ class File final : public SeekableStream {
public: public:
static ErrorOr<NonnullOwnPtr<File>> open(StringView filename, OpenMode, mode_t = 0644); static ErrorOr<NonnullOwnPtr<File>> open(StringView filename, OpenMode, mode_t = 0644);
static ErrorOr<NonnullOwnPtr<File>> adopt_fd(int fd, OpenMode); static ErrorOr<NonnullOwnPtr<File>> adopt_fd(int fd, OpenMode, ShouldCloseFileDescriptor = ShouldCloseFileDescriptor::Yes);
static bool exists(StringView filename); static bool exists(StringView filename);
static ErrorOr<NonnullOwnPtr<File>> open_file_or_standard_stream(StringView filename, OpenMode mode); static ErrorOr<NonnullOwnPtr<File>> open_file_or_standard_stream(StringView filename, OpenMode mode);
@ -219,13 +224,18 @@ public:
virtual ErrorOr<off_t> seek(i64 offset, SeekMode) override; virtual ErrorOr<off_t> seek(i64 offset, SeekMode) override;
virtual ErrorOr<void> truncate(off_t length) override; virtual ErrorOr<void> truncate(off_t length) override;
virtual ~File() override { close(); } virtual ~File() override
{
if (m_should_close_file_descriptor == ShouldCloseFileDescriptor::Yes)
close();
}
static int open_mode_to_options(OpenMode mode); static int open_mode_to_options(OpenMode mode);
private: private:
File(OpenMode mode) File(OpenMode mode, ShouldCloseFileDescriptor should_close = ShouldCloseFileDescriptor::Yes)
: m_mode(mode) : m_mode(mode)
, m_should_close_file_descriptor(should_close)
{ {
} }
@ -234,6 +244,7 @@ private:
OpenMode m_mode { OpenMode::NotOpen }; OpenMode m_mode { OpenMode::NotOpen };
int m_fd { -1 }; int m_fd { -1 };
bool m_last_read_was_eof { false }; bool m_last_read_was_eof { false };
ShouldCloseFileDescriptor m_should_close_file_descriptor { ShouldCloseFileDescriptor::Yes };
}; };
class PosixSocketHelper { class PosixSocketHelper {