Mirrors/asciinema
1
0
Fork 0
mirror of https://github.com/asciinema/asciinema.git synced 2025-12-16 11:48:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #653 from kxxt/kill-child-safely

Browse Source 
Use safe kill from nix crate
This commit is contained in:
Marcin Kulik
2024-10-17 11:43:47 +02:00
committed by GitHub
parent 42478e5449 716d6a0ae1
commit 101a48da61
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pty.rs
View File

@@ -4,7 +4,7 @@ use anyhow::{bail, Result};
use nix::errno::Errno; use nix::errno::Errno;
use nix::libc::EIO; use nix::libc::EIO;
use nix::sys::select::{select, FdSet}; use nix::sys::select::{select, FdSet};
use nix::sys::signal; use nix::sys::signal::{self, kill, Signal};
use nix::sys::wait::{self, WaitPidFlag, WaitStatus}; use nix::sys::wait::{self, WaitPidFlag, WaitStatus};
use nix::unistd::{self, ForkResult}; use nix::unistd::{self, ForkResult};
use nix::{libc, pty}; use nix::{libc, pty};
@@ -265,7 +265,8 @@ fn copy<T: Tty + ?Sized, H: Handler>(
} }
if kill_the_child { if kill_the_child {
unsafe { libc::kill(child.as_raw(), SIGTERM) }; // Any errors occurred when killing the child are ignored.
let _ = kill(child, Signal::SIGTERM);
return Ok(None); return Ok(None);
} }
} }