beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 15:40:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

diff: Port to LibMain

Browse source
This commit is contained in:
Kenneth Myhra 2021-12-07 20:30:37 +01:00 committed by Brian Gianforcaro
parent cd8bd27835
commit 4726532735
Notes: sideshowbarker 2024-07-17 22:44:16 +09:00 
Author: https://github.com/kennethmyhra
Commit: https://github.com/SerenityOS/serenity/commit/4726532735d
Pull-request: https://github.com/SerenityOS/serenity/pull/11253
Reviewed-by: https://github.com/alimpfard
Reviewed-by: https://github.com/bgianfo ✅
2 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Userland/Utilities/CMakeLists.txt
View file

@ -81,7 +81,7 @@ target_link_libraries(date LibMain)
target_link_libraries(dd LibMain) target_link_libraries(dd LibMain)
target_link_libraries(ddate LibMain) target_link_libraries(ddate LibMain)
target_link_libraries(df LibMain) target_link_libraries(df LibMain)
target_link_libraries(diff LibDiff) target_link_libraries(diff LibDiff LibMain)
target_link_libraries(disasm LibX86) target_link_libraries(disasm LibX86)
target_link_libraries(dmesg LibMain) target_link_libraries(dmesg LibMain)
target_link_libraries(echo LibMain) target_link_libraries(echo LibMain)

27
Userland/Utilities/diff.cpp
View file

@ -6,34 +6,25 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h>
#include <LibDiff/Generator.h> #include <LibDiff/Generator.h>
#include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (pledge("stdio rpath", nullptr) < 0) { TRY(Core::System::pledge("stdio rpath"));
perror("pledge");
return 1;
}
Core::ArgsParser parser; Core::ArgsParser parser;
char const* filename1; String filename1;
char const* filename2; String filename2;
parser.add_positional_argument(filename1, "First file to compare", "file1", Core::ArgsParser::Required::Yes); parser.add_positional_argument(filename1, "First file to compare", "file1", Core::ArgsParser::Required::Yes);
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(argc, argv, Core::ArgsParser::FailureBehavior::PrintUsageAndExit); parser.parse(arguments);
auto file1 = Core::File::construct(filename1); auto file1 = TRY(Core::File::open(filename1, Core::OpenMode::ReadOnly));
if (!file1->open(Core::OpenMode::ReadOnly)) { auto file2 = TRY(Core::File::open(filename2, Core::OpenMode::ReadOnly));
warnln("Error: Cannot open {}: {}", filename1, file1->error_string());
return 1;
}
auto file2 = Core::File::construct(filename2);
if (!file2->open(Core::OpenMode::ReadOnly)) {
warnln("Error: Cannot open {}: {}", filename2, file2->error_string());
return 1;
}
auto hunks = Diff::from_text(file1->read_all(), file2->read_all()); auto hunks = Diff::from_text(file1->read_all(), file2->read_all());
for (const auto& hunk : hunks) { for (const auto& hunk : hunks) {