diff options
| author | Jim Porter <jporterbugs@gmail.com> | 2022-02-01 19:16:00 -0800 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-02-21 18:39:40 +0100 |
| commit | 9df5e3080066341d78489f0b18eabeeccac76b0c (patch) | |
| tree | ea9ac8b9c383da7c975c2a7ebb27dca45f9012f6 /lisp/eshell/esh-proc.el | |
| parent | 76429f4d1792b890c6fc69a5bd7a5cdef28d257a (diff) | |
| download | emacs-9df5e3080066341d78489f0b18eabeeccac76b0c.tar.gz | |
Send SIGPIPE to external Eshell processes if their output target closes
* lisp/eshell/esh-io.el (eshell-pipe-broken): New error.
(eshell-output-object-to-target): Signal 'eshell-pipe-broken' if the
target is an exited/signaled process.
* lisp/eshell/esh-proc.el (eshell-insertion-filter): Handle
'eshell-pipe-broken'.
* test/lisp/eshell/esh-proc-tests.el: New test.
Diffstat (limited to 'lisp/eshell/esh-proc.el')
| -rw-r--r-- | lisp/eshell/esh-proc.el | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el index bb2136c06cc..ed37de85f7a 100644 --- a/lisp/eshell/esh-proc.el +++ b/lisp/eshell/esh-proc.el @@ -386,8 +386,27 @@ output." (let ((data (nth 3 entry))) (setcar (nthcdr 3 entry) nil) (setcar (nthcdr 4 entry) t) - (eshell-output-object data nil (cadr entry)) - (setcar (nthcdr 4 entry) nil))))))))) + (unwind-protect + (condition-case nil + (eshell-output-object data nil (cadr entry)) + ;; FIXME: We want to send SIGPIPE to the process + ;; here. However, remote processes don't + ;; currently support that, and not all systems + ;; have SIGPIPE in the first place (e.g. MS + ;; Windows). In these cases, just delete the + ;; process; this is reasonably close to the + ;; right behavior, since the default action for + ;; SIGPIPE is to terminate the process. For use + ;; cases where SIGPIPE is truly needed, using an + ;; external pipe operator (`*|') may work + ;; instead (e.g. when working with remote + ;; processes). + (eshell-pipe-broken + (if (or (process-get proc 'remote-pid) + (eq system-type 'windows-nt)) + (delete-process proc) + (signal-process proc 'SIGPIPE)))) + (setcar (nthcdr 4 entry) nil)))))))))) (defun eshell-sentinel (proc string) "Generic sentinel for command processes. Reports only signals. @@ -416,8 +435,12 @@ PROC is the process that's exiting. STRING is the exit message." (lambda () (if (nth 4 entry) (run-at-time 0 nil finish-io) - (when str (eshell-output-object str nil handles)) - (eshell-close-handles status 'nil handles))))) + (unwind-protect + (when str + (eshell-output-object + str nil handles)) + (eshell-close-handles + status 'nil handles)))))) (funcall finish-io))))) (eshell-remove-process-entry entry)))) (eshell-kill-process-function proc string))))) |