NyxErinys/crunchy-cli
1
0
Fork 0
mirror of https://github.com/crunchy-labs/crunchy-cli.git synced 2026-01-21 04:02:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only use tempfile name as windows named pipe name (#305)

Browse source
This commit is contained in:
bytedream 2024-01-10 13:13:55 +01:00
parent ef2898f0e1
commit 7c42f29596
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crunchy-cli-core/src/utils/os.rs
View file

@ -86,25 +86,27 @@ impl Drop for TempNamedPipe {
pub fn temp_named_pipe() -> io::Result<TempNamedPipe> { pub fn temp_named_pipe() -> io::Result<TempNamedPipe> {
let (_, path) = tempfile("")?.keep()?; let (_, path) = tempfile("")?.keep()?;
let path = path.to_string_lossy().to_string(); let _ = fs::remove_file(path.clone());
let _ = std::fs::remove_file(path.clone());
#[cfg(not(target_os = "windows"))] #[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 { Ok(TempNamedPipe {
reader: tokio::net::unix::pipe::OpenOptions::new().open_receiver(&path)?, reader: tokio::net::unix::pipe::OpenOptions::new().open_receiver(&path)?,
name: path, name: filename,
}) })
} }
#[cfg(target_os = "windows")] #[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 { Ok(TempNamedPipe {
reader: tokio::net::windows::named_pipe::ServerOptions::new().create(&path)?, reader: tokio::net::windows::named_pipe::ServerOptions::new().create(pipe_path)?,
name: path, name: pipe_name,
}) })
} }
} }