pogmommy/eww
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup detach by using nix over libc

Browse source
This commit is contained in:
elkowar 2020-10-22 19:06:08 +02:00
parent d3b6d82ee8
commit 11eafe5d5f
2 changed files with 15 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -41,6 +41,7 @@ lazy_static = "1.4.0"
libc = "0.2" libc = "0.2"
ref-cast = "1.0" ref-cast = "1.0"
popol = "0.3" popol = "0.3"
nix = "0.19"
[dev-dependencies] [dev-dependencies]
pretty_assertions = "0.6.1" pretty_assertions = "0.6.1"

34
src/main.rs
View file

@ -153,7 +153,7 @@ fn try_main() -> Result<()> {
let _ = std::fs::remove_file(&*IPC_SOCKET_PATH); let _ = std::fs::remove_file(&*IPC_SOCKET_PATH);
if opts.should_detach { if opts.should_detach {
do_detach(); do_detach()?;
} }
initialize_server(opts)?; initialize_server(opts)?;
@ -282,14 +282,13 @@ fn run_filewatch_thread<P: AsRef<Path>>(
/// detach the process from the terminal, also redirecting stdout and stderr to /// detach the process from the terminal, also redirecting stdout and stderr to
/// LOG_FILE /// LOG_FILE
fn do_detach() { fn do_detach() -> Result<()> {
// detach from terminal // detach from terminal
let pid = unsafe { libc::fork() }; match unsafe { nix::unistd::fork()? } {
if pid < 0 { nix::unistd::ForkResult::Parent { .. } => {
panic!("Phailed to Phork: {}", std::io::Error::last_os_error()); std::process::exit(0);
} }
if pid != 0 { nix::unistd::ForkResult::Child => {}
std::process::exit(0);
} }
let file = std::fs::OpenOptions::new() let file = std::fs::OpenOptions::new()
@ -302,19 +301,14 @@ fn do_detach() {
)); ));
let fd = file.as_raw_fd(); let fd = file.as_raw_fd();
unsafe { if nix::unistd::isatty(1)? {
if libc::isatty(1) != 0 { nix::unistd::dup2(std::io::stdout().as_raw_fd(), fd)?;
if libc::dup2(fd, libc::STDOUT_FILENO) < 0 {
panic!("Phailed to dup stdout to log file: {:?}", std::io::Error::last_os_error());
}
}
if libc::isatty(2) != 0 {
if libc::dup2(fd, libc::STDERR_FILENO) < 0 {
panic!("Phailed to dup stderr to log file: {:?}", std::io::Error::last_os_error());
}
}
libc::close(fd);
} }
if nix::unistd::isatty(2)? {
nix::unistd::dup2(std::io::stderr().as_raw_fd(), fd)?;
}
nix::unistd::close(fd)?;
Ok(())
} }
#[extend::ext(pub)] #[extend::ext(pub)]