diff options
| author | Rachel K <raech.kanati@gmail.com> | 2019-03-12 19:44:47 +0000 |
|---|---|---|
| committer | Christian Duerr <chrisduerr@users.noreply.github.com> | 2019-03-12 19:44:47 +0000 |
| commit | 62c1d999e1361fc68ee4e54865b205415fa0a38d (patch) | |
| tree | a75dfa202da57d1e7ac9a95b77ee82ef94a49fd6 /src/event.rs | |
| parent | e240da9ab3b819a8845ced1ab72d0a4239eac789 (diff) | |
| download | r-alacritty-62c1d999e1361fc68ee4e54865b205415fa0a38d.tar.gz r-alacritty-62c1d999e1361fc68ee4e54865b205415fa0a38d.tar.bz2 r-alacritty-62c1d999e1361fc68ee4e54865b205415fa0a38d.zip | |
Fix signal handling on Unix systems
This removes the the signal handling machinery in tty::unix, and
replaces it with functionality from signal-hook, which should be more
robust. Signals caught by signal-hook wake up the existing I/O event
loop, which then delegates back to the PTY to handle them.
In particular, this allows `SIGCHLD` (i.e. child process exits) to shut
down the terminal promptly, instead of sometimes leaving the window
lingering.
Fixes #915.
Fixes #1276.
Fixes #1313.
As a side effect, this fixes a very rare bug on Linux, where a `read`
from the PTY on the master side would sometimes "fail" with `EIO` if the
child closed the client side at a particular moment. This was subject to
a race condition, and was very difficult to trigger in practice.
Diffstat (limited to 'src/event.rs')
| -rw-r--r-- | src/event.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/event.rs b/src/event.rs index cc26bf22..f8044609 100644 --- a/src/event.rs +++ b/src/event.rs @@ -176,7 +176,8 @@ impl<'a, N: Notify + 'a> input::ActionContext for ActionContext<'a, N> { let proc_prefix = ""; #[cfg(target_os = "freebsd")] let proc_prefix = "/compat/linux"; - if let Ok(path) = fs::read_link(format!("{}/proc/{}/cwd", proc_prefix, unsafe { tty::PID })) { + let link_path = format!("{}/proc/{}/cwd", proc_prefix, tty::child_pid()); + if let Ok(path) = fs::read_link(link_path) { vec!["--working-directory".into(), path] } else { Vec::new() |