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

Use OwnedFd for SignalFd's pipe fds

Browse Source
This commit is contained in:
Marcin Kulik
2024-01-09 11:56:12 +01:00
parent 899dd8232c
commit 268fdb0a32
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/pty.rs
View File

@@ -10,8 +10,8 @@ use signal_hook::SigId;
use std::collections::HashMap; use std::collections::HashMap;
use std::ffi::{CString, NulError}; use std::ffi::{CString, NulError};
use std::io::{self, ErrorKind, Read, Write}; use std::io::{self, ErrorKind, Read, Write};
use std::os::fd::BorrowedFd;
use std::os::fd::{AsFd, RawFd}; use std::os::fd::{AsFd, RawFd};
use std::os::fd::{BorrowedFd, OwnedFd};
use std::os::unix::io::{AsRawFd, FromRawFd}; use std::os::unix::io::{AsRawFd, FromRawFd};
use std::{env, fs}; use std::{env, fs};
@@ -311,7 +311,7 @@ fn write_non_blocking<W: Write>(sink: &mut W, buf: &[u8]) -> io::Result<Option<u
struct SignalFd { struct SignalFd {
sigid: SigId, sigid: SigId,
rx: i32, rx: OwnedFd,
} }
impl SignalFd { impl SignalFd {
@@ -319,10 +319,12 @@ impl SignalFd {
let (rx, tx) = pipe()?; let (rx, tx) = pipe()?;
set_non_blocking(&rx)?; set_non_blocking(&rx)?;
set_non_blocking(&tx)?; set_non_blocking(&tx)?;
let rx = unsafe { OwnedFd::from_raw_fd(rx) };
let tx = unsafe { OwnedFd::from_raw_fd(tx) };
let sigid = unsafe { let sigid = unsafe {
signal_hook::low_level::register(signal, move || { signal_hook::low_level::register(signal, move || {
let _ = unistd::write(tx, &[0]); let _ = unistd::write(tx.as_raw_fd(), &[0]);
}) })
}?; }?;
@@ -332,7 +334,7 @@ impl SignalFd {
fn flush(&self) { fn flush(&self) {
let mut buf = [0; 256]; let mut buf = [0; 256];
while let Ok(n) = unistd::read(self.rx, &mut buf) { while let Ok(n) = unistd::read(self.rx.as_raw_fd(), &mut buf) {
if n == 0 { if n == 0 {
break; break;
}; };
@@ -342,13 +344,12 @@ impl SignalFd {
impl AsFd for SignalFd { impl AsFd for SignalFd {
fn as_fd(&self) -> BorrowedFd<'_> { fn as_fd(&self) -> BorrowedFd<'_> {
unsafe { BorrowedFd::borrow_raw(self.rx) } self.rx.as_fd()
} }
} }
impl Drop for SignalFd { impl Drop for SignalFd {
fn drop(&mut self) { fn drop(&mut self) {
let _ = unistd::close(self.rx);
signal_hook::low_level::unregister(self.sigid); signal_hook::low_level::unregister(self.sigid);
} }
} }