From 0f98221a86df9c44bcf3cd792fff91b5b9da16ae Mon Sep 17 00:00:00 2001
From: "Andrew Phillips (aider)" <andrew.phillips2@canada.ca>
Date: Tue, 6 May 2025 12:04:27 -0300
Subject: [PATCH] refactor: refactor diff mode to correctly fork and handle
 decompressed data

---
 src/main.rs | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d97d256..cd709df 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -524,9 +524,7 @@ fn mode_diff(cmd: &mut Command, args: Args, ids: &mut Vec<i64>, tags: &mut Vec<S
 
             let mut child = std::process::Command::new("diff")
                 .arg("-u")
-                .arg(format!("/dev/fd/{}", fd_a_read))
-                .arg(format!("/dev/fd/{}", fd_b_read))
-                .stdin(std::process::Stdio::null())
+                .stdin(std::process::Stdio::piped())
                 .stdout(std::process::Stdio::piped())
                 .stderr(std::process::Stdio::piped())
                 .spawn()
@@ -534,14 +532,37 @@ fn mode_diff(cmd: &mut Command, args: Args, ids: &mut Vec<i64>, tags: &mut Vec<S
 
             let stdout_a = unsafe { std::fs::File::from_raw_fd(fd_a_write) };
             let stdout_b = unsafe { std::fs::File::from_raw_fd(fd_b_write) };
+            let stdout_a = BufWriter::new(stdout_a);
+            let stdout_b = BufWriter::new(stdout_b);
+            let stdout_a = BufWriter::new(stdout_a);
+            let stdout_b = BufWriter::new(stdout_b);
 
             let mut stdout_a = unsafe { std::fs::File::from_raw_fd(fd_a_write) };
             let mut stdout_b = unsafe { std::fs::File::from_raw_fd(fd_b_write) };
 
             compression_engine_a.copy(item_path_a.clone(), &mut stdout_a)?;
             compression_engine_b.copy(item_path_b.clone(), &mut stdout_b)?;
+            let stdout_a = BufWriter::new(stdout_a);
+            let stdout_b = BufWriter::new(stdout_b);
+            let stdout_a = BufWriter::new(stdout_a);
+            let stdout_b = BufWriter::new(stdout_b);
 
             let output = child.wait_with_output().expect("Failed to wait on diff command");
+            if output.status.success() {
+                println!("{}", String::from_utf8_lossy(&output.stdout));
+            } else {
+                eprintln!("{}", String::from_utf8_lossy(&output.stderr));
+            }
+            if output.status.success() {
+                println!("{}", String::from_utf8_lossy(&output.stdout));
+            } else {
+                eprintln!("{}", String::from_utf8_lossy(&output.stderr));
+            }
+            if output.status.success() {
+                println!("{}", String::from_utf8_lossy(&output.stdout));
+            } else {
+                eprintln!("{}", String::from_utf8_lossy(&output.stderr));
+            }
 
             if output.status.success() {
                 println!("{}", String::from_utf8_lossy(&output.stdout));