wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 13:52:55 +03:00
Code Issues Projects Releases Wiki Activity

pty: avoid leaking fds from the parent process on all unices

Browse Source 
I noticed that wezterm is picking up garbage from gnome too,
so let's trigger the random fd closing function on all unix
systems.

It turns out that iterating the entries in /dev/fd works on
BSD and Linux which is nice.
This commit is contained in:
Wez Furlong 2020-12-20 11:37:03 -08:00
parent bda7633fa9
commit 44729a7e89
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pty/src/unix.rs
View File

@ -104,8 +104,13 @@ impl Read for PtyFd {
// This is approximately equivalent to the darwin `posix_spawnattr_setflags`
// option POSIX_SPAWN_CLOEXEC_DEFAULT which is used as a bit of a cheat
// on macOS.
#[cfg(target_os = "macos")]
// On Linux, gnome/mutter leak shell extension fds to wezterm too, so we
// also need to make an effort to clean up the mess.
fn close_random_fds() {
// FreeBSD, macOS and presumably other BSDish systems have /dev/fd as
// a directory listing the current fd numbers for the process.
//
// On Linux, /dev/fd is a symlink to /proc/self/fd
if let Ok(dir) = std::fs::read_dir("/dev/fd") {
let mut fds = vec![];
for entry in dir {
@ -219,7 +224,6 @@ impl PtyFd {
}
}
#[cfg(target_os = "macos")]
close_random_fds();
Ok(())