Browse Source

Utilities: Add a basic `diff` utility

Mustafa Quraish 3 years ago
parent
commit
f552c26c79
2 changed files with 53 additions and 1 deletions
  1. 2 1
      Userland/Utilities/CMakeLists.txt
  2. 51 0
      Userland/Utilities/diff.cpp

+ 2 - 1
Userland/Utilities/CMakeLists.txt

@@ -1,7 +1,7 @@
 file(GLOB CMD_SOURCES  CONFIGURE_DEPENDS "*.cpp")
 list(APPEND SPECIAL_TARGETS test install)
 list(APPEND REQUIRED_TARGETS
-    arp base64 basename cat chmod chown clear comm cp cut date dd df dirname dmesg du echo env expr false fgrep
+    arp base64 basename cat chmod chown clear comm cp cut date dd df diff dirname dmesg du echo env expr false fgrep
     file find grep groups head host hostname id ifconfig kill killall ln ls mkdir mount mv nproc
     pgrep pidof ping pmap ps readlink realpath reboot rm rmdir seq shutdown sleep sort stat stty su tail test
     touch tr true umount uname uniq uptime w wc which whoami xargs yes less
@@ -59,6 +59,7 @@ target_link_libraries(chres LibGUI)
 target_link_libraries(cksum LibCrypto)
 target_link_libraries(config LibConfig)
 target_link_libraries(copy LibGUI)
+target_link_libraries(diff LibDiff)
 target_link_libraries(disasm LibX86)
 target_link_libraries(expr LibRegex)
 target_link_libraries(file LibGfx LibIPC LibCompress)

+ 51 - 0
Userland/Utilities/diff.cpp

@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibCore/ArgsParser.h>
+#include <LibCore/File.h>
+#include <LibDiff/Generator.h>
+#include <unistd.h>
+
+int main(int argc, char** argv)
+{
+    if (pledge("stdio rpath", nullptr) < 0) {
+        perror("pledge");
+        return 1;
+    }
+
+    Core::ArgsParser parser;
+    char const* filename1;
+    char const* filename2;
+
+    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.parse(argc, argv, Core::ArgsParser::FailureBehavior::PrintUsageAndExit);
+
+    auto file1 = Core::File::construct(filename1);
+    if (!file1->open(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());
+    for (const auto& hunk : hunks) {
+        outln("Hunk: {}, {}", hunk.original_start_line, hunk.target_start_line);
+        for (const auto& line : hunk.removed_lines) {
+            outln("\033[31;1m< {}\033[0m", line);
+        }
+        if (hunk.added_lines.size() > 0 && hunk.removed_lines.size() > 0)
+            outln("---");
+        for (const auto& line : hunk.added_lines)
+            outln("\033[32;1m> {}\033[0m", line);
+    }
+
+    return hunks.is_empty() ? 0 : 1;
+}