Add ed-formatted diff

Author: notriddle

.gitignore

@@ -1,5 +1,6 @@
 /target
 /lib/normal-diff/target
+/lib/ed-diff/target
 /lib/context-diff/target
 /lib/unified-diff/target
 Cargo.lock

Cargo.toml

@@ -3,20 +3,6 @@ members = [
     "lib/unified-diff",
     "lib/context-diff",
     "lib/normal-diff",
-    "bin/diff",
+    "lib/ed-diff",
+    "bin/diffutils",
 ]
-
-[package]
-name = "diffutils"
-version = "0.3.0"
-authors = ["Michael Howell <[email protected]>"]
-edition = "2018"
-
-[dependencies]
-context-diff = { path = "lib/context-diff", version = "0.3.0" }
-normal-diff = { path = "lib/normal-diff", version = "0.3.0" }
-unified-diff = { path = "lib/unified-diff", version = "0.3.0" }
-
-[[bin]]
-name = "diffutils"
-path = "bin/main.rs"

bin/diffutils/Cargo.toml

@@ -0,0 +1,17 @@
+[package]
+name = "diffutils"
+version = "0.3.0"
+edition = "2018"
+description = "A CLI app for generating diff files"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/notriddle/diffutils"
+
+[[bin]]
+name = "diffutils"
+path = "main.rs"
+
+[dependencies]
+unified-diff = { path = "../../lib/unified-diff/" }
+context-diff = { path = "../../lib/context-diff/" }
+normal-diff = { path = "../../lib/normal-diff/" }
+ed-diff = { path = "../../lib/ed-diff/" }

bin/diff/main.rs bin/diffutils/main.rsbin/diff/main.rs renamed to bin/diffutils/main.rs

@@ -44,6 +44,10 @@ fn main() -> Result<(), String> {
             &to.to_string_lossy(),
             context_count,
         ),
+        Format::Ed => ed_diff::diff(
+            &from_content,
+            &to_content,
+        )?,
     };
     io::stdout().write_all(&result).unwrap();
     Ok(())

bin/diff/params.rs bin/diffutils/params.rsbin/diff/params.rs renamed to bin/diffutils/params.rs

@@ -5,6 +5,7 @@ pub enum Format {
     Normal,
     Unified,
     Context,
+    Ed,
 }
 
 #[cfg(unix)]
@@ -73,6 +74,12 @@ pub fn parse_params<I: IntoIterator<Item = OsString>>(opts: I) -> Result<Params,
                         }
                         format = Some(Format::Context);
                     }
+                    b'e' => {
+                        if format.is_some() && format != Some(Format::Ed) {
+                            return Err(format!("Conflicting output style options"));
+                        }
+                        format = Some(Format::Ed);
+                    }
                     b'u' => {
                         if format.is_some() && format != Some(Format::Unified) {
                             return Err(format!("Conflicting output style options"));
@@ -151,6 +158,18 @@ mod tests {
         );
     }
     #[test]
+    fn basics_ed() {
+        assert_eq!(
+            Ok(Params {
+                from: os("foo"),
+                to: os("bar"),
+                format: Format::Ed,
+                context_count: 3,
+            }),
+            parse_params([os("diff"), os("-e"), os("foo"), os("bar")].iter().cloned())
+        );
+    }
+    #[test]
     fn context_count() {
         assert_eq!(
             Ok(Params {

lib/context-diff/Cargo.toml

@@ -1,10 +1,6 @@
 [package]
 name = "context-diff"
 version = "0.3.0"
-authors = [
-    "Michael Howell <[email protected]>",
-    "The Rust Project Developers"
-]
 edition = "2018"
 description = "An implementation of the GNU unified diff format"
 license = "MIT OR Apache-2.0"

lib/ed-diff/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "ed-diff"
+version = "0.3.0"
+edition = "2018"
+description = "An implementation of the GNU unified diff format"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/notriddle/diffutils"
+exclude = [ "fuzz" ]
+
+[dependencies]
+diff = "0.1.10"

lib/ed-diff/fuzz/.gitignore

@@ -0,0 +1,4 @@
+
+target
+corpus
+artifacts

lib/ed-diff/fuzz/Cargo.toml

@@ -0,0 +1,26 @@
+
+[package]
+name = "ed-diff-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2018"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.3"
+
+[dependencies.ed-diff]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[[bin]]
+name = "fuzz_ed"
+path = "fuzz_targets/fuzz_ed.rs"
+test = false
+doc = false
+

lib/ed-diff/fuzz/fuzz_targets/fuzz_ed.rs

@@ -0,0 +1,55 @@
+#![no_main]
+#[macro_use] extern crate libfuzzer_sys;
+extern crate ed_diff;
+
+use std::fs::{self, File};
+use std::io::Write;
+use std::process::Command;
+
+fuzz_target!(|x: (Vec<u8>, Vec<u8>)| {
+    let (mut from, mut to) = x;
+    from.push(b'\n');
+    to.push(b'\n');
+    if let Ok(s) = String::from_utf8(from.clone()) {
+        if !s.is_ascii() { return }
+        if s.find(|x| x < ' ' && x != '\n').is_some() { return }
+    } else {
+        return
+    }
+    if let Ok(s) = String::from_utf8(to.clone()) {
+        if !s.is_ascii() { return }
+        if s.find(|x| x < ' ' && x != '\n').is_some() { return }
+    } else {
+        return
+    }
+    let diff = ed_diff::diff_w(&from, &to, "target/fuzz.file").unwrap();
+    File::create("target/fuzz.file.original")
+        .unwrap()
+        .write_all(&from)
+        .unwrap();
+    File::create("target/fuzz.file.expected")
+        .unwrap()
+        .write_all(&to)
+        .unwrap();
+    File::create("target/fuzz.file")
+        .unwrap()
+        .write_all(&from)
+        .unwrap();
+    File::create("target/fuzz.ed")
+        .unwrap()
+        .write_all(&diff)
+        .unwrap();
+    let output = Command::new("ed")
+        .arg("target/fuzz.file")
+        .stdin(File::open("target/fuzz.ed").unwrap())
+        .output()
+        .unwrap();
+    if !output.status.success() {
+        panic!("STDOUT:\n{}\nSTDERR:\n{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
+    }
+    let result = fs::read("target/fuzz.file").unwrap();
+    if result != to {
+        panic!("STDOUT:\n{}\nSTDERR:\n{}", String::from_utf8_lossy(&output.stdout), String::from_utf8_lossy(&output.stderr));
+    }
+});
+