PublicArchive/uutils-coreutils
2
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-05-06 07:26:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

nohup: refactor find_stdout & extract function (#12146)

Browse Source 
try_open_nohup_file to eliminate duplicate code
This commit is contained in:
Daniel Hofstetter
2026-05-05 22:13:30 +02:00
committed by GitHub
parent 852af483f5
commit 2e04477a78
1 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/nohup/src/nohup.rs
+23 -36
View File
@@ -137,42 +137,29 @@ fn replace_fds() -> UResult<()> {
}
fn find_stdout() -> UResult<File> {
match OpenOptions::new()
.create(true)
.append(true)
.open(Path::new(NOHUP_OUT))
{
Ok(t) => {
show_error!(
"{}",
translate!("nohup-ignoring-input-appending-output", "path" => NOHUP_OUT.quote())
);
Ok(t)
}
Err(e1) => {
let Ok(home) = env::var("HOME") else {
return Err(NohupError::OpenFailed(*FAILURE_CODE, e1).into());
};
let mut homeout = PathBuf::from(home);
homeout.push(NOHUP_OUT);
let homeout_str = homeout.to_str().unwrap();
match OpenOptions::new().create(true).append(true).open(&homeout) {
Ok(t) => {
show_error!(
"{}",
translate!("nohup-ignoring-input-appending-output", "path" => homeout_str.quote())
);
Ok(t)
}
Err(e2) => {
Err(
NohupError::OpenFailed2(*FAILURE_CODE, e1, homeout_str.to_string(), e2)
.into(),
)
}
}
}
}
try_open_nohup_file(NOHUP_OUT).or_else(|e1| {
let Ok(home) = env::var("HOME") else {
return Err(NohupError::OpenFailed(*FAILURE_CODE, e1).into());
};
let home_out = PathBuf::from(home).join(NOHUP_OUT);
let home_out = home_out.to_str().unwrap();
try_open_nohup_file(home_out).map_err(|e2| {
NohupError::OpenFailed2(*FAILURE_CODE, e1, home_out.to_string(), e2).into()
})
})
}
fn try_open_nohup_file(path: &str) -> std::io::Result<File> {
let file = OpenOptions::new().create(true).append(true).open(path)?;
show_error!(
"{}",
translate!("nohup-ignoring-input-appending-output", "path" => path.quote())
);
Ok(file)
}
#[cfg(target_vendor = "apple")]