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

cmp: Use Core::File::open_file_or_standard_stream()

Browse source
This commit is contained in:
Sam Atkins 2023-03-10 13:16:56 +00:00 • committed by Andreas Kling
parent 0f95ff64ed
commit 684af3d4d0
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/cmp.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022, Sam Atkins <atkinssj@serenityos.org> * Copyright (c) 2022-2023, Sam Atkins <atkinssj@serenityos.org>
* *
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
@ -8,17 +8,11 @@
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <unistd.h>
static ErrorOr<NonnullOwnPtr<Core::BufferedFile>> open_file_or_stdin(DeprecatedString const& filename) static ErrorOr<NonnullOwnPtr<Core::BufferedFile>> open_file_or_stdin(DeprecatedString const& filename)
{ {
OwnPtr<Core::File> file; auto file = TRY(Core::File::open_file_or_standard_stream(filename, Core::File::OpenMode::Read));
if (filename == "-") { return TRY(Core::BufferedFile::create(move(file)));
file = TRY(Core::File::adopt_fd(STDIN_FILENO, Core::File::OpenMode::Read));
} else {
file = TRY(Core::File::open(filename, Core::File::OpenMode::Read));
}
return TRY(Core::BufferedFile::create(file.release_nonnull()));
} }
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)