procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure eshell pipelines don't drop data

Browse source 
* lisp/eshell/esh-proc.el (eshell-sentinel): If called while still
handling output of the process, make sure to close the pipes only later,
so that the next process in the pipeline recieves EOF only after getting
all its input (Bug#25549).
This commit is contained in:
Noam Postavsky 2017-02-02 09:19:43 -05:00
parent 41de25c113
commit 2bfe83fcd3
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/eshell/esh-proc.el
View file

@ -393,8 +393,20 @@ PROC is the process that's exiting. STRING is the exit message."
(unless (string= string "run")
(unless (string-match "^\\(finished\\|exited\\)" string)
(eshell-insertion-filter proc string))
(eshell-close-handles (process-exit-status proc) 'nil
(cadr entry))))
(let ((handles (nth 1 entry))
(str (prog1 (nth 3 entry)
(setf (nth 3 entry) nil)))
(status (process-exit-status proc)))
;; If we're in the middle of handling output
;; from this process then schedule the EOF for
;; later.
(letrec ((finish-io
(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)))))
(funcall finish-io)))))
(eshell-remove-process-entry entry))))
(eshell-kill-process-function proc string)))))