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

diff: Port to Core::Stream

Browse source 
Also switched to calling Core::System::isatty(), and doing so once
instead of per hunk.
This commit is contained in:
Sam Atkins 2022-09-14 11:36:06 +01:00 • committed by Linus Groh
parent ed6d353cdd
commit 37d4e01fc4
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Userland/Utilities/diff.cpp
View file

@ -5,7 +5,7 @@
*/ */
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/Stream.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibDiff/Generator.h> #include <LibDiff/Generator.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
@ -23,10 +23,12 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
parser.add_positional_argument(filename2, "Second file to compare", "file2", Core::ArgsParser::Required::Yes); parser.add_positional_argument(filename2, "Second file to compare", "file2", Core::ArgsParser::Required::Yes);
parser.parse(arguments); parser.parse(arguments);
auto file1 = TRY(Core::File::open(filename1, Core::OpenMode::ReadOnly)); auto file1 = TRY(Core::Stream::File::open(filename1, Core::Stream::OpenMode::Read));
auto file2 = TRY(Core::File::open(filename2, Core::OpenMode::ReadOnly)); auto file2 = TRY(Core::Stream::File::open(filename2, Core::Stream::OpenMode::Read));
auto hunks = Diff::from_text(file1->read_all(), file2->read_all()); bool color_output = TRY(Core::System::isatty(STDOUT_FILENO));
auto hunks = Diff::from_text(TRY(file1->read_all()), TRY(file2->read_all()));
for (auto const& hunk : hunks) { for (auto const& hunk : hunks) {
auto original_start = hunk.original_start_line; auto original_start = hunk.original_start_line;
auto target_start = hunk.target_start_line; auto target_start = hunk.target_start_line;
@ -52,8 +54,6 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
if (num_added > 1) if (num_added > 1)
sb.appendff(",{}", target_start + num_added - 1); sb.appendff(",{}", target_start + num_added - 1);
bool color_output = isatty(STDOUT_FILENO);
outln("Hunk: {}", sb.build()); outln("Hunk: {}", sb.build());
for (auto const& line : hunk.removed_lines) { for (auto const& line : hunk.removed_lines) {
if (color_output) if (color_output)