From dfb765b96cecbad14cc2ba0fbcbea07d230d265e Mon Sep 17 00:00:00 2001
From: "Andrew Phillips (aider)" <andrew.phillips2@canada.ca>
Date: Tue, 6 May 2025 12:05:58 -0300
Subject: [PATCH] fix: correct file descriptor handling in diff command

---
 src/main.rs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index cd709df..464c01d 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -532,20 +532,14 @@ 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) };
+            let mut stdout_a = BufWriter::new(stdout_a);
+            let mut stdout_b = BufWriter::new(stdout_b);
+            let mut stdout_a = BufWriter::new(stdout_a);
+            let mut stdout_b = BufWriter::new(stdout_b);
 
+            let mut child_stdin = child.stdin.unwrap();
             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() {