mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 12:21:25 -08:00
Code Issues Projects Releases Wiki Activity

Fix a race condition when evaluating Eshell commands

Browse source 
* lisp/eshell/esh-cmd.el (eshell-do-eval): Don't defer when all the
processes are done.

* test/lisp/eshell/esh-cmd-tests.el
(esh-cmd-test/pipeline-wait/nested-pipes): New test.
This commit is contained in:
Jim Porter 2024-05-25 13:46:24 -07:00
parent 91509d5d2a
commit 57dc1ed665
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/eshell/esh-cmd.el
View file

@ -1287,13 +1287,15 @@ have been replaced by constants."
(setcdr form (cdr new-form)))
(eshell-do-eval form synchronous-p))
(if-let (((memq (car form) eshell-deferrable-commands))
(procs (eshell-make-process-list result)))
(procs (eshell-make-process-list result))
(active (seq-some #'eshell-process-active-p procs)))
(if synchronous-p
(apply #'eshell/wait procs)
(eshell-manipulate form "inserting ignore form"
(setcar form 'ignore)
(setcdr form nil))
(throw 'eshell-defer procs))
(when active
(throw 'eshell-defer procs)))
(list 'quote result))))))))))))
;; command invocation

12
test/lisp/eshell/esh-cmd-tests.el
View file

@ -213,6 +213,18 @@ This should also wait for the subcommand."
(eshell-match-command-output "echo ${*echo hi | *cat} | *cat"
"hi")))
(ert-deftest esh-cmd-test/pipeline-wait/nested-pipes ()
"Check that piping a subcommand with its own pipe works.
This should also wait for the subcommand."
(skip-unless (and (executable-find "echo")
(executable-find "cat")
(executable-find "sh")
(executable-find "sleep")))
(with-temp-eshell
(eshell-match-command-output
"{ sh -c 'sleep 1; echo goodbye 1>&2' | *echo hello } | *cat"
"hello\ngoodbye\n")))
(ert-deftest esh-cmd-test/reset-in-pipeline/subcommand ()
"Check that subcommands reset `eshell-in-pipeline-p'."
(skip-unless (executable-find "cat"))