
`string-search` is easier to understand, less error-prone, much faster, does not pollute the regexp cache, and does not mutate global state. Use it where applicable and obviously safe (erring on the conservative side). * admin/authors.el (authors-canonical-file-name) (authors-scan-change-log): * lisp/apropos.el (apropos-command) (apropos-documentation-property, apropos-symbols-internal): * lisp/arc-mode.el (archive-arc-summarize) (archive-zoo-summarize): * lisp/calc/calc-aent.el (math-read-factor): * lisp/calc/calc-ext.el (math-read-big-expr) (math-format-nice-expr, math-format-number-fancy): * lisp/calc/calc-forms.el (math-read-angle-brackets): * lisp/calc/calc-graph.el (calc-graph-set-range): * lisp/calc/calc-keypd.el (calc-keypad-press): * lisp/calc/calc-lang.el (tex, latex, math-read-big-rec): * lisp/calc/calc-prog.el (calc-fix-token-name) (calc-user-define-permanent, math-define-exp): * lisp/calc/calc.el (calc-record, calcDigit-key) (calc-count-lines): * lisp/calc/calcalg2.el (calc-solve-for, calc-poly-roots) (math-do-integral): * lisp/calc/calcalg3.el (calc-find-root, calc-find-minimum) (calc-get-fit-variables): * lisp/cedet/ede/speedbar.el (ede-tag-expand): * lisp/cedet/semantic/java.el (semantic-java-expand-tag): * lisp/cedet/semantic/sb.el (semantic-sb-show-extra) (semantic-sb-expand-group): * lisp/cedet/semantic/wisent/python.el (semantic-python-instance-variable-p): * lisp/cus-edit.el (get): * lisp/descr-text.el (describe-text-sexp): * lisp/dired-aux.el (dired-compress-file): * lisp/dired-x.el (dired-make-relative-symlink): * lisp/dired.el (dired-glob-regexp): * lisp/dos-fns.el (dos-convert-standard-filename, dos-8+3-filename): * lisp/edmacro.el (edmacro-format-keys): * lisp/emacs-lisp/eieio-opt.el (eieio-sb-expand): * lisp/emacs-lisp/eieio-speedbar.el (eieio-speedbar-object-expand): * lisp/emacs-lisp/lisp-mnt.el (lm-keywords-list): * lisp/emacs-lisp/warnings.el (display-warning): * lisp/emulation/viper-ex.el (viper-ex-read-file-name) (ex-print-display-lines): * lisp/env.el (read-envvar-name, setenv): * lisp/epa-mail.el (epa-mail-encrypt): * lisp/epg.el (epg--start): * lisp/erc/erc-backend.el (erc-parse-server-response): * lisp/erc/erc-dcc.el (erc-dcc-member): * lisp/erc/erc-speedbar.el (erc-speedbar-expand-server) (erc-speedbar-expand-channel, erc-speedbar-expand-user): * lisp/erc/erc.el (erc-send-input): * lisp/eshell/em-glob.el (eshell-glob-entries): * lisp/eshell/esh-proc.el (eshell-needs-pipe-p): * lisp/eshell/esh-util.el (eshell-convert): * lisp/eshell/esh-var.el (eshell-envvar-names): * lisp/faces.el (x-resolve-font-name): * lisp/ffap.el (ffap-file-at-point): * lisp/files.el (wildcard-to-regexp, shell-quote-wildcard-pattern): * lisp/forms.el (forms--update): * lisp/frameset.el (frameset-filter-unshelve-param): * lisp/gnus/gnus-art.el (article-decode-charset): * lisp/gnus/gnus-kill.el (gnus-kill-parse-rn-kill-file): * lisp/gnus/gnus-mlspl.el (gnus-group-split-fancy): * lisp/gnus/gnus-msg.el (gnus-summary-resend-message-insert-gcc) (gnus-inews-insert-gcc): * lisp/gnus/gnus-rfc1843.el (rfc1843-decode-article-body): * lisp/gnus/gnus-search.el (gnus-search-indexed-parse-output) (gnus-search--complete-key-data): * lisp/gnus/gnus-spec.el (gnus-parse-simple-format): * lisp/gnus/gnus-sum.el (gnus-summary-refer-article): * lisp/gnus/gnus-util.el (gnus-extract-address-components) (gnus-newsgroup-directory-form): * lisp/gnus/gnus-uu.el (gnus-uu-grab-view): * lisp/gnus/gnus.el (gnus-group-native-p, gnus-short-group-name): * lisp/gnus/message.el (message-check-news-header-syntax) (message-make-message-id, message-user-mail-address) (message-make-fqdn, message-get-reply-headers, message-followup): * lisp/gnus/mm-decode.el (mm-dissect-buffer): * lisp/gnus/nnheader.el (nnheader-insert): * lisp/gnus/nnimap.el (nnimap-process-quirk) (nnimap-imap-ranges-to-gnus-ranges): * lisp/gnus/nnmaildir.el (nnmaildir--ensure-suffix): * lisp/gnus/nnmairix.el (nnmairix-determine-original-group-from-path): * lisp/gnus/nnrss.el (nnrss-match-macro): * lisp/gnus/nntp.el (nntp-find-group-and-number): * lisp/help-fns.el (help--symbol-completion-table-affixation): * lisp/help.el (help-function-arglist): * lisp/hippie-exp.el (he-concat-directory-file-name): * lisp/htmlfontify.el (hfy-relstub): * lisp/ido.el (ido-make-prompt, ido-complete, ido-copy-current-word) (ido-exhibit): * lisp/image/image-converter.el (image-convert-p): * lisp/info-xref.el (info-xref-docstrings): * lisp/info.el (Info-toc-build, Info-follow-reference) (Info-backward-node, Info-finder-find-node) (Info-speedbar-expand-node): * lisp/international/mule-diag.el (print-fontset-element): * lisp/language/korea-util.el (default-korean-keyboard): * lisp/linum.el (linum-after-change): * lisp/mail/ietf-drums.el (ietf-drums-parse-address): * lisp/mail/mail-utils.el (mail-dont-reply-to): * lisp/mail/rfc2047.el (rfc2047-encode-1, rfc2047-decode-string): * lisp/mail/rfc2231.el (rfc2231-parse-string): * lisp/mail/rmailkwd.el (rmail-set-label): * lisp/mail/rmailsum.el (rmail-header-summary): * lisp/mail/smtpmail.el (smtpmail-maybe-append-domain) (smtpmail-user-mail-address): * lisp/mail/uce.el (uce-reply-to-uce): * lisp/man.el (Man-default-man-entry): * lisp/mh-e/mh-alias.el (mh-alias-gecos-name) (mh-alias-minibuffer-confirm-address): * lisp/mh-e/mh-comp.el (mh-forwarded-letter-subject): * lisp/mh-e/mh-speed.el (mh-speed-parse-flists-output): * lisp/mh-e/mh-utils.el (mh-collect-folder-names-filter) (mh-folder-completion-function): * lisp/minibuffer.el (completion--make-envvar-table) (completion-file-name-table, completion-flex-try-completion) (completion-flex-all-completions): * lisp/mpc.el (mpc--proc-quote-string, mpc-cmd-special-tag-p) (mpc-constraints-tag-lookup): * lisp/net/ange-ftp.el (ange-ftp-send-cmd) (ange-ftp-allow-child-lookup): * lisp/net/mailcap.el (mailcap-mime-types): * lisp/net/mairix.el (mairix-search-thread-this-article): * lisp/net/pop3.el (pop3-open-server): * lisp/net/soap-client.el (soap-decode-xs-complex-type): * lisp/net/socks.el (socks-filter): * lisp/nxml/nxml-outln.el (nxml-highlighted-qname): * lisp/nxml/rng-cmpct.el (rng-c-expand-name, rng-c-expand-datatype): * lisp/nxml/rng-uri.el (rng-uri-file-name-1): * lisp/obsolete/complete.el (partial-completion-mode) (PC-do-completion): * lisp/obsolete/longlines.el (longlines-encode-string): * lisp/obsolete/nnir.el (nnir-compose-result): * lisp/obsolete/terminal.el (te-quote-arg-for-sh): * lisp/obsolete/tpu-edt.el (tpu-check-search-case): * lisp/obsolete/url-ns.el (isPlainHostName): * lisp/pcmpl-unix.el (pcomplete/scp): * lisp/play/dunnet.el (dun-listify-string2, dun-get-path) (dun-unix-parse, dun-doassign, dun-cat, dun-batch-unix-interface): * lisp/progmodes/ebnf2ps.el: (ebnf-eps-header-footer-comment): * lisp/progmodes/gdb-mi.el (gdb-var-delete) (gdb-speedbar-expand-node, gdbmi-bnf-incomplete-record-result): * lisp/progmodes/gud.el (gud-find-expr): * lisp/progmodes/idlw-help.el (idlwave-do-context-help1): * lisp/progmodes/idlw-shell.el (idlwave-shell-mode) (idlwave-shell-filter-hidden-output, idlwave-shell-filter): * lisp/progmodes/idlwave.el (idlwave-skip-label-or-case) (idlwave-routine-info): * lisp/progmodes/octave.el (inferior-octave-completion-at-point): * lisp/progmodes/sh-script.el (sh-add-completer): * lisp/progmodes/sql.el (defun): * lisp/progmodes/xscheme.el (xscheme-process-filter): * lisp/replace.el (query-replace-compile-replacement) (map-query-replace-regexp): * lisp/shell.el (shell--command-completion-data) (shell-environment-variable-completion): * lisp/simple.el (display-message-or-buffer): * lisp/speedbar.el (speedbar-dired, speedbar-tag-file) (speedbar-tag-expand): * lisp/subr.el (split-string-and-unquote): * lisp/tar-mode.el (tar-extract): * lisp/term.el (term-command-hook, serial-read-name): * lisp/textmodes/bibtex.el (bibtex-print-help-message): * lisp/textmodes/ispell.el (ispell-lookup-words, ispell-filter) (ispell-parse-output, ispell-buffer-local-parsing): * lisp/textmodes/reftex-cite.el (reftex-do-citation): * lisp/textmodes/reftex-parse.el (reftex-notice-new): * lisp/textmodes/reftex-ref.el (reftex-show-entry): * lisp/textmodes/reftex.el (reftex-compile-variables): * lisp/textmodes/tex-mode.el (tex-send-command) (tex-start-tex, tex-append): * lisp/thingatpt.el (thing-at-point-url-at-point): * lisp/tmm.el (tmm-add-one-shortcut): * lisp/transient.el (transient-format-key): * lisp/url/url-auth.el (url-basic-auth) (url-digest-auth-directory-id-assoc): * lisp/url/url-news.el (url-news): * lisp/url/url-util.el (url-parse-query-string): * lisp/vc/vc-cvs.el (vc-cvs-parse-entry): * lisp/wid-browse.el (widget-browse-sexp): * lisp/woman.el (woman-parse-colon-path, woman-mini-help) (WoMan-getpage-in-background, woman-negative-vertical-space): * lisp/xml.el: * test/lisp/emacs-lisp/check-declare-tests.el (check-declare-tests-warn): * test/lisp/files-tests.el (files-tests-file-name-non-special-dired-compress-handler): * test/lisp/net/network-stream-tests.el (server-process-filter): * test/src/coding-tests.el (ert-test-unibyte-buffer-dos-eol-decode): Use `string-search` instead of `string-match` and `string-match-p`.
557 lines
21 KiB
EmacsLisp
557 lines
21 KiB
EmacsLisp
;;; esh-proc.el --- process management -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 1999-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; 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
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
(require 'esh-io)
|
|
|
|
(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:
|
|
|
|
(defcustom eshell-proc-load-hook nil
|
|
"A hook that gets run when `eshell-proc' is loaded."
|
|
:version "24.1" ; removed eshell-proc-initialize
|
|
:type 'hook)
|
|
|
|
(defcustom eshell-process-wait-seconds 0
|
|
"The number of seconds to delay waiting for a synchronous process."
|
|
:type 'integer)
|
|
|
|
(defcustom eshell-process-wait-milliseconds 50
|
|
"The number of milliseconds to delay waiting for a synchronous process."
|
|
:type 'integer)
|
|
|
|
(defcustom eshell-done-messages-in-minibuffer t
|
|
"If non-nil, subjob \"Done\" messages will display in minibuffer."
|
|
:type 'boolean)
|
|
|
|
(defcustom eshell-delete-exited-processes t
|
|
"If nil, process entries will stick around until `jobs' is run.
|
|
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)
|
|
|
|
(defcustom eshell-reset-signals
|
|
"^\\(interrupt\\|killed\\|quit\\|stopped\\)"
|
|
"If a termination signal matches this regexp, the terminal will be reset."
|
|
:type 'regexp)
|
|
|
|
(defcustom eshell-exec-hook nil
|
|
"Called each time a process is exec'd by `eshell-gather-process-output'.
|
|
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
|
|
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
|
|
is created."
|
|
:type 'hook)
|
|
|
|
(defcustom eshell-kill-hook nil
|
|
"Called when a process run by `eshell-gather-process-output' has ended.
|
|
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."
|
|
:version "24.1" ; removed eshell-reset-after-proc
|
|
:type 'hook)
|
|
|
|
;;; Internal Variables:
|
|
|
|
(defvar eshell-current-subjob-p nil)
|
|
|
|
(defvar eshell-process-list nil
|
|
"A list of the current status of subprocesses.")
|
|
|
|
(defvar eshell-proc-mode-map
|
|
(let ((map (make-sparse-keymap)))
|
|
(define-key map (kbd "C-c M-i") #'eshell-insert-process)
|
|
(define-key map (kbd "C-c C-c") #'eshell-interrupt-process)
|
|
(define-key map (kbd "C-c C-k") #'eshell-kill-process)
|
|
(define-key map (kbd "C-c C-d") #'eshell-send-eof-to-process)
|
|
(define-key map (kbd "C-c C-s") #'list-processes)
|
|
(define-key map (kbd "C-c C-\\") #'eshell-quit-process)
|
|
map))
|
|
|
|
;;; Functions:
|
|
|
|
(defun eshell-kill-process-function (proc status)
|
|
"Function run when killing a process.
|
|
Runs `eshell-reset-after-proc' and `eshell-kill-hook', passing arguments
|
|
PROC and STATUS to functions on the latter."
|
|
;; Was there till 24.1, but it is not optional.
|
|
(remove-hook 'eshell-kill-hook #'eshell-reset-after-proc)
|
|
(eshell-reset-after-proc status)
|
|
(run-hook-with-args 'eshell-kill-hook proc status))
|
|
|
|
(define-minor-mode eshell-proc-mode
|
|
"Minor mode for the proc eshell module.
|
|
|
|
\\{eshell-proc-mode-map}"
|
|
:keymap eshell-proc-mode-map)
|
|
|
|
(defun eshell-proc-initialize () ;Called from `eshell-mode' via intern-soft!
|
|
"Initialize the process handling code."
|
|
(make-local-variable 'eshell-process-list)
|
|
(eshell-proc-mode))
|
|
|
|
(defun eshell-reset-after-proc (status)
|
|
"Reset the command input location after a process terminates.
|
|
The signals which will cause this to happen are matched by
|
|
`eshell-reset-signals'."
|
|
(when (and (stringp status)
|
|
(string-match eshell-reset-signals status))
|
|
(require 'esh-mode)
|
|
(declare-function eshell-reset "esh-mode" (&optional no-hooks))
|
|
(eshell-reset)))
|
|
|
|
(defun eshell-wait-for-process (&rest procs)
|
|
"Wait until PROC has successfully completed."
|
|
(while procs
|
|
(let ((proc (car procs)))
|
|
(when (eshell-processp proc)
|
|
;; 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)
|
|
|
|
(defun eshell/jobs (&rest _args)
|
|
"List processes, if there are any."
|
|
(and (fboundp 'process-list)
|
|
(process-list)
|
|
(list-processes)))
|
|
|
|
(defun eshell/kill (&rest args)
|
|
"Kill processes.
|
|
Usage: kill [-<signal>] <pid>|<process> ...
|
|
Accepts PIDs and process objects. Optionally accept signals
|
|
and signal names."
|
|
;; If the first argument starts with a dash, treat it as the signal
|
|
;; specifier.
|
|
(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)
|
|
(setq signum (intern (substring arg 1)))))
|
|
(setq args (cdr args))))
|
|
(while args
|
|
(let ((arg (if (eshell-processp (car args))
|
|
(process-id (car args))
|
|
(string-to-number (car args)))))
|
|
(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))))
|
|
nil)
|
|
|
|
(put 'eshell/kill 'eshell-no-numeric-conversions t)
|
|
|
|
(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
|
|
(lambda (proc)
|
|
(cons (process-name proc) t))
|
|
(process-list))
|
|
nil t))
|
|
|
|
(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."
|
|
(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))))
|
|
(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."
|
|
(if (and (eshell-processp (car entry))
|
|
(nth 2 entry)
|
|
eshell-done-messages-in-minibuffer)
|
|
(message "[%s]+ Done %s" (process-name (car entry))
|
|
(process-command (car entry))))
|
|
(setq eshell-process-list
|
|
(delq entry eshell-process-list)))
|
|
|
|
(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.")
|
|
|
|
(defvar eshell-needs-pipe
|
|
'("bc"
|
|
;; xclip.el (in GNU ELPA) calls all of these with
|
|
;; `process-connection-type' set to nil.
|
|
"pbpaste" "putclip" "xclip" "xsel" "wl-copy")
|
|
"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'."
|
|
(and (bound-and-true-p eshell-in-pipeline-p)
|
|
(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-search "/" exe)
|
|
command
|
|
(file-name-nondirectory command)))
|
|
(throw 'found t))))))
|
|
|
|
(defun eshell-gather-process-output (command args)
|
|
"Gather the output from COMMAND + ARGS."
|
|
(require 'esh-var)
|
|
(declare-function eshell-environment-variables "esh-var" ())
|
|
(unless (and (file-executable-p command)
|
|
(file-regular-p (file-truename command)))
|
|
(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))
|
|
proc decoding encoding changed)
|
|
(cond
|
|
((fboundp 'make-process)
|
|
(setq proc
|
|
(let ((process-connection-type
|
|
(unless (eshell-needs-pipe-p command)
|
|
process-connection-type))
|
|
(command (file-local-name (expand-file-name command))))
|
|
(apply #'start-file-process
|
|
(file-name-nondirectory command) nil command args)))
|
|
(eshell-record-process-object proc)
|
|
(set-process-buffer proc (current-buffer))
|
|
(set-process-filter proc (if (eshell-interactive-output-p)
|
|
#'eshell-output-filter
|
|
#'eshell-insertion-filter))
|
|
(set-process-sentinel proc #'eshell-sentinel)
|
|
(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
|
|
(apply #'call-process-region
|
|
(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.
|
|
(and (bound-and-true-p eshell-in-pipeline-p)
|
|
(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))
|
|
(require 'esh-mode)
|
|
(declare-function eshell-update-markers "esh-mode" (pmark))
|
|
(defvar eshell-last-output-end) ;Defined in esh-mode.el.
|
|
(eshell-update-markers eshell-last-output-end)
|
|
;; Simulate the effect of eshell-sentinel.
|
|
(eshell-close-handles (if (numberp exit-status) exit-status -1))
|
|
(eshell-kill-process-function command exit-status)
|
|
(or (bound-and-true-p eshell-in-pipeline-p)
|
|
(setq eshell-last-sync-output-start nil))
|
|
(if (not (numberp exit-status))
|
|
(error "%s: external command failed: %s" command exit-status))
|
|
(setq proc t))))
|
|
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))
|
|
(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)))))))))
|
|
|
|
(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))
|
|
(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))
|
|
(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)))))
|
|
|
|
(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)
|
|
(dolist (entry eshell-process-list)
|
|
(if (and (memq (process-status (car entry))
|
|
'(run stop open closed))
|
|
(or all
|
|
(not (nth 2 entry)))
|
|
(or (not query)
|
|
(y-or-n-p (format-message query
|
|
(process-name (car entry))))))
|
|
(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.
|
|
(dolist (d defunct)
|
|
(eshell-remove-process-entry d))
|
|
result))
|
|
|
|
(defcustom eshell-kill-process-wait-time 5
|
|
"Seconds to wait between sending termination signals to a subprocess."
|
|
:type 'integer)
|
|
|
|
(defcustom eshell-kill-process-signals '(SIGINT SIGQUIT SIGKILL)
|
|
"Signals used to kill processes when an Eshell buffer exits.
|
|
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))
|
|
|
|
(defcustom eshell-kill-processes-on-exit nil
|
|
"If non-nil, kill active processes when exiting an Eshell buffer.
|
|
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)))
|
|
|
|
(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
|
|
(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))
|
|
(y-or-n-p (format-message "Kill processes owned by `%s'? "
|
|
(buffer-name))))
|
|
(eshell-round-robin-kill
|
|
(if (eq eshell-kill-processes-on-exit 'every)
|
|
"Kill Eshell child process `%s'? ")))
|
|
(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)
|
|
(eshell-kill-process-function nil "interrupt")))
|
|
|
|
(defun eshell-kill-process ()
|
|
"Kill a process."
|
|
(interactive)
|
|
(unless (eshell-process-interact 'kill-process)
|
|
(eshell-kill-process-function nil "killed")))
|
|
|
|
(defun eshell-quit-process ()
|
|
"Send quit signal to process."
|
|
(interactive)
|
|
(unless (eshell-process-interact 'quit-process)
|
|
(eshell-kill-process-function nil "quit")))
|
|
|
|
;(defun eshell-stop-process ()
|
|
; "Send STOP signal to process."
|
|
; (interactive)
|
|
; (unless (eshell-process-interact 'stop-process)
|
|
; (eshell-kill-process-function nil "stopped")))
|
|
|
|
;(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'.
|
|
; (eshell-kill-process-function nil "continue")))
|
|
|
|
(defun eshell-send-eof-to-process ()
|
|
"Send EOF to process."
|
|
(interactive)
|
|
(require 'esh-mode)
|
|
(declare-function eshell-send-input "esh-mode"
|
|
(&optional use-region queue-p no-newline))
|
|
(eshell-send-input nil nil t)
|
|
(eshell-process-interact 'process-send-eof))
|
|
|
|
(provide 'esh-proc)
|
|
;;; esh-proc.el ends here
|