LibCore+Everywhere: Move OpenMode out of IODevice

...and make it an enum class so people don't omit "OpenMode".
This commit is contained in:
Ali Mohammad Pur 2021-05-12 13:56:43 +04:30 committed by Linus Groh
parent 422ef7904e
commit a91a49337c
Notes: sideshowbarker 2024-07-18 18:18:34 +09:00
113 changed files with 180 additions and 177 deletions

View File

@ -217,7 +217,7 @@ void TestRunner::run()
static Result<NonnullRefPtr<JS::Program>, ParserError> parse_file(const String& file_path)
{
auto file = Core::File::construct(file_path);
auto result = file->open(Core::IODevice::ReadOnly);
auto result = file->open(Core::OpenMode::ReadOnly);
if (!result) {
warnln("Failed to open the following file: \"{}\"", file_path);
cleanup_and_exit();

View File

@ -222,7 +222,7 @@ void TestRunner::run()
static Result<NonnullRefPtr<JS::Program>, ParserError> parse_file(const String& file_path)
{
auto file = Core::File::construct(file_path);
auto result = file->open(Core::IODevice::ReadOnly);
auto result = file->open(Core::OpenMode::ReadOnly);
if (!result) {
printf("Failed to open the following file: \"%s\"\n", file_path.characters());
cleanup_and_exit();

View File

@ -108,7 +108,7 @@ private:
StringBuilder adapter_info;
auto file = Core::File::construct("/proc/net/adapters");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", file->error_string());
return adapter_info.to_string();
}

View File

@ -148,7 +148,7 @@ private:
return false;
} else {
auto proc_memstat = Core::File::construct("/proc/memstat");
if (!proc_memstat->open(Core::IODevice::OpenMode::ReadOnly))
if (!proc_memstat->open(Core::OpenMode::ReadOnly))
return false;
m_proc_mem = move(proc_memstat);
}

View File

@ -43,7 +43,7 @@ DownloadWidget::DownloadWidget(const URL& url)
};
{
auto file_or_error = Core::File::open(m_destination_path, Core::IODevice::WriteOnly);
auto file_or_error = Core::File::open(m_destination_path, Core::OpenMode::WriteOnly);
if (file_or_error.is_error()) {
GUI::MessageBox::show(window(), String::formatted("Cannot open {} for writing", m_destination_path), "Download failed", GUI::MessageBox::Type::Error);
window()->close();

View File

@ -118,7 +118,7 @@ int main(int argc, char** argv)
Browser::g_home_url = m_config->read_entry("Preferences", "Home", "about:blank");
Browser::g_search_engine = m_config->read_entry("Preferences", "SearchEngine", {});
auto ad_filter_list_or_error = Core::File::open(String::formatted("{}/BrowserContentFilters.txt", Core::StandardPaths::config_directory()), Core::IODevice::ReadOnly);
auto ad_filter_list_or_error = Core::File::open(String::formatted("{}/BrowserContentFilters.txt", Core::StandardPaths::config_directory()), Core::OpenMode::ReadOnly);
if (!ad_filter_list_or_error.is_error()) {
auto& ad_filter_list = *ad_filter_list_or_error.value();
while (!ad_filter_list.eof()) {

View File

@ -71,7 +71,7 @@ static void run_file_operation([[maybe_unused]] FileOperation operation, const S
file_operation_windows.set(window);
auto pipe_input_file = Core::File::construct();
pipe_input_file->open(pipe_fds[0], Core::IODevice::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes);
pipe_input_file->open(pipe_fds[0], Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes);
window->set_title("Copying Files...");
window->set_main_widget<FileOperationProgressWidget>(pipe_input_file);

View File

@ -242,7 +242,7 @@ void HexEditorWidget::update_title()
void HexEditorWidget::open_file(const String& path)
{
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
GUI::MessageBox::show(window(), String::formatted("Opening \"{}\" failed: {}", path, strerror(errno)), "Error", GUI::MessageBox::Type::Error);
return;
}

View File

@ -189,7 +189,7 @@ void KeyboardMapperWidget::save_to_file(const StringView& filename)
String file_content = map_json.to_string();
auto file = Core::File::construct(filename);
file->open(Core::IODevice::WriteOnly);
file->open(Core::OpenMode::WriteOnly);
if (!file->is_open()) {
StringBuilder sb;
sb.append("Failed to open ");

View File

@ -61,7 +61,7 @@ int main(int argc, char** argv)
auto app_icon = GUI::Icon::default_icon("app-keyboard-settings");
auto proc_keymap = Core::File::construct("/proc/keymap");
if (!proc_keymap->open(Core::IODevice::OpenMode::ReadOnly))
if (!proc_keymap->open(Core::OpenMode::ReadOnly))
VERIFY_NOT_REACHED();
auto json = JsonValue::from_string(proc_keymap->read_all());

View File

@ -56,7 +56,7 @@ int main(int argc, char** argv)
auto audio_thread = LibThread::Thread::construct([&] {
auto audio = Core::File::construct("/dev/audio");
if (!audio->open(Core::IODevice::WriteOnly)) {
if (!audio->open(Core::OpenMode::WriteOnly)) {
dbgln("Can't open audio device: {}", audio->error_string());
return 1;
}

View File

@ -171,7 +171,7 @@ String RunWindow::history_file_path()
void RunWindow::load_history()
{
m_path_history.clear();
auto file_or_error = Core::File::open(history_file_path(), Core::IODevice::ReadOnly);
auto file_or_error = Core::File::open(history_file_path(), Core::OpenMode::ReadOnly);
if (file_or_error.is_error())
return;
@ -185,7 +185,7 @@ void RunWindow::load_history()
void RunWindow::save_history()
{
auto file_or_error = Core::File::open(history_file_path(), Core::IODevice::WriteOnly);
auto file_or_error = Core::File::open(history_file_path(), Core::OpenMode::WriteOnly);
if (file_or_error.is_error())
return;

View File

@ -74,7 +74,7 @@ static void fill_mounts(Vector<MountInfo>& output)
{
// Output info about currently mounted filesystems.
auto df = Core::File::construct("/proc/df");
if (!df->open(Core::IODevice::ReadOnly)) {
if (!df->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Failed to open /proc/df: %s\n", df->error_string());
return;
}

View File

@ -198,7 +198,7 @@ void CSVExportDialogPage::update_preview()
auto file_or_error = Core::File::open(
m_temp_output_file_path,
Core::IODevice::ReadOnly);
Core::OpenMode::ReadOnly);
if (file_or_error.is_error())
goto fail;

View File

@ -77,7 +77,7 @@ TEST_CASE(should_iterate_rows)
BENCHMARK_CASE(fairly_big_data)
{
auto file_or_error = Core::File::open(__FILE__ ".data", Core::IODevice::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(__FILE__ ".data", Core::OpenMode::ReadOnly);
EXPECT_EQ_FORCE(file_or_error.is_error(), false);
auto data = file_or_error.value()->read_all();

View File

@ -46,7 +46,7 @@ Sheet::Sheet(Workbook& workbook)
global_object().put("thisSheet", &global_object()); // Self-reference is unfortunate, but required.
// Sadly, these have to be evaluated once per sheet.
auto file_or_error = Core::File::open("/res/js/Spreadsheet/runtime.js", Core::IODevice::OpenMode::ReadOnly);
auto file_or_error = Core::File::open("/res/js/Spreadsheet/runtime.js", Core::OpenMode::ReadOnly);
if (!file_or_error.is_error()) {
auto buffer = file_or_error.value()->read_all();
JS::Parser parser { JS::Lexer(buffer) };

View File

@ -52,7 +52,7 @@ bool Workbook::set_filename(const String& filename)
Result<bool, String> Workbook::load(const StringView& filename)
{
auto file_or_error = Core::File::open(filename, Core::IODevice::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(filename, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
StringBuilder sb;
sb.append("Failed to open ");
@ -81,7 +81,7 @@ Result<bool, String> Workbook::save(const StringView& filename)
{
auto mime = Core::guess_mime_type_based_on_filename(filename);
auto file = Core::File::construct(filename);
file->open(Core::IODevice::WriteOnly);
file->open(Core::OpenMode::WriteOnly);
if (!file->is_open()) {
StringBuilder sb;
sb.append("Failed to open ");

View File

@ -122,7 +122,7 @@ GUI::Variant DevicesModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
void DevicesModel::update()
{
auto proc_devices = Core::File::construct("/proc/devices");
if (!proc_devices->open(Core::IODevice::OpenMode::ReadOnly))
if (!proc_devices->open(Core::OpenMode::ReadOnly))
VERIFY_NOT_REACHED();
auto json = JsonValue::from_string(proc_devices->read_all());

View File

@ -77,7 +77,7 @@ static inline size_t bytes_to_kb(size_t bytes)
void MemoryStatsWidget::refresh()
{
auto proc_memstat = Core::File::construct("/proc/memstat");
if (!proc_memstat->open(Core::IODevice::OpenMode::ReadOnly))
if (!proc_memstat->open(Core::OpenMode::ReadOnly))
VERIFY_NOT_REACHED();
auto file_contents = proc_memstat->read_all();

View File

@ -25,7 +25,7 @@ ProcessModel::ProcessModel()
s_the = this;
auto file = Core::File::construct("/proc/cpuinfo");
if (file->open(Core::IODevice::ReadOnly)) {
if (file->open(Core::OpenMode::ReadOnly)) {
auto json = JsonValue::from_string({ file->read_all() });
auto cpuinfo_array = json.value().as_array();
cpuinfo_array.for_each([&](auto& value) {

View File

@ -631,7 +631,7 @@ void MainWidget::update_title()
bool MainWidget::open_file(const String& path)
{
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly) && file->error() != ENOENT) {
if (!file->open(Core::OpenMode::ReadOnly) && file->error() != ENOENT) {
GUI::MessageBox::show(window(), String::formatted("Opening \"{}\" failed: {}", path, strerror(errno)), "Error", GUI::MessageBox::Type::Error);
return false;
}

View File

@ -86,7 +86,7 @@ WelcomeWidget::~WelcomeWidget()
void WelcomeWidget::open_and_parse_tips_file()
{
auto file = Core::File::construct("/home/anon/Documents/tips.txt");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
m_tip_label->set_text("~/Documents/tips.txt has gone missing!");
return;
}
@ -108,7 +108,7 @@ void WelcomeWidget::open_and_parse_tips_file()
void WelcomeWidget::open_and_parse_readme_file()
{
auto file = Core::File::construct("/home/anon/README.md");
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return;
auto document = Markdown::Document::parse(file->read_all());

View File

@ -11,7 +11,7 @@
RefPtr<Mesh> WavefrontOBJLoader::load(const String& fname)
{
auto obj_file_or_error = Core::File::open(fname, Core::IODevice::OpenMode::ReadOnly);
auto obj_file_or_error = Core::File::open(fname, Core::OpenMode::ReadOnly);
Vector<Vertex> vertices;
Vector<Triangle> triangles;

View File

@ -170,7 +170,7 @@ void Editor::show_documentation_tooltip_if_available(const String& hovered_token
dbgln_if(EDITOR_DEBUG, "opening {}", it->value);
auto file = Core::File::construct(it->value);
if (!file->open(Core::File::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("failed to open {}, {}", it->value, file->error_string());
return;
}

View File

@ -149,7 +149,7 @@ void GitWidget::show_diff(const LexicalPath& file_path)
{
if (!m_git_repo->is_tracked(file_path)) {
auto file = Core::File::construct(file_path.string());
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror("open");
VERIFY_NOT_REACHED();
}

View File

@ -340,7 +340,7 @@ NonnullRefPtr<GUI::Action> HackStudioWidget::create_new_file_action()
filepath = String::formatted("{}{}", filepath, filename);
auto file = Core::File::construct(filepath);
if (!file->open((Core::IODevice::OpenMode)(Core::IODevice::WriteOnly | Core::IODevice::MustBeNew))) {
if (!file->open((Core::OpenMode)(Core::OpenMode::WriteOnly | Core::OpenMode::MustBeNew))) {
GUI::MessageBox::show(window(), String::formatted("Failed to create '{}'", filepath), "Error", GUI::MessageBox::Type::Error);
return;
}

View File

@ -73,7 +73,7 @@ String FileDB::to_absolute_path(const String& filename) const
RefPtr<GUI::TextDocument> FileDB::create_from_filesystem(const String& filename) const
{
auto file = Core::File::open(to_absolute_path(filename), Core::IODevice::ReadOnly);
auto file = Core::File::open(to_absolute_path(filename), Core::OpenMode::ReadOnly);
if (file.is_error()) {
dbgln("failed to create document for {} from filesystem", filename);
return nullptr;
@ -84,7 +84,7 @@ RefPtr<GUI::TextDocument> FileDB::create_from_filesystem(const String& filename)
RefPtr<GUI::TextDocument> FileDB::create_from_fd(int fd) const
{
auto file = Core::File::construct();
if (!file->open(fd, Core::IODevice::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes)) {
if (!file->open(fd, Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes)) {
errno = file->error();
perror("open");
dbgln("Failed to open project file");

View File

@ -55,7 +55,7 @@ void ProjectFile::create_document_if_needed() const
return;
m_document = CodeDocument::create(m_name);
auto file_or_error = Core::File::open(m_name, Core::File::ReadOnly);
auto file_or_error = Core::File::open(m_name, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Couldn't open '{}': {}", m_name, file_or_error.error());
// This is okay though, we'll just go with an empty document and create the file when saving.

View File

@ -90,7 +90,7 @@ int main(int argc, char** argv)
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Error: Cannot open {}: {}", argv[1], file->error_string());
return 1;
}

View File

@ -115,7 +115,7 @@ int main(int argc, char** argv)
editor.set_cursor(4, 28); // after "...widgets!"
} else {
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
GUI::MessageBox::show(window, String::formatted("Opening \"{}\" failed: {}", path, strerror(errno)), "Error", GUI::MessageBox::Type::Error);
return 1;
}
@ -143,7 +143,7 @@ int main(int argc, char** argv)
return;
auto file = Core::File::construct(open_path.value());
if (!file->open(Core::IODevice::ReadOnly) && file->error() != ENOENT) {
if (!file->open(Core::OpenMode::ReadOnly) && file->error() != ENOENT) {
GUI::MessageBox::show(window, String::formatted("Opening \"{}\" failed: {}", open_path.value(), strerror(errno)), "Error", GUI::MessageBox::Type::Error);
return;
}

View File

@ -192,7 +192,7 @@ void Profile::rebuild_tree()
Result<NonnullOwnPtr<Profile>, String> Profile::load_from_perfcore_file(const StringView& path)
{
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return String::formatted("Unable to open {}, error: {}", path, file->error_string());
auto json = JsonValue::from_string(file->read_all());

View File

@ -483,7 +483,7 @@ String ChessWidget::get_fen() const
bool ChessWidget::import_pgn(const StringView& import_path)
{
auto file_or_error = Core::File::open(import_path, Core::File::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(import_path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Couldn't open '{}': {}", import_path, file_or_error.error());
return false;
@ -588,7 +588,7 @@ bool ChessWidget::import_pgn(const StringView& import_path)
bool ChessWidget::export_pgn(const StringView& export_path) const
{
auto file_or_error = Core::File::open(export_path, Core::File::WriteOnly);
auto file_or_error = Core::File::open(export_path, Core::OpenMode::WriteOnly);
if (file_or_error.is_error()) {
warnln("Couldn't open '{}': {}", export_path, file_or_error.error());
return false;

View File

@ -49,11 +49,11 @@ Engine::Engine(const StringView& command)
close(rpipefds[1]);
auto infile = Core::File::construct();
infile->open(rpipefds[0], Core::IODevice::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes);
infile->open(rpipefds[0], Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes);
set_in(infile);
auto outfile = Core::File::construct();
outfile->open(wpipefds[1], Core::IODevice::WriteOnly, Core::File::ShouldCloseFileDescriptor::Yes);
outfile->open(wpipefds[1], Core::OpenMode::WriteOnly, Core::File::ShouldCloseFileDescriptor::Yes);
set_out(outfile);
send_command(Chess::UCI::UCICommand());

View File

@ -20,7 +20,7 @@ static constexpr size_t maximum_wav_size = 1 * GiB; // FIXME: is there a more ap
WavLoaderPlugin::WavLoaderPlugin(const StringView& path)
: m_file(Core::File::construct(path))
{
if (!m_file->open(Core::IODevice::ReadOnly)) {
if (!m_file->open(Core::OpenMode::ReadOnly)) {
m_error_string = String::formatted("Can't open file: {}", m_file->error_string());
return;
}

View File

@ -32,7 +32,7 @@ WavWriter::~WavWriter()
void WavWriter::set_file(const StringView& path)
{
m_file = Core::File::construct(path);
if (!m_file->open(Core::IODevice::ReadWrite)) {
if (!m_file->open(Core::OpenMode::ReadWrite)) {
m_error_string = String::formatted("Can't open file: {}", m_file->error_string());
return;
}

View File

@ -80,7 +80,7 @@ String command(const String& program, const Vector<String>& arguments, Optional<
auto read_all_from_pipe = [](int pipe[2]) {
auto result_file = Core::File::construct();
if (!result_file->open(pipe[0], Core::IODevice::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes)) {
if (!result_file->open(pipe[0], Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes)) {
perror("open");
VERIFY_NOT_REACHED();
}

View File

@ -57,7 +57,7 @@ void ConfigFile::reparse()
m_groups.clear();
auto file = File::construct(m_filename);
if (!file->open(IODevice::OpenMode::ReadOnly))
if (!file->open(OpenMode::ReadOnly))
return;
HashMap<String, String>* current_group = nullptr;

View File

@ -26,7 +26,7 @@
namespace Core {
Result<NonnullRefPtr<File>, String> File::open(String filename, IODevice::OpenMode mode, mode_t permissions)
Result<NonnullRefPtr<File>, String> File::open(String filename, OpenMode mode, mode_t permissions)
{
auto file = File::construct(move(filename));
if (!file->open_impl(mode, permissions))
@ -42,11 +42,11 @@ File::File(String filename, Object* parent)
File::~File()
{
if (m_should_close_file_descriptor == ShouldCloseFileDescriptor::Yes && mode() != NotOpen)
if (m_should_close_file_descriptor == ShouldCloseFileDescriptor::Yes && mode() != OpenMode::NotOpen)
close();
}
bool File::open(int fd, IODevice::OpenMode mode, ShouldCloseFileDescriptor should_close)
bool File::open(int fd, OpenMode mode, ShouldCloseFileDescriptor should_close)
{
set_fd(fd);
set_mode(mode);
@ -54,30 +54,30 @@ bool File::open(int fd, IODevice::OpenMode mode, ShouldCloseFileDescriptor shoul
return true;
}
bool File::open(IODevice::OpenMode mode)
bool File::open(OpenMode mode)
{
return open_impl(mode, 0666);
}
bool File::open_impl(IODevice::OpenMode mode, mode_t permissions)
bool File::open_impl(OpenMode mode, mode_t permissions)
{
VERIFY(!m_filename.is_null());
int flags = 0;
if ((mode & IODevice::ReadWrite) == IODevice::ReadWrite) {
if (has_flag(mode, OpenMode::ReadWrite)) {
flags |= O_RDWR | O_CREAT;
} else if (mode & IODevice::ReadOnly) {
} else if (has_flag(mode, OpenMode::ReadOnly)) {
flags |= O_RDONLY;
} else if (mode & IODevice::WriteOnly) {
} else if (has_flag(mode, OpenMode::WriteOnly)) {
flags |= O_WRONLY | O_CREAT;
bool should_truncate = !((mode & IODevice::Append) || (mode & IODevice::MustBeNew));
bool should_truncate = !(has_flag(mode, OpenMode::Append) || has_flag(mode, OpenMode::MustBeNew));
if (should_truncate)
flags |= O_TRUNC;
}
if (mode & IODevice::Append)
if (has_flag(mode, OpenMode::Append))
flags |= O_APPEND;
if (mode & IODevice::Truncate)
if (has_flag(mode, OpenMode::Truncate))
flags |= O_TRUNC;
if (mode & IODevice::MustBeNew)
if (has_flag(mode, OpenMode::MustBeNew))
flags |= O_EXCL;
int fd = ::open(m_filename.characters(), flags, permissions);
if (fd < 0) {
@ -238,7 +238,7 @@ NonnullRefPtr<File> File::standard_input()
{
if (!stdin_file) {
stdin_file = File::construct();
stdin_file->open(STDIN_FILENO, IODevice::ReadOnly, ShouldCloseFileDescriptor::No);
stdin_file->open(STDIN_FILENO, OpenMode::ReadOnly, ShouldCloseFileDescriptor::No);
}
return *stdin_file;
}
@ -247,7 +247,7 @@ NonnullRefPtr<File> File::standard_output()
{
if (!stdout_file) {
stdout_file = File::construct();
stdout_file->open(STDOUT_FILENO, IODevice::WriteOnly, ShouldCloseFileDescriptor::No);
stdout_file->open(STDOUT_FILENO, OpenMode::WriteOnly, ShouldCloseFileDescriptor::No);
}
return *stdout_file;
}
@ -256,7 +256,7 @@ NonnullRefPtr<File> File::standard_error()
{
if (!stderr_file) {
stderr_file = File::construct();
stderr_file->open(STDERR_FILENO, IODevice::WriteOnly, ShouldCloseFileDescriptor::No);
stderr_file->open(STDERR_FILENO, OpenMode::WriteOnly, ShouldCloseFileDescriptor::No);
}
return *stderr_file;
}
@ -297,7 +297,7 @@ Result<void, File::CopyError> File::copy_file_or_directory(const String& dst_pat
}
}
auto source_or_error = File::open(src_path, IODevice::ReadOnly);
auto source_or_error = File::open(src_path, OpenMode::ReadOnly);
if (source_or_error.is_error())
return CopyError { OSError(errno), false };

View File

@ -19,7 +19,7 @@ class File final : public IODevice {
public:
virtual ~File() override;
static Result<NonnullRefPtr<File>, String> open(String filename, IODevice::OpenMode, mode_t = 0644);
static Result<NonnullRefPtr<File>, String> open(String filename, OpenMode, mode_t = 0644);
String filename() const { return m_filename; }
void set_filename(const String filename) { m_filename = move(filename); }
@ -67,13 +67,13 @@ public:
};
static Result<void, RemoveError> remove(const String& path, RecursionMode, bool force);
virtual bool open(IODevice::OpenMode) override;
virtual bool open(OpenMode) override;
enum class ShouldCloseFileDescriptor {
No = 0,
Yes
};
bool open(int fd, IODevice::OpenMode, ShouldCloseFileDescriptor);
bool open(int fd, OpenMode, ShouldCloseFileDescriptor);
static NonnullRefPtr<File> standard_input();
static NonnullRefPtr<File> standard_output();
@ -86,7 +86,7 @@ private:
}
explicit File(String filename, Object* parent = nullptr);
bool open_impl(IODevice::OpenMode, mode_t);
bool open_impl(OpenMode, mode_t);
String m_filename;
ShouldCloseFileDescriptor m_should_close_file_descriptor { ShouldCloseFileDescriptor::Yes };

View File

@ -20,9 +20,9 @@ public:
{
}
static Result<InputFileStream, String> open(StringView filename, IODevice::OpenMode mode = IODevice::OpenMode::ReadOnly, mode_t permissions = 0644)
static Result<InputFileStream, String> open(StringView filename, OpenMode mode = OpenMode::ReadOnly, mode_t permissions = 0644)
{
VERIFY((mode & 0xf) == IODevice::OpenMode::ReadOnly || (mode & 0xf) == IODevice::OpenMode::ReadWrite);
VERIFY(has_flag(mode, OpenMode::ReadOnly));
auto file_result = File::open(filename, mode, permissions);
@ -32,9 +32,9 @@ public:
return InputFileStream { file_result.value() };
}
static Result<Buffered<InputFileStream>, String> open_buffered(StringView filename, IODevice::OpenMode mode = IODevice::OpenMode::ReadOnly, mode_t permissions = 0644)
static Result<Buffered<InputFileStream>, String> open_buffered(StringView filename, OpenMode mode = OpenMode::ReadOnly, mode_t permissions = 0644)
{
VERIFY((mode & 0xf) == IODevice::OpenMode::ReadOnly || (mode & 0xf) == IODevice::OpenMode::ReadWrite);
VERIFY(has_flag(mode, OpenMode::ReadOnly));
auto file_result = File::open(filename, mode, permissions);
@ -84,9 +84,9 @@ public:
{
}
static Result<OutputFileStream, String> open(StringView filename, IODevice::OpenMode mode = IODevice::OpenMode::WriteOnly, mode_t permissions = 0644)
static Result<OutputFileStream, String> open(StringView filename, OpenMode mode = OpenMode::WriteOnly, mode_t permissions = 0644)
{
VERIFY((mode & 0xf) == IODevice::OpenMode::WriteOnly || (mode & 0xf) == IODevice::OpenMode::ReadWrite);
VERIFY(has_flag(mode, OpenMode::WriteOnly));
auto file_result = File::open(filename, mode, permissions);
@ -96,9 +96,9 @@ public:
return OutputFileStream { file_result.value() };
}
static Result<Buffered<OutputFileStream>, String> open_buffered(StringView filename, IODevice::OpenMode mode = IODevice::OpenMode::WriteOnly, mode_t permissions = 0644)
static Result<Buffered<OutputFileStream>, String> open_buffered(StringView filename, OpenMode mode = OpenMode::WriteOnly, mode_t permissions = 0644)
{
VERIFY((mode & 0xf) == IODevice::OpenMode::WriteOnly || (mode & 0xf) == IODevice::OpenMode::ReadWrite);
VERIFY(has_flag(mode, OpenMode::WriteOnly));
auto file_result = File::open(filename, mode, permissions);

View File

@ -209,7 +209,7 @@ bool IODevice::populate_read_buffer() const
bool IODevice::close()
{
if (fd() < 0 || mode() == NotOpen)
if (fd() < 0 || m_mode == OpenMode::NotOpen)
return false;
int rc = ::close(fd());
if (rc < 0) {
@ -217,7 +217,7 @@ bool IODevice::close()
return false;
}
set_fd(-1);
set_mode(IODevice::NotOpen);
set_mode(OpenMode::NotOpen);
return true;
}

View File

@ -6,6 +6,7 @@
#pragma once
#include <AK/EnumBits.h>
#include <AK/Forward.h>
#include <LibCore/Object.h>
@ -33,24 +34,26 @@ private:
String m_buffer;
};
enum class OpenMode : unsigned {
NotOpen = 0,
ReadOnly = 1,
WriteOnly = 2,
ReadWrite = 3,
Append = 4,
Truncate = 8,
MustBeNew = 16,
};
AK_ENUM_BITWISE_OPERATORS(OpenMode)
class IODevice : public Object {
C_OBJECT_ABSTRACT(IODevice)
public:
enum OpenMode {
NotOpen = 0,
ReadOnly = 1,
WriteOnly = 2,
ReadWrite = 3,
Append = 4,
Truncate = 8,
MustBeNew = 16,
};
virtual ~IODevice() override;
int fd() const { return m_fd; }
unsigned mode() const { return m_mode; }
bool is_open() const { return m_mode != NotOpen; }
OpenMode mode() const { return m_mode; }
bool is_open() const { return m_mode != OpenMode::NotOpen; }
bool eof() const { return m_eof; }
int error() const { return m_error; }
@ -81,7 +84,7 @@ public:
bool seek(i64, SeekMode = SeekMode::SetPosition, off_t* = nullptr);
virtual bool open(IODevice::OpenMode) = 0;
virtual bool open(OpenMode) = 0;
virtual bool close();
LineIterator line_begin() & { return LineIterator(*this); }
@ -102,7 +105,7 @@ private:
bool can_read_from_fd() const;
int m_fd { -1 };
OpenMode m_mode { NotOpen };
OpenMode m_mode { OpenMode::NotOpen };
mutable int m_error { 0 };
mutable bool m_eof { false };
mutable Vector<u8> m_buffered_data;

View File

@ -24,7 +24,7 @@ LocalSocket::LocalSocket(int fd, Object* parent)
// NOTE: This constructor is used by LocalServer::accept(), so the socket is already connected.
m_connected = true;
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
@ -44,7 +44,7 @@ LocalSocket::LocalSocket(Object* parent)
set_error(errno);
} else {
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
}

View File

@ -26,7 +26,7 @@ Optional<HashMap<pid_t, Core::ProcessStatistics>> ProcessStatisticsReader::get_a
}
} else {
proc_all_file = Core::File::construct("/proc/all");
if (!proc_all_file->open(Core::IODevice::ReadOnly)) {
if (!proc_all_file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "ProcessStatisticsReader: Failed to open /proc/all: %s\n", proc_all_file->error_string());
return {};
}

View File

@ -58,7 +58,7 @@ protected:
virtual bool common_connect(const struct sockaddr*, socklen_t);
private:
virtual bool open(IODevice::OpenMode) override { VERIFY_NOT_REACHED(); }
virtual bool open(OpenMode) override { VERIFY_NOT_REACHED(); }
void ensure_read_notifier();
Type m_type { Type::Invalid };

View File

@ -20,7 +20,7 @@ TCPSocket::TCPSocket(int fd, Object* parent)
// NOTE: This constructor is used by TCPServer::accept(), so the socket is already connected.
m_connected = true;
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
@ -38,7 +38,7 @@ TCPSocket::TCPSocket(Object* parent)
set_error(errno);
} else {
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
}

View File

@ -29,7 +29,7 @@ UDPSocket::UDPSocket(Object* parent)
set_error(errno);
} else {
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(OpenMode::ReadWrite);
set_error(0);
}
}

View File

@ -392,7 +392,7 @@ Optional<DebugSession::InsertBreakpointAtSourcePositionResult> DebugSession::ins
void DebugSession::update_loaded_libs()
{
auto file = Core::File::construct(String::formatted("/proc/{}/vm", m_debuggee_pid));
bool rc = file->open(Core::IODevice::ReadOnly);
bool rc = file->open(Core::OpenMode::ReadOnly);
VERIFY(rc);
auto file_contents = file->read_all();

View File

@ -41,7 +41,7 @@ static void initialize_if_needed()
void CommonLocationsProvider::load_from_json(const String& json_path)
{
auto file = Core::File::construct(json_path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Unable to open {}", file->filename());
return;
}

View File

@ -13,7 +13,7 @@ namespace GUI {
void JsonArrayModel::update()
{
auto file = Core::File::construct(m_json_path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Unable to open {}", file->filename());
m_array.clear();
did_update();
@ -32,7 +32,7 @@ void JsonArrayModel::update()
bool JsonArrayModel::store()
{
auto file = Core::File::construct(m_json_path);
if (!file->open(Core::IODevice::WriteOnly)) {
if (!file->open(Core::OpenMode::WriteOnly)) {
dbgln("Unable to open {}", file->filename());
return false;
}

View File

@ -23,7 +23,7 @@ Optional<CharacterMapData> CharacterMapFile::load_from_file(const String& filena
}
auto file = Core::File::construct(path);
file->open(Core::IODevice::ReadOnly);
file->open(Core::OpenMode::ReadOnly);
if (!file->is_open()) {
dbgln("Failed to open {}: {}", filename, file->error_string());
return {};

View File

@ -220,7 +220,7 @@ void Editor::add_to_history(const String& line)
bool Editor::load_history(const String& path)
{
auto history_file = Core::File::construct(path);
if (!history_file->open(Core::IODevice::ReadOnly))
if (!history_file->open(Core::OpenMode::ReadOnly))
return false;
auto data = history_file->read_all();
auto hist = StringView { data.data(), data.size() };
@ -279,7 +279,7 @@ bool Editor::save_history(const String& path)
{
Vector<HistoryEntry> final_history { { "", 0 } };
{
auto file_or_error = Core::File::open(path, Core::IODevice::ReadWrite, 0600);
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadWrite, 0600);
if (file_or_error.is_error())
return false;
auto file = file_or_error.release_value();
@ -294,7 +294,7 @@ bool Editor::save_history(const String& path)
[](const HistoryEntry& left, const HistoryEntry& right) { return left.timestamp < right.timestamp; });
}
auto file_or_error = Core::File::open(path, Core::IODevice::WriteOnly, 0600);
auto file_or_error = Core::File::open(path, Core::OpenMode::WriteOnly, 0600);
if (file_or_error.is_error())
return false;
auto file = file_or_error.release_value();

View File

@ -569,7 +569,7 @@ void Editor::edit_in_external_editor()
}
{
auto file_or_error = Core::File::open(file_path, Core::IODevice::OpenMode::ReadOnly);
auto file_or_error = Core::File::open(file_path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error())
return;

View File

@ -63,7 +63,7 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
{
auto stack_path = String::formatted("/proc/{}/stacks/{}", pid, tid);
auto file_or_error = Core::File::open(stack_path, Core::IODevice::ReadOnly);
auto file_or_error = Core::File::open(stack_path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Could not open {}: {}", stack_path, file_or_error.error());
return {};
@ -83,7 +83,7 @@ Vector<Symbol> symbolicate_thread(pid_t pid, pid_t tid)
{
auto vm_path = String::formatted("/proc/{}/vm", pid);
auto file_or_error = Core::File::open(vm_path, Core::IODevice::ReadOnly);
auto file_or_error = Core::File::open(vm_path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Could not open {}: {}", vm_path, file_or_error.error());
return {};

View File

@ -867,7 +867,7 @@ TLSv12::TLSv12(Core::Object* parent, Options options)
set_error(errno);
} else {
set_fd(fd);
set_mode(IODevice::ReadWrite);
set_mode(Core::OpenMode::ReadWrite);
set_error(0);
}
}

View File

@ -207,13 +207,13 @@ GlyphHorizontalMetrics Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const
RefPtr<Font> Font::load_from_file(String path, unsigned index)
{
auto file_or_error = Core::File::open(move(path), Core::IODevice::ReadOnly);
auto file_or_error = Core::File::open(move(path), Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
dbgln("Could not open file: {}", file_or_error.error());
return nullptr;
}
auto file = file_or_error.value();
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Could not open file");
return nullptr;
}

View File

@ -34,7 +34,7 @@ int main(int argc, char** argv)
return 1;
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return 1;
auto json = JsonValue::from_string(file->read_all());

View File

@ -34,7 +34,7 @@ int main(int argc, char** argv)
return 1;
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return 1;
auto json = JsonValue::from_string(file->read_all());

View File

@ -34,7 +34,7 @@ int main(int argc, char** argv)
return 1;
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return 1;
auto json = JsonValue::from_string(file->read_all());

View File

@ -34,7 +34,7 @@ int main(int argc, char** argv)
return 1;
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return 1;
auto json = JsonValue::from_string(file->read_all());

View File

@ -394,7 +394,7 @@ int main(int argc, char** argv)
args_parser.add_positional_argument(path, "IDL file", "idl-file");
args_parser.parse(argc, argv);
auto file_or_error = Core::File::open(path, Core::IODevice::ReadOnly);
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
fprintf(stderr, "Cannot open %s\n", path);
return 1;

View File

@ -133,7 +133,7 @@ void ResourceLoader::load(const LoadRequest& request, Function<void(ReadonlyByte
if (url.protocol() == "file") {
auto f = Core::File::construct();
f->set_filename(url.path());
if (!f->open(Core::IODevice::OpenMode::ReadOnly)) {
if (!f->open(Core::OpenMode::ReadOnly)) {
dbgln("ResourceLoader::load: Error: {}", f->error_string());
if (error_callback)
error_callback(f->error_string(), {});

View File

@ -23,7 +23,7 @@ Mixer::Mixer()
},
"AudioServer[mixer]"))
{
if (!m_device->open(Core::IODevice::WriteOnly)) {
if (!m_device->open(Core::OpenMode::WriteOnly)) {
dbgln("Can't open audio device: {}", m_device->error_string());
return;
}

View File

@ -46,7 +46,7 @@ static bool compress_coredump(const String& coredump_path)
return false;
}
auto output_path = String::formatted("{}.gz", coredump_path);
auto output_file_or_error = Core::File::open(output_path, Core::File::WriteOnly);
auto output_file_or_error = Core::File::open(output_path, Core::OpenMode::WriteOnly);
if (output_file_or_error.is_error()) {
dbgln("Could not open '{}' for writing: {}", output_path, output_file_or_error.error());
return false;

View File

@ -169,7 +169,7 @@ void DHCPv4Client::try_discover_deferred_ifs()
Result<DHCPv4Client::Interfaces, String> DHCPv4Client::get_discoverable_interfaces()
{
auto file = Core::File::construct("/proc/net/adapters");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Error: Failed to open /proc/net/adapters: {}", file->error_string());
return String { file->error_string() };
}

View File

@ -127,12 +127,12 @@ int perform_copy(const String& source, const String& destination)
continue;
}
VERIFY(item.type == WorkItem::Type::CopyFile);
auto source_file_or_error = Core::File::open(item.source, Core::File::ReadOnly);
auto source_file_or_error = Core::File::open(item.source, Core::OpenMode::ReadOnly);
if (source_file_or_error.is_error()) {
report_warning(String::formatted("Failed to open {} for reading: {}", item.source, source_file_or_error.error()));
return 1;
}
auto destination_file_or_error = Core::File::open(item.destination, (Core::IODevice::OpenMode)(Core::File::WriteOnly | Core::File::Truncate));
auto destination_file_or_error = Core::File::open(item.destination, (Core::OpenMode)(Core::OpenMode::WriteOnly | Core::OpenMode::Truncate));
if (destination_file_or_error.is_error()) {
report_warning(String::formatted("Failed to open {} for write: {}", item.destination, destination_file_or_error.error()));
return 1;

View File

@ -79,7 +79,7 @@ void LookupServer::load_etc_hosts()
};
auto file = Core::File::construct("/etc/hosts");
if (!file->open(Core::IODevice::ReadOnly))
if (!file->open(Core::OpenMode::ReadOnly))
return;
while (!file->eof()) {
auto line = file->read_line(1024);

View File

@ -114,7 +114,7 @@ ssize_t MulticastDNS::emit_packet(const DNSPacket& packet, const sockaddr_in* de
Vector<IPv4Address> MulticastDNS::local_addresses() const
{
auto file = Core::File::construct("/proc/net/adapters");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
dbgln("Failed to open /proc/net/adapters: {}", file->error_string());
return {};
}

View File

@ -50,7 +50,7 @@ static void sigchld_handler(int)
static void parse_boot_mode()
{
auto f = Core::File::construct("/proc/cmdline");
if (!f->open(Core::IODevice::ReadOnly)) {
if (!f->open(Core::OpenMode::ReadOnly)) {
dbgln("Failed to read command line: {}", f->error_string());
return;
}

View File

@ -103,7 +103,7 @@ void Client::handle_request(ReadonlyBytes raw_request)
}
auto file = Core::File::construct(real_path);
if (!file->open(Core::File::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
send_error_response(404, "Not found!", request);
return;
}

View File

@ -879,7 +879,7 @@ void Shell::execute_process(Vector<const char*>&& argv)
}
if (saved_errno == ENOENT) {
do {
auto file_result = Core::File::open(argv[0], Core::IODevice::OpenMode::ReadOnly);
auto file_result = Core::File::open(argv[0], Core::OpenMode::ReadOnly);
if (file_result.is_error())
break;
auto& file = file_result.value();
@ -1012,7 +1012,7 @@ bool Shell::run_file(const String& filename, bool explicitly_invoked)
TemporaryChange interactive_change { m_is_interactive, false };
TemporaryChange<Optional<SourcePosition>> source_change { m_source_position, SourcePosition { .source_file = filename, .literal_source_text = {}, .position = {} } };
auto file_result = Core::File::open(filename, Core::File::ReadOnly);
auto file_result = Core::File::open(filename, Core::OpenMode::ReadOnly);
if (file_result.is_error()) {
auto error = String::formatted("'{}': {}", escape_token_for_single_quotes(filename), file_result.error());
if (explicitly_invoked)
@ -1995,7 +1995,7 @@ void Shell::possibly_print_error() const
i64 line_to_skip_to = max(source_position.position->start_line.line_number, 2ul) - 2;
if (!source_position.source_file.is_null()) {
auto file = Core::File::open(source_position.source_file, Core::IODevice::OpenMode::ReadOnly);
auto file = Core::File::open(source_position.source_file, Core::OpenMode::ReadOnly);
if (file.is_error()) {
warnln("Shell: Internal error while trying to display source information: {} (while reading '{}')", file.error(), source_position.source_file);
return;

View File

@ -105,7 +105,7 @@ int main(int argc, char** argv)
parser.parse(argc, argv);
if (format) {
auto file = Core::File::open(format, Core::IODevice::ReadOnly);
auto file = Core::File::open(format, Core::OpenMode::ReadOnly);
if (file.is_error()) {
warnln("Error: {}", file.error());
return 1;

View File

@ -22,7 +22,7 @@ int main(int argc, char** argv)
if (!path)
path = "Source/little/main.cpp";
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror("open");
exit(1);
}

View File

@ -10,7 +10,7 @@
int main(int, char**)
{
auto file = Core::File::construct("/home/anon/Source/little/other.h");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror("open");
exit(1);
}

View File

@ -13,7 +13,7 @@
int main()
{
auto file = Core::File::construct("/proc/net/arp");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", file->error_string());
return 1;
}

View File

@ -32,12 +32,12 @@ int main(int argc, char** argv)
auto file = Core::File::construct();
bool success = file->open(
STDIN_FILENO,
Core::IODevice::OpenMode::ReadOnly,
Core::OpenMode::ReadOnly,
Core::File::ShouldCloseFileDescriptor::Yes);
VERIFY(success);
buffer = file->read_all();
} else {
auto result = Core::File::open(filepath, Core::IODevice::OpenMode::ReadOnly);
auto result = Core::File::open(filepath, Core::OpenMode::ReadOnly);
VERIFY(!result.is_error());
auto file = result.value();
buffer = file->read_all();

View File

@ -54,10 +54,10 @@ int main(int argc, char** argv)
for (auto const& path : paths) {
if (path == "-") {
success = file->open(STDIN_FILENO, Core::IODevice::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::No);
success = file->open(STDIN_FILENO, Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::No);
} else {
file->set_filename(path);
success = file->open(Core::IODevice::OpenMode::ReadOnly);
success = file->open(Core::OpenMode::ReadOnly);
}
if (!success) {
warnln("{}: {}: {}", argv[0], path, file->error_string());

View File

@ -42,7 +42,7 @@ int main(int argc, char** argv)
bool fail = false;
for (auto& path : paths) {
auto file = Core::File::construct((StringView(path) == "-") ? "/dev/stdin" : path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("{}: {}: {}", argv[0], path, file->error_string());
fail = true;
continue;

View File

@ -43,7 +43,7 @@ static Options parse_options(int argc, char* argv[])
auto c_stdin = Core::File::construct();
bool success = c_stdin->open(
STDIN_FILENO,
Core::IODevice::OpenMode::ReadOnly,
Core::OpenMode::ReadOnly,
Core::File::ShouldCloseFileDescriptor::No);
VERIFY(success);
auto buffer = c_stdin->read_all();

View File

@ -39,7 +39,7 @@ int main(int argc, char** argv)
args_parser.parse(argc, argv);
auto file = Core::File::construct("/proc/df");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Failed to open /proc/df: %s\n", file->error_string());
return 1;
}

View File

@ -26,7 +26,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
unveil(nullptr, nullptr);
auto f = Core::File::construct("/proc/dmesg");
if (!f->open(Core::IODevice::ReadOnly)) {
if (!f->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "open: failed to open /proc/dmesg: %s\n", f->error_string());
return 1;
}

View File

@ -104,7 +104,7 @@ int parse_args(int argc, char** argv, Vector<String>& files, DuOption& du_option
du_option.excluded_patterns.append(pattern);
if (exclude_from) {
auto file = Core::File::construct(exclude_from);
bool success = file->open(Core::IODevice::ReadOnly);
bool success = file->open(Core::OpenMode::ReadOnly);
VERIFY(success);
if (const auto buff = file->read_all()) {
String patterns = String::copy(buff, Chomp);

View File

@ -96,7 +96,7 @@ int main(int argc, char** argv)
for (auto path : paths) {
auto file = Core::File::construct(path);
if (!file->open(Core::File::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror(path);
all_ok = false;
continue;

View File

@ -84,7 +84,7 @@ int main(int argc, char** argv)
args_parser.parse(argc, argv);
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Couldn't open {} for reading: {}", path, file->error_string());
return 1;
}

View File

@ -18,7 +18,7 @@ bool format_file(const StringView& path, bool inplace)
if (read_from_stdin) {
file = Core::File::standard_input();
} else {
auto open_mode = inplace ? Core::File::ReadWrite : Core::File::ReadOnly;
auto open_mode = inplace ? Core::OpenMode::ReadWrite : Core::OpenMode::ReadOnly;
auto file_or_error = Core::File::open(path, open_mode);
if (file_or_error.is_error()) {
warnln("Could not open {}: {}", path, file_or_error.error());

View File

@ -140,7 +140,7 @@ int main(int argc, char** argv)
auto handle_file = [&matches, binary_mode](StringView filename, bool print_filename) -> bool {
auto file = Core::File::construct(filename);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", filename, file->error_string());
return false;
}

View File

@ -46,7 +46,7 @@ int main(int argc, char** argv)
return 0;
}
auto file = Core::File::construct(argv[1]);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Couldn't open %s for reading: %s\n", argv[1], file->error_string());
return 1;
}

View File

@ -22,7 +22,7 @@ int main(int argc, char** argv)
if (!path) {
file = Core::File::standard_input();
} else {
auto file_or_error = Core::File::open(path, Core::File::ReadOnly);
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Failed to open {}: {}", path, file_or_error.error());
return 1;

View File

@ -38,7 +38,7 @@ int main(int argc, char** argv)
if (!value_ipv4 && !value_adapter && !value_gateway && !value_mask) {
auto file = Core::File::construct("/proc/net/adapters");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", file->error_string());
return 1;
}

View File

@ -40,7 +40,7 @@ int main(int argc, char** argv)
if (path == nullptr)
path = "/dev/stdin";
auto file = Core::File::construct(path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Couldn't open {} for reading: {}", path, file->error_string());
return 1;
}

View File

@ -587,7 +587,7 @@ JS_DEFINE_NATIVE_FUNCTION(ReplObject::load_file)
for (auto& file : vm.call_frame().arguments) {
String filename = file.as_string().string();
auto js_file = Core::File::construct(filename);
if (!js_file->open(Core::IODevice::ReadOnly)) {
if (!js_file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", filename, js_file->error_string());
continue;
}
@ -969,7 +969,7 @@ int main(int argc, char** argv)
});
auto file = Core::File::construct(script_path);
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
warnln("Failed to open {}: {}", script_path, file->error_string());
return 1;
}

View File

@ -26,7 +26,7 @@ int main([[maybe_unused]] int argc, [[maybe_unused]] char** argv)
unveil(nullptr, nullptr);
auto proc_interrupts = Core::File::construct("/proc/interrupts");
if (!proc_interrupts->open(Core::IODevice::ReadOnly)) {
if (!proc_interrupts->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", proc_interrupts->error_string());
return 1;
}

View File

@ -64,7 +64,7 @@ static bool parse_name(StringView name, OpenFile& file)
static Vector<OpenFile> get_open_files_by_pid(pid_t pid)
{
auto file = Core::File::open(String::formatted("/proc/{}/fds", pid), Core::IODevice::OpenMode::ReadOnly);
auto file = Core::File::open(String::formatted("/proc/{}/fds", pid), Core::OpenMode::ReadOnly);
if (file.is_error()) {
printf("lsof: PID %d: %s\n", pid, file.error().characters());
return Vector<OpenFile>();

View File

@ -55,7 +55,7 @@ int main(int argc, char** argv)
}
auto proc_pci = Core::File::construct("/proc/pci");
if (!proc_pci->open(Core::IODevice::ReadOnly)) {
if (!proc_pci->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", proc_pci->error_string());
return 1;
}

View File

@ -77,7 +77,7 @@ int main(int argc, char* argv[])
auto file = Core::File::construct();
file->set_filename(make_path(section));
if (!file->open(Core::IODevice::OpenMode::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror("Failed to open man page file");
exit(1);
}

View File

@ -48,10 +48,10 @@ int main(int argc, char* argv[])
auto file = Core::File::construct();
bool success;
if (filename == nullptr) {
success = file->open(STDIN_FILENO, Core::IODevice::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::No);
success = file->open(STDIN_FILENO, Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::No);
} else {
file->set_filename(filename);
success = file->open(Core::IODevice::OpenMode::ReadOnly);
success = file->open(Core::OpenMode::ReadOnly);
}
if (!success) {
fprintf(stderr, "Error: %s\n", file->error_string());

View File

@ -68,7 +68,7 @@ static bool mount_all()
dbgln("Mounting all filesystems...");
auto fstab = Core::File::construct("/etc/fstab");
if (!fstab->open(Core::IODevice::OpenMode::ReadOnly)) {
if (!fstab->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Failed to open /etc/fstab: %s\n", fstab->error_string());
return false;
}
@ -118,7 +118,7 @@ static bool print_mounts()
{
// Output info about currently mounted filesystems.
auto df = Core::File::construct("/proc/df");
if (!df->open(Core::IODevice::ReadOnly)) {
if (!df->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Failed to open /proc/df: %s\n", df->error_string());
return false;
}

View File

@ -18,7 +18,7 @@ int main()
}
auto file = Core::File::construct("/proc/cpuinfo");
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
perror("Core::File::open()");
return 1;
}

View File

@ -36,7 +36,7 @@ int main(int argc, char** argv)
args_parser.parse(argc, argv);
auto file = Core::File::construct(String::formatted("/proc/{}/vm", pid));
if (!file->open(Core::IODevice::ReadOnly)) {
if (!file->open(Core::OpenMode::ReadOnly)) {
fprintf(stderr, "Error: %s\n", file->error_string());
return 1;
}

View File

@ -29,7 +29,7 @@ int main(int argc, char** argv)
files.append(Core::File::standard_input());
} else {
for (auto const& path : paths) {
auto file_or_error = Core::File::open(path, Core::File::ReadOnly);
auto file_or_error = Core::File::open(path, Core::OpenMode::ReadOnly);
if (file_or_error.is_error()) {
warnln("Failed to open {}: {}", path, file_or_error.error());
continue;

Some files were not shown because too many files have changed in this diff Show More