asp/keep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: resolve compilation errors in API paths and file descriptor handling

Browse Source 
Co-authored-by: aider (openai/andrew/openrouter/qwen/qwen3-coder) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-13 11:20:05 -03:00
parent baf92a8902
commit e66af572d3
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/modes/diff.rs
View File

@@ -76,26 +76,30 @@ fn setup_diff_paths_and_compression(
fn setup_diff_pipes() -> Result<((libc::c_int, libc::c_int), (libc::c_int, libc::c_int)), anyhow::Error> {
use nix::unistd::pipe;
use nix::fcntl::{fcntl, FcntlArg, FdFlag};
use nix::fcntl::OFlag;
use nix::Error as NixError;
// Create pipes for diff's input
let (fd_a_read, fd_a_write) =
pipe().map_err(|e: NixError| anyhow::anyhow!("Failed to create pipe A: {}", e))?;
let (fd_b_read, fd_b_write) =
pipe().map_err(|e: NixError| anyhow::anyhow!("Failed to create pipe B: {}", e))?;
// Create pipes for diff's input with CLOEXEC flag
let (fd_a_read, fd_a_write) = pipe2(OFlag::O_CLOEXEC)
.map_err(|e: NixError| anyhow::anyhow!("Failed to create pipe A: {}", e))?;
let (fd_b_read, fd_b_write) = pipe2(OFlag::O_CLOEXEC)
.map_err(|e: NixError| anyhow::anyhow!("Failed to create pipe B: {}", e))?;
// Set FD_CLOEXEC on all file descriptors
fcntl(fd_a_read, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))
.map_err(|e| anyhow::anyhow!("Failed to set FD_CLOEXEC on fd_a_read: {}", e))?;
fcntl(fd_a_write, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))
.map_err(|e| anyhow::anyhow!("Failed to set FD_CLOEXEC on fd_a_write: {}", e))?;
fcntl(fd_b_read, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))
.map_err(|e| anyhow::anyhow!("Failed to set FD_CLOEXEC on fd_b_read: {}", e))?;
fcntl(fd_b_write, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))
.map_err(|e| anyhow::anyhow!("Failed to set FD_CLOEXEC on fd_b_write: {}", e))?;
Ok(((fd_a_read, fd_a_write), (fd_b_read, fd_b_write)))
}
Ok(((fd_a_read.into(), fd_a_write.into()), (fd_b_read.into(), fd_b_write.into())))
// Helper function to create pipes with CLOEXEC flag
fn pipe2(flags: OFlag) -> nix::Result<(i32, i32)> {
use nix::unistd::pipe;
use nix::fcntl::{fcntl, FcntlArg, FdFlag};
let (read_fd, write_fd) = pipe()?;
// Set the flags
fcntl(read_fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
fcntl(write_fd, FcntlArg::F_SETFD(FdFlag::FD_CLOEXEC))?;
Ok((read_fd, write_fd))
}
fn setup_fd_guards(fd_a_read: libc::c_int, fd_b_read: libc::c_int) -> (FdGuard, FdGuard) {