technofab/pay-respects
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/pay-respects.git synced 2025-12-12 22:40:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix?: remove fd clone

Browse source
This commit is contained in:
iff 2024-11-27 18:29:09 +01:00
parent 5f86ff02a2
commit 3321cfa240
1 changed files with 2 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/suggestions.rs
View file

@ -313,14 +313,12 @@ pub fn confirm_suggestion(shell: &str, command: &str, highlighted: &str) -> Resu
} }
} }
#[cfg(not(target_os = "windows"))]
fn run_suggestion_p(shell: &str, p: &str, command: &str) -> std::process::ExitStatus { fn run_suggestion_p(shell: &str, p: &str, command: &str) -> std::process::ExitStatus {
use std::os::fd::AsFd;
std::process::Command::new(p) std::process::Command::new(p)
.arg(shell) .arg(shell)
.arg("-c") .arg("-c")
.arg(command) .arg(command)
.stdout(stderr().as_fd().try_clone_to_owned().unwrap()) .stdout(stderr())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
.spawn() .spawn()
.expect("failed to execute process") .expect("failed to execute process")
@ -328,14 +326,12 @@ fn run_suggestion_p(shell: &str, p: &str, command: &str) -> std::process::ExitSt
.unwrap() .unwrap()
} }
#[cfg(not(target_os = "windows"))]
fn run_suggestion(shell: &str, command: &str) -> std::process::ExitStatus { fn run_suggestion(shell: &str, command: &str) -> std::process::ExitStatus {
use std::os::fd::AsFd;
std::process::Command::new(shell) std::process::Command::new(shell)
.arg("-c") .arg("-c")
.arg(command) .arg(command)
// .stdout(Stdio::inherit()) // .stdout(Stdio::inherit())
.stdout(stderr().as_fd().try_clone_to_owned().unwrap()) .stdout(stderr())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
.spawn() .spawn()
.expect("failed to execute process") .expect("failed to execute process")
@ -343,31 +339,3 @@ fn run_suggestion(shell: &str, command: &str) -> std::process::ExitStatus {
.unwrap() .unwrap()
} }
#[cfg(target_os = "windows")]
fn run_suggestion_p(shell: &str, p: &str, command: &str) -> std::process::ExitStatus {
use std::os::windows::io::AsHandle;
std::process::Command::new(p)
.arg(shell)
.arg("-c")
.arg(command)
.stdout(stderr().as_handle().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}
#[cfg(target_os = "windows")]
fn run_suggestion(shell: &str, command: &str) -> std::process::ExitStatus {
use std::os::windows::io::AsHandle;
std::process::Command::new(shell)
.arg("-c")
.arg(command)
.stdout(stderr().as_handle().try_clone_to_owned().unwrap())
.stderr(Stdio::inherit())
.spawn()
.expect("failed to execute process")
.wait()
.unwrap()
}