2013-09-12 16:15:53 -04:00
|
|
|
;;; esh-proc.el --- process management -*- lexical-binding:t -*-
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
;; Copyright (C) 1999-2019 Free Software Foundation, Inc.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 03:36:21 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-06-23 05:24:10 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 03:36:21 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2007-12-05 07:08:55 +00:00
|
|
|
;;; Commentary:
|
|
|
|
|
2009-01-22 06:33:06 +00:00
|
|
|
;;; Code:
|
|
|
|
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-io)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defgroup eshell-proc nil
|
|
|
|
"When Eshell invokes external commands, it always does so
|
|
|
|
asynchronously, so that Emacs isn't tied up waiting for the process to
|
|
|
|
finish."
|
|
|
|
:tag "Process management"
|
|
|
|
:group 'eshell)
|
|
|
|
|
|
|
|
;;; User Variables:
|
|
|
|
|
2011-03-04 20:11:05 -08:00
|
|
|
(defcustom eshell-proc-load-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"A hook that gets run when `eshell-proc' is loaded."
|
2011-03-04 20:11:05 -08:00
|
|
|
:version "24.1" ; removed eshell-proc-initialize
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-process-wait-seconds 0
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"The number of seconds to delay waiting for a synchronous process."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-process-wait-milliseconds 50
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"The number of milliseconds to delay waiting for a synchronous process."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-done-messages-in-minibuffer t
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If non-nil, subjob \"Done\" messages will display in minibuffer."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-delete-exited-processes t
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If nil, process entries will stick around until `jobs' is run.
|
2000-06-23 05:24:10 +00:00
|
|
|
This variable sets the buffer-local value of `delete-exited-processes'
|
|
|
|
in Eshell buffers.
|
|
|
|
|
|
|
|
This variable causes Eshell to mimic the behavior of bash when set to
|
|
|
|
nil. It allows the user to view the exit status of a completed subjob
|
|
|
|
\(process) at their leisure, because the process entry remains in
|
|
|
|
memory until the user examines it using \\[list-processes].
|
|
|
|
|
|
|
|
Otherwise, if `eshell-done-messages-in-minibuffer' is nil, and this
|
|
|
|
variable is set to t, the only indication the user will have that a
|
|
|
|
subjob is done is that it will no longer appear in the
|
|
|
|
\\[list-processes\\] display.
|
|
|
|
|
|
|
|
Note that Eshell will have to be restarted for a change in this
|
|
|
|
variable's value to take effect."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-reset-signals
|
|
|
|
"^\\(interrupt\\|killed\\|quit\\|stopped\\)"
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If a termination signal matches this regexp, the terminal will be reset."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'regexp
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-exec-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"Called each time a process is exec'd by `eshell-gather-process-output'.
|
2000-06-23 05:24:10 +00:00
|
|
|
It is passed one argument, which is the process that was just started.
|
|
|
|
It is useful for things that must be done each time a process is
|
2018-03-08 20:18:18 -05:00
|
|
|
executed in an eshell mode buffer (e.g., `set-process-query-on-exit-flag').
|
|
|
|
In contrast, `eshell-mode-hook' is only executed once, when the buffer
|
2000-06-23 05:24:10 +00:00
|
|
|
is created."
|
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
2011-03-04 20:11:05 -08:00
|
|
|
(defcustom eshell-kill-hook nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"Called when a process run by `eshell-gather-process-output' has ended.
|
2000-06-23 05:24:10 +00:00
|
|
|
It is passed two arguments: the process that was just ended, and the
|
|
|
|
termination status (as a string). Note that the first argument may be
|
|
|
|
nil, in which case the user attempted to send a signal, but there was
|
|
|
|
no relevant process. This can be used for displaying help
|
|
|
|
information, for example."
|
2011-03-04 20:11:05 -08:00
|
|
|
:version "24.1" ; removed eshell-reset-after-proc
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'hook
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
;;; Internal Variables:
|
|
|
|
|
|
|
|
(defvar eshell-current-subjob-p nil)
|
|
|
|
|
|
|
|
(defvar eshell-process-list nil
|
|
|
|
"A list of the current status of subprocesses.")
|
|
|
|
|
|
|
|
;;; Functions:
|
|
|
|
|
2011-03-04 20:11:05 -08:00
|
|
|
(defun eshell-kill-process-function (proc status)
|
|
|
|
"Function run when killing a process.
|
|
|
|
Runs `eshell-reset-after-proc' and `eshell-kill-hook', passing arguments
|
2013-09-18 20:44:55 -07:00
|
|
|
PROC and STATUS to functions on the latter."
|
|
|
|
;; Was there till 24.1, but it is not optional.
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(if (memq #'eshell-reset-after-proc eshell-kill-hook)
|
|
|
|
(setq eshell-kill-hook (delq #'eshell-reset-after-proc eshell-kill-hook)))
|
2013-09-18 20:44:55 -07:00
|
|
|
(eshell-reset-after-proc status)
|
2011-03-05 11:36:33 -08:00
|
|
|
(run-hook-with-args 'eshell-kill-hook proc status))
|
2011-03-04 20:11:05 -08:00
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defun eshell-proc-initialize ()
|
|
|
|
"Initialize the process handling code."
|
|
|
|
(make-local-variable 'eshell-process-list)
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
;; This is supposedly run after enabling esh-mode, when eshell-command-map
|
|
|
|
;; already exists.
|
|
|
|
(defvar eshell-command-map)
|
2000-06-23 05:24:10 +00:00
|
|
|
(define-key eshell-command-map [(meta ?i)] 'eshell-insert-process)
|
|
|
|
(define-key eshell-command-map [(control ?c)] 'eshell-interrupt-process)
|
|
|
|
(define-key eshell-command-map [(control ?k)] 'eshell-kill-process)
|
|
|
|
(define-key eshell-command-map [(control ?d)] 'eshell-send-eof-to-process)
|
2001-05-10 03:29:55 +00:00
|
|
|
; (define-key eshell-command-map [(control ?q)] 'eshell-continue-process)
|
2000-06-23 05:24:10 +00:00
|
|
|
(define-key eshell-command-map [(control ?s)] 'list-processes)
|
2001-05-10 03:29:55 +00:00
|
|
|
; (define-key eshell-command-map [(control ?z)] 'eshell-stop-process)
|
2000-06-23 05:24:10 +00:00
|
|
|
(define-key eshell-command-map [(control ?\\)] 'eshell-quit-process))
|
|
|
|
|
2013-09-18 20:44:55 -07:00
|
|
|
(defun eshell-reset-after-proc (status)
|
2000-06-23 05:24:10 +00:00
|
|
|
"Reset the command input location after a process terminates.
|
|
|
|
The signals which will cause this to happen are matched by
|
|
|
|
`eshell-reset-signals'."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(when (and (stringp status)
|
|
|
|
(string-match eshell-reset-signals status))
|
|
|
|
(require 'esh-mode)
|
|
|
|
(declare-function eshell-reset "esh-mode" (&optional no-hooks))
|
|
|
|
(eshell-reset)))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-wait-for-process (&rest procs)
|
|
|
|
"Wait until PROC has successfully completed."
|
|
|
|
(while procs
|
|
|
|
(let ((proc (car procs)))
|
2000-08-29 00:47:45 +00:00
|
|
|
(when (eshell-processp proc)
|
2000-06-23 05:24:10 +00:00
|
|
|
;; NYI: If the process gets stopped here, that's bad.
|
|
|
|
(while (assq proc eshell-process-list)
|
|
|
|
(if (input-pending-p)
|
|
|
|
(discard-input))
|
|
|
|
(sit-for eshell-process-wait-seconds
|
|
|
|
eshell-process-wait-milliseconds))))
|
|
|
|
(setq procs (cdr procs))))
|
|
|
|
|
|
|
|
(defalias 'eshell/wait 'eshell-wait-for-process)
|
|
|
|
|
2018-03-02 19:33:24 -08:00
|
|
|
(defun eshell/jobs (&rest _args)
|
2000-06-23 05:24:10 +00:00
|
|
|
"List processes, if there are any."
|
2000-08-29 00:47:45 +00:00
|
|
|
(and (fboundp 'process-list)
|
|
|
|
(process-list)
|
2000-06-23 05:24:10 +00:00
|
|
|
(list-processes)))
|
|
|
|
|
|
|
|
(defun eshell/kill (&rest args)
|
2013-02-08 10:07:03 -05:00
|
|
|
"Kill processes.
|
|
|
|
Usage: kill [-<signal>] <pid>|<process> ...
|
2018-03-16 14:49:56 +01:00
|
|
|
Accepts PIDs and process objects. Optionally accept signals
|
|
|
|
and signal names."
|
2013-02-08 10:07:03 -05:00
|
|
|
;; If the first argument starts with a dash, treat it as the signal
|
|
|
|
;; specifier.
|
2013-02-08 10:47:07 -05:00
|
|
|
(let ((signum 'SIGINT))
|
|
|
|
(let ((arg (car args))
|
|
|
|
(case-fold-search nil))
|
|
|
|
(when (stringp arg)
|
|
|
|
(cond
|
|
|
|
((string-match "\\`-[[:digit:]]+\\'" arg)
|
|
|
|
(setq signum (abs (string-to-number arg))))
|
|
|
|
((string-match "\\`-\\([[:upper:]]+\\|[[:lower:]]+\\)\\'" arg)
|
2018-03-16 14:49:56 +01:00
|
|
|
(setq signum (intern (substring arg 1)))))
|
2013-02-08 10:47:07 -05:00
|
|
|
(setq args (cdr args))))
|
|
|
|
(while args
|
|
|
|
(let ((arg (if (eshell-processp (car args))
|
|
|
|
(process-id (car args))
|
2018-03-16 14:49:56 +01:00
|
|
|
(string-to-number (car args)))))
|
2013-02-08 10:47:07 -05:00
|
|
|
(when arg
|
|
|
|
(cond
|
|
|
|
((null arg)
|
|
|
|
(error "kill: null pid. Process may actually be a network connection."))
|
|
|
|
((not (numberp arg))
|
|
|
|
(error "kill: invalid argument type: %s" (type-of arg)))
|
|
|
|
((and (numberp arg)
|
|
|
|
(<= arg 0))
|
|
|
|
(error "kill: bad pid: %d" arg))
|
|
|
|
(t
|
|
|
|
(signal-process arg signum)))))
|
|
|
|
(setq args (cdr args))))
|
2013-02-08 10:07:03 -05:00
|
|
|
nil)
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2018-03-16 14:49:56 +01:00
|
|
|
(put 'eshell/kill 'eshell-no-numeric-conversions t)
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defun eshell-read-process-name (prompt)
|
|
|
|
"Read the name of a process from the minibuffer, using completion.
|
|
|
|
The prompt will be set to PROMPT."
|
|
|
|
(completing-read prompt
|
|
|
|
(mapcar
|
|
|
|
(function
|
|
|
|
(lambda (proc)
|
|
|
|
(cons (process-name proc) t)))
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(process-list))
|
|
|
|
nil t))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-insert-process (process)
|
|
|
|
"Insert the name of PROCESS into the current buffer at point."
|
|
|
|
(interactive
|
|
|
|
(list (get-process
|
|
|
|
(eshell-read-process-name "Name of process: "))))
|
|
|
|
(insert-and-inherit "#<process " (process-name process) ">"))
|
|
|
|
|
|
|
|
(defsubst eshell-record-process-object (object)
|
|
|
|
"Record OBJECT as now running."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(when (and (eshell-processp object)
|
|
|
|
eshell-current-subjob-p)
|
|
|
|
(require 'esh-mode)
|
|
|
|
(declare-function eshell-interactive-print "esh-mode" (string))
|
|
|
|
(eshell-interactive-print
|
|
|
|
(format "[%s] %d\n" (process-name object) (process-id object))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq eshell-process-list
|
|
|
|
(cons (list object eshell-current-handles
|
|
|
|
eshell-current-subjob-p nil nil)
|
|
|
|
eshell-process-list)))
|
|
|
|
|
|
|
|
(defun eshell-remove-process-entry (entry)
|
|
|
|
"Record the process ENTRY as fully completed."
|
2000-08-29 00:47:45 +00:00
|
|
|
(if (and (eshell-processp (car entry))
|
2000-06-23 05:24:10 +00:00
|
|
|
(nth 2 entry)
|
|
|
|
eshell-done-messages-in-minibuffer)
|
2005-09-18 12:59:19 +00:00
|
|
|
(message "[%s]+ Done %s" (process-name (car entry))
|
|
|
|
(process-command (car entry))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq eshell-process-list
|
|
|
|
(delq entry eshell-process-list)))
|
|
|
|
|
2000-08-29 00:47:45 +00:00
|
|
|
(defvar eshell-scratch-buffer " *eshell-scratch*"
|
|
|
|
"Scratch buffer for holding Eshell's input/output.")
|
|
|
|
(defvar eshell-last-sync-output-start nil
|
|
|
|
"A marker that tracks the beginning of output of the last subprocess.
|
|
|
|
Used only on systems which do not support async subprocesses.")
|
|
|
|
|
2008-11-30 01:28:01 +00:00
|
|
|
(defvar eshell-needs-pipe '("bc")
|
|
|
|
"List of commands which need `process-connection-type' to be nil.
|
|
|
|
Currently only affects commands in pipelines, and not those at
|
|
|
|
the front. If an element contains a directory part it must match
|
|
|
|
the full name of a command, otherwise just the nondirectory part must match.")
|
|
|
|
|
|
|
|
(defun eshell-needs-pipe-p (command)
|
|
|
|
"Return non-nil if COMMAND needs `process-connection-type' to be nil.
|
|
|
|
See `eshell-needs-pipe'."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(and (bound-and-true-p eshell-in-pipeline-p)
|
2008-11-30 01:28:01 +00:00
|
|
|
(not (eq eshell-in-pipeline-p 'first))
|
|
|
|
;; FIXME should this return non-nil for anything that is
|
|
|
|
;; neither 'first nor 'last? See bug#1388 discussion.
|
|
|
|
(catch 'found
|
|
|
|
(dolist (exe eshell-needs-pipe)
|
|
|
|
(if (string-equal exe (if (string-match "/" exe)
|
|
|
|
command
|
|
|
|
(file-name-nondirectory command)))
|
|
|
|
(throw 'found t))))))
|
|
|
|
|
2000-06-23 05:24:10 +00:00
|
|
|
(defun eshell-gather-process-output (command args)
|
|
|
|
"Gather the output from COMMAND + ARGS."
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-var)
|
|
|
|
(declare-function eshell-environment-variables "esh-var" ())
|
2000-06-23 05:24:10 +00:00
|
|
|
(unless (and (file-executable-p command)
|
2009-11-24 10:25:54 +00:00
|
|
|
(file-regular-p (file-truename command)))
|
2000-06-23 05:24:10 +00:00
|
|
|
(error "%s: not an executable file" command))
|
|
|
|
(let* ((delete-exited-processes
|
|
|
|
(if eshell-current-subjob-p
|
|
|
|
eshell-delete-exited-processes
|
|
|
|
delete-exited-processes))
|
|
|
|
(process-environment (eshell-environment-variables))
|
2000-08-29 00:47:45 +00:00
|
|
|
proc decoding encoding changed)
|
|
|
|
(cond
|
2009-11-24 10:25:54 +00:00
|
|
|
((fboundp 'start-file-process)
|
2000-08-29 00:47:45 +00:00
|
|
|
(setq proc
|
2008-11-30 01:28:01 +00:00
|
|
|
(let ((process-connection-type
|
|
|
|
(unless (eshell-needs-pipe-p command)
|
2009-11-24 10:25:54 +00:00
|
|
|
process-connection-type))
|
2018-09-06 12:16:00 +02:00
|
|
|
(command (file-local-name (expand-file-name command))))
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(apply #'start-file-process
|
2018-09-06 12:16:00 +02:00
|
|
|
(file-name-nondirectory command) nil command args)))
|
2000-08-29 00:47:45 +00:00
|
|
|
(eshell-record-process-object proc)
|
|
|
|
(set-process-buffer proc (current-buffer))
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(set-process-filter proc (if (eshell-interactive-output-p)
|
|
|
|
#'eshell-output-filter
|
|
|
|
#'eshell-insertion-filter))
|
|
|
|
(set-process-sentinel proc #'eshell-sentinel)
|
2000-08-29 00:47:45 +00:00
|
|
|
(run-hook-with-args 'eshell-exec-hook proc)
|
|
|
|
(when (fboundp 'process-coding-system)
|
|
|
|
(let ((coding-systems (process-coding-system proc)))
|
|
|
|
(setq decoding (car coding-systems)
|
|
|
|
encoding (cdr coding-systems)))
|
|
|
|
;; If start-process decided to use some coding system for
|
|
|
|
;; decoding data sent from the process and the coding system
|
|
|
|
;; doesn't specify EOL conversion, we had better convert CRLF
|
|
|
|
;; to LF.
|
|
|
|
(if (vectorp (coding-system-eol-type decoding))
|
|
|
|
(setq decoding (coding-system-change-eol-conversion decoding 'dos)
|
|
|
|
changed t))
|
|
|
|
;; Even if start-process left the coding system for encoding
|
|
|
|
;; data sent from the process undecided, we had better use the
|
|
|
|
;; same one as what we use for decoding. But, we should
|
|
|
|
;; suppress EOL conversion.
|
|
|
|
(if (and decoding (not encoding))
|
|
|
|
(setq encoding (coding-system-change-eol-conversion decoding 'unix)
|
|
|
|
changed t))
|
|
|
|
(if changed
|
|
|
|
(set-process-coding-system proc decoding encoding))))
|
|
|
|
(t
|
|
|
|
;; No async subprocesses...
|
|
|
|
(let ((oldbuf (current-buffer))
|
|
|
|
(interact-p (eshell-interactive-output-p))
|
|
|
|
lbeg lend line proc-buf exit-status)
|
|
|
|
(and (not (markerp eshell-last-sync-output-start))
|
|
|
|
(setq eshell-last-sync-output-start (point-marker)))
|
|
|
|
(setq proc-buf
|
|
|
|
(set-buffer (get-buffer-create eshell-scratch-buffer)))
|
|
|
|
(erase-buffer)
|
|
|
|
(set-buffer oldbuf)
|
|
|
|
(run-hook-with-args 'eshell-exec-hook command)
|
|
|
|
(setq exit-status
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(apply #'call-process-region
|
2000-08-29 00:47:45 +00:00
|
|
|
(append (list eshell-last-sync-output-start (point)
|
|
|
|
command t
|
|
|
|
eshell-scratch-buffer nil)
|
|
|
|
args)))
|
|
|
|
;; When in a pipeline, record the place where the output of
|
|
|
|
;; this process will begin.
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(and (bound-and-true-p eshell-in-pipeline-p)
|
2000-08-29 00:47:45 +00:00
|
|
|
(set-marker eshell-last-sync-output-start (point)))
|
|
|
|
;; Simulate the effect of the process filter.
|
|
|
|
(when (numberp exit-status)
|
|
|
|
(set-buffer proc-buf)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(setq lbeg (point))
|
|
|
|
(while (eq 0 (forward-line 1))
|
|
|
|
(setq lend (point)
|
|
|
|
line (buffer-substring-no-properties lbeg lend))
|
|
|
|
(set-buffer oldbuf)
|
|
|
|
(if interact-p
|
|
|
|
(eshell-output-filter nil line)
|
|
|
|
(eshell-output-object line))
|
|
|
|
(setq lbeg lend)
|
|
|
|
(set-buffer proc-buf))
|
|
|
|
(set-buffer oldbuf))
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-mode)
|
|
|
|
(declare-function eshell-update-markers "esh-mode" (pmark))
|
|
|
|
(defvar eshell-last-output-end) ;Defined in esh-mode.el.
|
2000-08-29 00:47:45 +00:00
|
|
|
(eshell-update-markers eshell-last-output-end)
|
|
|
|
;; Simulate the effect of eshell-sentinel.
|
|
|
|
(eshell-close-handles (if (numberp exit-status) exit-status -1))
|
2011-03-04 20:11:05 -08:00
|
|
|
(eshell-kill-process-function command exit-status)
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(or (bound-and-true-p eshell-in-pipeline-p)
|
2000-08-29 00:47:45 +00:00
|
|
|
(setq eshell-last-sync-output-start nil))
|
|
|
|
(if (not (numberp exit-status))
|
|
|
|
(error "%s: external command failed: %s" command exit-status))
|
|
|
|
(setq proc t))))
|
2000-06-23 05:24:10 +00:00
|
|
|
proc))
|
|
|
|
|
|
|
|
(defun eshell-insertion-filter (proc string)
|
|
|
|
"Insert a string into the eshell buffer, or a process/file/buffer.
|
|
|
|
PROC is the process for which we're inserting output. STRING is the
|
|
|
|
output."
|
|
|
|
(when (buffer-live-p (process-buffer proc))
|
2007-11-07 03:34:45 +00:00
|
|
|
(with-current-buffer (process-buffer proc)
|
|
|
|
(let ((entry (assq proc eshell-process-list)))
|
|
|
|
(when entry
|
|
|
|
(setcar (nthcdr 3 entry)
|
|
|
|
(concat (nth 3 entry) string))
|
|
|
|
(unless (nth 4 entry) ; already being handled?
|
|
|
|
(while (nth 3 entry)
|
|
|
|
(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)))))))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-sentinel (proc string)
|
|
|
|
"Generic sentinel for command processes. Reports only signals.
|
|
|
|
PROC is the process that's exiting. STRING is the exit message."
|
|
|
|
(when (buffer-live-p (process-buffer proc))
|
2007-11-07 03:34:45 +00:00
|
|
|
(with-current-buffer (process-buffer proc)
|
|
|
|
(unwind-protect
|
|
|
|
(let* ((entry (assq proc eshell-process-list)))
|
|
|
|
; (if (not entry)
|
|
|
|
; (error "Sentinel called for unowned process `%s'"
|
|
|
|
; (process-name proc))
|
|
|
|
(when entry
|
|
|
|
(unwind-protect
|
|
|
|
(progn
|
|
|
|
(unless (string= string "run")
|
|
|
|
(unless (string-match "^\\(finished\\|exited\\)" string)
|
|
|
|
(eshell-insertion-filter proc string))
|
2017-02-02 09:19:43 -05:00
|
|
|
(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)))))
|
2007-11-07 03:34:45 +00:00
|
|
|
(eshell-remove-process-entry entry))))
|
2011-03-04 20:11:05 -08:00
|
|
|
(eshell-kill-process-function proc string)))))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-process-interact (func &optional all query)
|
|
|
|
"Interact with a process, using PROMPT if more than one, via FUNC.
|
|
|
|
If ALL is non-nil, background processes will be interacted with as well.
|
|
|
|
If QUERY is non-nil, query the user with QUERY before calling FUNC."
|
|
|
|
(let (defunct result)
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (entry eshell-process-list)
|
2000-06-23 05:24:10 +00:00
|
|
|
(if (and (memq (process-status (car entry))
|
|
|
|
'(run stop open closed))
|
|
|
|
(or all
|
|
|
|
(not (nth 2 entry)))
|
|
|
|
(or (not query)
|
2015-08-31 15:10:07 -07:00
|
|
|
(y-or-n-p (format-message query
|
|
|
|
(process-name (car entry))))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(setq result (funcall func (car entry))))
|
|
|
|
(unless (memq (process-status (car entry))
|
|
|
|
'(run stop open closed))
|
|
|
|
(setq defunct (cons entry defunct))))
|
|
|
|
;; clean up the process list; this can get dirty if an error
|
|
|
|
;; occurred that brought the user into the debugger, and then they
|
|
|
|
;; quit, so that the sentinel was never called.
|
Make eshell-for obsolete (replaced by dolist)
* eshell/esh-util.el (eshell-for): Make it obsolete.
* eshell/em-alias.el (eshell/alias, eshell-alias-completions):
* eshell/em-dirs.el (eshell-save-some-last-dir):
* eshell/em-hist.el (eshell-save-some-history, eshell-hist-parse-modifier):
* eshell/em-ls.el (eshell-ls-dir, eshell-ls-files, eshell-ls-entries):
* eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
* eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval, eshell/which):
* eshell/esh-ext.el (eshell-find-interpreter):
* eshell/esh-mode.el (eshell-mode):
* eshell/esh-module.el (eshell-unload-extension-modules):
* eshell/esh-proc.el (eshell-process-interact):
* eshell/esh-test.el (eshell-test):
* eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
* eshell/esh-var.el (eshell/env, eshell-environment-variables)
(eshell-variables-list):
* eshell/eshell.el (eshell-unload-all-modules):
Replace eshell-for with dolist.
2011-03-04 19:53:41 -08:00
|
|
|
(dolist (d defunct)
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-remove-process-entry d))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defcustom eshell-kill-process-wait-time 5
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"Seconds to wait between sending termination signals to a subprocess."
|
2000-06-23 05:24:10 +00:00
|
|
|
:type 'integer
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-kill-process-signals '(SIGINT SIGQUIT SIGKILL)
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"Signals used to kill processes when an Eshell buffer exits.
|
2000-06-23 05:24:10 +00:00
|
|
|
Eshell calls each of these signals in order when an Eshell buffer is
|
|
|
|
killed; if the process is still alive afterwards, Eshell waits a
|
|
|
|
number of seconds defined by `eshell-kill-process-wait-time', and
|
|
|
|
tries the next signal in the list."
|
|
|
|
:type '(repeat symbol)
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defcustom eshell-kill-processes-on-exit nil
|
Cosmetic doc fixes for eshell.
* eshell/em-alias.el, eshell/em-banner.el, eshell/em-basic.el:
* eshell/em-cmpl.el, eshell/em-dirs.el, eshell/em-glob.el:
* eshell/em-hist.el, eshell/em-ls.el, eshell/em-pred.el:
* eshell/em-prompt.el, eshell/em-rebind.el, eshell/em-script.el:
* eshell/em-smart.el, eshell/em-term.el, eshell/em-unix.el:
* eshell/esh-cmd.el, eshell/esh-ext.el, eshell/esh-io.el:
* eshell/esh-mode.el, eshell/esh-proc.el, eshell/esh-test.el:
* eshell/esh-util.el, eshell/esh-var.el:
Remove leading `*' from docs of faces and defcustoms.
2010-09-25 14:51:55 -07:00
|
|
|
"If non-nil, kill active processes when exiting an Eshell buffer.
|
2000-06-23 05:24:10 +00:00
|
|
|
Emacs will only kill processes owned by that Eshell buffer.
|
|
|
|
|
|
|
|
If nil, ownership of background and foreground processes reverts to
|
|
|
|
Emacs itself, and will die only if the user exits Emacs, calls
|
|
|
|
`kill-process', or terminates the processes externally.
|
|
|
|
|
|
|
|
If `ask', Emacs prompts the user before killing any processes.
|
|
|
|
|
|
|
|
If `every', it prompts once for every process.
|
|
|
|
|
|
|
|
If t, it kills all buffer-owned processes without asking.
|
|
|
|
|
|
|
|
Processes are first sent SIGHUP, then SIGINT, then SIGQUIT, then
|
|
|
|
SIGKILL. The variable `eshell-kill-process-wait-time' specifies how
|
|
|
|
long to delay between signals."
|
|
|
|
:type '(choice (const :tag "Kill all, don't ask" t)
|
|
|
|
(const :tag "Ask before killing" ask)
|
|
|
|
(const :tag "Ask for each process" every)
|
|
|
|
(const :tag "Don't kill subprocesses" nil))
|
|
|
|
:group 'eshell-proc)
|
|
|
|
|
|
|
|
(defun eshell-round-robin-kill (&optional query)
|
|
|
|
"Kill current process by trying various signals in sequence.
|
|
|
|
See the variable `eshell-kill-processes-on-exit'."
|
|
|
|
(let ((sigs eshell-kill-process-signals))
|
|
|
|
(while sigs
|
|
|
|
(eshell-process-interact
|
|
|
|
(function
|
|
|
|
(lambda (proc)
|
|
|
|
(signal-process (process-id proc) (car sigs)))) t query)
|
|
|
|
(setq query nil)
|
|
|
|
(if (not eshell-process-list)
|
|
|
|
(setq sigs nil)
|
|
|
|
(sleep-for eshell-kill-process-wait-time)
|
|
|
|
(setq sigs (cdr sigs))))))
|
|
|
|
|
|
|
|
(defun eshell-query-kill-processes ()
|
|
|
|
"Kill processes belonging to the current Eshell buffer, possibly w/ query."
|
|
|
|
(when (and eshell-kill-processes-on-exit
|
|
|
|
eshell-process-list)
|
|
|
|
(save-window-excursion
|
|
|
|
(list-processes)
|
|
|
|
(if (or (not (eq eshell-kill-processes-on-exit 'ask))
|
2015-08-31 15:10:07 -07:00
|
|
|
(y-or-n-p (format-message "Kill processes owned by `%s'? "
|
|
|
|
(buffer-name))))
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-round-robin-kill
|
|
|
|
(if (eq eshell-kill-processes-on-exit 'every)
|
2019-03-20 10:37:36 +01:00
|
|
|
"Kill Eshell child process `%s'? ")))
|
2000-06-23 05:24:10 +00:00
|
|
|
(let ((buf (get-buffer "*Process List*")))
|
|
|
|
(if (and buf (buffer-live-p buf))
|
|
|
|
(kill-buffer buf)))
|
|
|
|
(message nil))))
|
|
|
|
|
|
|
|
(defun eshell-interrupt-process ()
|
|
|
|
"Interrupt a process."
|
|
|
|
(interactive)
|
|
|
|
(unless (eshell-process-interact 'interrupt-process)
|
2011-03-04 20:11:05 -08:00
|
|
|
(eshell-kill-process-function nil "interrupt")))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-kill-process ()
|
|
|
|
"Kill a process."
|
|
|
|
(interactive)
|
|
|
|
(unless (eshell-process-interact 'kill-process)
|
2011-03-04 20:11:05 -08:00
|
|
|
(eshell-kill-process-function nil "killed")))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-quit-process ()
|
|
|
|
"Send quit signal to process."
|
|
|
|
(interactive)
|
|
|
|
(unless (eshell-process-interact 'quit-process)
|
2011-03-04 20:11:05 -08:00
|
|
|
(eshell-kill-process-function nil "quit")))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
2001-05-10 03:29:55 +00:00
|
|
|
;(defun eshell-stop-process ()
|
|
|
|
; "Send STOP signal to process."
|
|
|
|
; (interactive)
|
|
|
|
; (unless (eshell-process-interact 'stop-process)
|
2011-03-04 20:11:05 -08:00
|
|
|
; (eshell-kill-process-function nil "stopped")))
|
2001-05-10 03:29:55 +00:00
|
|
|
|
|
|
|
;(defun eshell-continue-process ()
|
|
|
|
; "Send CONTINUE signal to process."
|
|
|
|
; (interactive)
|
|
|
|
; (unless (eshell-process-interact 'continue-process)
|
|
|
|
; ;; jww (1999-09-17): this signal is not dealt with yet. For
|
|
|
|
; ;; example, `eshell-reset' will be called, and so will
|
|
|
|
; ;; `eshell-resume-eval'.
|
2011-03-04 20:11:05 -08:00
|
|
|
; (eshell-kill-process-function nil "continue")))
|
2000-06-23 05:24:10 +00:00
|
|
|
|
|
|
|
(defun eshell-send-eof-to-process ()
|
|
|
|
"Send EOF to process."
|
|
|
|
(interactive)
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(require 'esh-mode)
|
|
|
|
(declare-function eshell-send-input "esh-mode"
|
|
|
|
(&optional use-region queue-p no-newline))
|
2000-06-23 05:24:10 +00:00
|
|
|
(eshell-send-input nil nil t)
|
|
|
|
(eshell-process-interact 'process-send-eof))
|
|
|
|
|
Eshell: Try to untangle the dependencies; move 'provide's to the end
* lisp/eshell/esh-arg.el: Move defsubst and vars before first use.
Don't require `esh-mode but esh-util instead.
* lisp/eshell/esh-cmd.el: Require esh-module and esh-io.
* lisp/eshell/esh-ext.el: Don't require esh-proc nor esh-cmd.
(eshell-external-command): Require esh-proc for
eshell-gather-process-output.
* lisp/eshell/esh-mode.el: Don't require esh-io nor esh-var, but
require esh-arg.
(eshell-directory-name): Move from eshell.el.
* lisp/eshell/esh-module.el: Don't require eshell.
* lisp/eshell/esh-opt.el: Don't require esh-ext at top-level.
(eshell--do-opts, eshell-show-usage): Require it here instead.
* lisp/eshell/esh-proc.el: Don't require esh-cmd, but require esh-io.
(eshell-reset-after-proc, eshell-record-process-object)
(eshell-gather-process-output, eshell-send-eof-to-process):
Require esh-mode and esh-var here.
* lisp/eshell/esh-var.el: Require esh-module, esh-arg, and esh-io.
* lisp/eshell/eshell.el: Require esh-module, esh-proc, esh-io, and esh-cmd.
But don't require esh-mode.
(eshell-directory-name): Move to esh-mode.
(eshell-return-exits-minibuffer): Don't bind 'return' and 'M-return'
since we already bind RET and M-RET.
2019-04-08 14:28:34 -04:00
|
|
|
(provide 'esh-proc)
|
2000-06-23 05:24:10 +00:00
|
|
|
;;; esh-proc.el ends here
|