Add context and normal diff modes

Author: notriddle

.gitignore

@@ -1,3 +1,6 @@
 /target
+/lib/normal-diff/target
+/lib/context-diff/target
+/lib/unified-diff/target
 Cargo.lock
 *.swp

Cargo.toml

@@ -1,15 +1,7 @@
-[package]
-name = "unified-diff"
-version = "0.2.1"
-authors = [
-    "Michael Howell <[email protected]>",
-    "The Rust Project Developers"
+[workspace]
+members = [
+    "lib/unified-diff",
+    "lib/context-diff",
+    "lib/normal-diff",
+    "bin/diff",
 ]
-edition = "2018"
-description = "An implementation of the GNU unified diff format"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/notriddle/rust-unified-diff"
-exclude = [ "fuzz" ]
-
-[dependencies]
-diff = "0.1.10"

README.md

@@ -1,41 +1,58 @@
-A GNU unified diff generator. Oracle tested against GNU patch 2.7.6
+A package (currently just `diff`, but eventually more) of programs related to finding differences between files.
 
-Based on the incomplete diff generator in https://github.com/rust-lang/rust/blob/master/src/tools/compiletest/src/runtest.rs,
-but it implements a different format.
+Based on the incomplete diff generator in https://github.com/rust-lang/rust/blob/master/src/tools/compiletest/src/runtest.rs, and made to be compatible with GNU's diff and patch tools.
 
 ```
-~/unified-diff$ cargo run Cargo.lock Cargo.toml 
+~/diffutils$ cargo run -- -u3 Cargo.lock Cargo.toml 
     Finished dev [unoptimized + debuginfo] target(s) in 0.00s
-     Running `target/debug/unified-diff Cargo.lock Cargo.toml`
+     Running `target/debug/diff -u3 Cargo.lock Cargo.toml`
 --- Cargo.lock	
 +++ Cargo.toml	
-@@ -1,14 +1,14 @@
+@@ -1,39 +1,7 @@
 -# This file is automatically @generated by Cargo.
 -# It is not intended for manual editing.
+-version = 3
+-
+-[[package]]
+-name = "context-diff"
+-version = "0.1.0"
+-dependencies = [
+- "diff 0.1.12",
+-]
+-
+-[[package]]
+-name = "diff"
+-version = "0.1.0"
+-dependencies = [
+- "context-diff",
+- "normal-diff",
+- "unified-diff",
+-]
+-
 -[[package]]
 -name = "diff"
 -version = "0.1.12"
 -source = "registry+https://github.com/rust-lang/crates.io-index"
 -checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499"
 -
 -[[package]]
-+[package]
- name = "unified-diff"
- version = "0.1.0"
+-name = "normal-diff"
+-version = "0.1.0"
+-dependencies = [
+- "diff 0.1.12",
+-]
+-
+-[[package]]
+-name = "unified-diff"
+-version = "0.3.0"
 -dependencies = [
-- "diff",
-+authors = [
-+    "Michael Howell <[email protected]>",
-+    "The Rust Project Developers"
+- "diff 0.1.12",
++[workspace]
++members = [
++    "lib/unified-diff",
++    "lib/context-diff",
++    "lib/normal-diff",
++    "bin/diff",
  ]
-+edition = "2018"
-+
-+[[bin]]
-+name = "unified-diff"
-+
-+[dependencies]
-+diff = "0.1.10"
-~/unified-diff$ rustup override set nightly
-~/unified-diff$ cargo fuzz run fuzz_patch
 ```
 

bin/diff/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "diff"
+version = "0.1.0"
+authors = ["Michael Howell <[email protected]>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+context-diff = { path = "../../lib/context-diff" }
+normal-diff = { path = "../../lib/normal-diff" }
+unified-diff = { path = "../../lib/unified-diff" }

bin/diff/src/main.rs

@@ -0,0 +1,50 @@
+use crate::params::*;
+use std::env;
+
+use std::fs;
+use std::io::{self, Write};
+
+mod params;
+
+fn main() -> Result<(), String> {
+    let opts = env::args_os();
+    let Params {
+        from,
+        to,
+        context_count,
+        format,
+    } = parse_params(opts)?;
+    // read files
+    let from_content = match fs::read(&from) {
+        Ok(from_content) => from_content,
+        Err(e) => {
+            return Err(format!("Failed to read from-file: {}", e));
+        }
+    };
+    let to_content = match fs::read(&to) {
+        Ok(to_content) => to_content,
+        Err(e) => {
+            return Err(format!("Failed to read from-file: {}", e));
+        }
+    };
+    // run diff
+    let result: Vec<u8> = match format {
+        Format::Normal => normal_diff::diff(&from_content, &to_content),
+        Format::Unified => unified_diff::diff(
+            &from_content,
+            &from.to_string_lossy(),
+            &to_content,
+            &to.to_string_lossy(),
+            context_count,
+        ),
+        Format::Context => context_diff::diff(
+            &from_content,
+            &from.to_string_lossy(),
+            &to_content,
+            &to.to_string_lossy(),
+            context_count,
+        ),
+    };
+    io::stdout().write_all(&result).unwrap();
+    Ok(())
+}