Skip to content

Commit

Permalink
Only use tempfile name as windows named pipe name (#306)
Browse files Browse the repository at this point in the history
  • Loading branch information
bytedream committed Jan 10, 2024
1 parent ef2898f commit 3d2a03c
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions crunchy-cli-core/src/utils/os.rs
Expand Up @@ -86,25 +86,27 @@ impl Drop for TempNamedPipe {

pub fn temp_named_pipe() -> io::Result<TempNamedPipe> {
let (_, path) = tempfile("")?.keep()?;
let path = path.to_string_lossy().to_string();
let _ = std::fs::remove_file(path.clone());
let _ = fs::remove_file(path.clone());

#[cfg(not(target_os = "windows"))]
{
nix::unistd::mkfifo(path.as_str(), nix::sys::stat::Mode::S_IRWXU)?;
let filename = path.to_string_lossy().to_string();

nix::unistd::mkfifo(filename.as_str(), nix::sys::stat::Mode::S_IRWXU)?;

Ok(TempNamedPipe {
reader: tokio::net::unix::pipe::OpenOptions::new().open_receiver(&path)?,
name: path,
name: filename,
})
}
#[cfg(target_os = "windows")]
{
let path = format!(r"\\.\pipe\{}", &path);
let pipe_name = path.file_name().unwrap().to_string_lossy().to_string();
let pipe_path = format!(r"\\.\pipe\{}", pipe_name);

Ok(TempNamedPipe {
reader: tokio::net::windows::named_pipe::ServerOptions::new().create(&path)?,
name: path,
reader: tokio::net::windows::named_pipe::ServerOptions::new().create(pipe_path)?,
name: pipe_name,
})
}
}
Expand Down

0 comments on commit 3d2a03c

Please sign in to comment.