vikingowl/polyscribe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[test] add Unix-only tests for with_suppressed_stderr ensuring stderr redirection and restoration, including panic handling"

Browse Source 
This reverts commit 7832545033.
This commit is contained in:
vikingowl
2025-08-12 06:00:10 +02:00
parent 4063b4cb06
commit 3f1e634e2d
2 changed files with 10 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/lib.rs
View File

@@ -93,7 +93,7 @@ impl StderrSilencer {
#[cfg(unix)]
unsafe {
// Duplicate current stderr (fd 2)
let old_fd = unix_fd::dup(unix_fd::STDERR_FILENO);
let old_fd = dup(2);
if old_fd < 0 {
return Self {
active: false,
@@ -103,10 +103,10 @@ impl StderrSilencer {
}
// Open /dev/null for writing
let devnull_cstr = std::ffi::CString::new("/dev/null").unwrap();
let dn = unix_fd::open(devnull_cstr.as_ptr(), unix_fd::O_WRONLY);
let dn = open(devnull_cstr.as_ptr(), O_WRONLY);
if dn < 0 {
// failed to open devnull; restore and bail
unix_fd::close(old_fd);
close(old_fd);
return Self {
active: false,
old_stderr_fd: -1,
@@ -114,9 +114,9 @@ impl StderrSilencer {
};
}
// Redirect fd 2 to devnull
if unix_fd::dup2(dn, unix_fd::STDERR_FILENO) < 0 {
unix_fd::close(dn);
unix_fd::close(old_fd);
if dup2(dn, 2) < 0 {
close(dn);
close(old_fd);
return Self {
active: false,
old_stderr_fd: -1,
@@ -144,9 +144,9 @@ impl Drop for StderrSilencer {
#[cfg(unix)]
unsafe {
// Restore old stderr and close devnull and old copies
let _ = unix_fd::dup2(self.old_stderr_fd, unix_fd::STDERR_FILENO);
let _ = unix_fd::close(self.devnull_fd);
let _ = unix_fd::close(self.old_stderr_fd);
let _ = dup2(self.old_stderr_fd, 2);
let _ = close(self.devnull_fd);
let _ = close(self.old_stderr_fd);
}
self.active = false;
}
@@ -242,18 +242,7 @@ use std::path::{Path, PathBuf};
use std::process::Command;
#[cfg(unix)]
mod unix_fd {
pub use libc::O_WRONLY;
pub const STDERR_FILENO: i32 = 2; // libc::STDERR_FILENO isn't always available on all targets
#[inline]
pub unsafe fn dup(fd: i32) -> i32 { libc::dup(fd) }
#[inline]
pub unsafe fn dup2(fd: i32, fd2: i32) -> i32 { libc::dup2(fd, fd2) }
#[inline]
pub unsafe fn open(path: *const libc::c_char, flags: i32) -> i32 { libc::open(path, flags) }
#[inline]
pub unsafe fn close(fd: i32) -> i32 { libc::close(fd) }
}
use libc::{O_WRONLY, close, dup, dup2, open};
/// Re-export backend module (GPU/CPU selection and transcription).
pub mod backend;