1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-15 09:47:20 +00:00
emacs/lisp/eshell/esh-ext.el
Eli Zaretskii 3c3eb1d5f2 PATH- and completion-related fixes in Eshell on MS-Windows
* lisp/eshell/esh-ext.el (eshell-search-path): When running on
MS-Windows, prepend "." to list of directories produced from PATH,
as Windows always implicitly searches the current directory first.
(eshell-force-execution): Make it have a non-nil default value on
MS-Windows and MS-DOS.
* lisp/eshell/em-cmpl.el (eshell-complete-commands-list): If
eshell-force-execution is non-nil, complete on readable files and
directories, not only executables.  When running on MS-Windows,
prepend "." to list of directories produced from PATH, as Windows
always implicitly searches the current directory first.
2015-04-29 20:52:02 +03:00

335 lines
12 KiB
EmacsLisp

;;; esh-ext.el --- commands external to Eshell -*- lexical-binding:t -*-
;; Copyright (C) 1999-2015 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 <http://www.gnu.org/licenses/>.
;;; Commentary:
;; To force a command to invoked external, either provide an explicit
;; pathname for the command argument, or prefix the command name with
;; an asterix character. Example:
;;
;; grep ; make invoke `grep' Lisp function, or `eshell/grep'
;; /bin/grep ; will definitely invoke /bin/grep
;; *grep ; will also invoke /bin/grep
;;; Code:
(provide 'esh-ext)
(require 'esh-util)
(eval-when-compile
(require 'cl-lib)
(require 'esh-io)
(require 'esh-cmd))
(require 'esh-opt)
(defgroup eshell-ext nil
"External commands are invoked when operating system executables are
loaded into memory, thus beginning a new process."
:tag "External commands"
:group 'eshell)
;;; User Variables:
(defcustom eshell-ext-load-hook nil
"A hook that gets run when `eshell-ext' is loaded."
:version "24.1" ; removed eshell-ext-initialize
:type 'hook
:group 'eshell-ext)
(defcustom eshell-binary-suffixes exec-suffixes
"A list of suffixes used when searching for executable files."
:type '(repeat string)
:group 'eshell-ext)
(defcustom eshell-force-execution
(not (null (memq system-type '(windows-nt ms-dos))))
"If non-nil, try to execute files regardless of execute permissions.
This can be useful on systems like Windows, where the operating system
doesn't support the execution bit for shell scripts; or in cases where
you want to associate an interpreter with a particular kind of script
file, but the language won't let you but a '#!' interpreter line in
the file, and you don't want to make it executable since nothing else
but Eshell will be able to understand
`eshell-interpreter-alist'."
:type 'boolean
:group 'eshell-ext)
(defun eshell-search-path (name)
"Search the environment path for NAME."
(if (file-name-absolute-p name)
name
(let ((list (eshell-parse-colon-path eshell-path-env))
suffixes n1 n2 file)
(if (eshell-under-windows-p)
(push "." list))
(while list
(setq n1 (concat (car list) name))
(setq suffixes eshell-binary-suffixes)
(while suffixes
(setq n2 (concat n1 (car suffixes)))
(if (and (or (file-executable-p n2)
(and eshell-force-execution
(file-readable-p n2)))
(not (file-directory-p n2)))
(setq file n2 suffixes nil list nil))
(setq suffixes (cdr suffixes)))
(setq list (cdr list)))
file)))
;; This file provides itself then eval-when-compile loads files that require it.
;; This causes spurious "might not be defined at runtime" warnings.
(declare-function eshell-search-path "esh-ext" (name))
(defcustom eshell-windows-shell-file
(if (eshell-under-windows-p)
(if (string-match "\\(cmdproxy\\|sh\\)\\.\\(com\\|exe\\)"
shell-file-name)
(or (eshell-search-path "cmd.exe")
(eshell-search-path "command.com"))
shell-file-name))
"The name of the shell command to use for DOS/Windows batch files.
This defaults to nil on non-Windows systems, where this variable is
wholly ignored."
:type '(choice file (const nil))
:group 'eshell-ext)
(autoload 'eshell-parse-command "esh-cmd")
(defsubst eshell-invoke-batch-file (&rest args)
"Invoke a .BAT or .CMD file on DOS/Windows systems."
;; since CMD.EXE can't handle forward slashes in the initial
;; argument...
(setcar args (subst-char-in-string ?/ ?\\ (car args)))
(throw 'eshell-replace-command
(eshell-parse-command
(eshell-quote-argument eshell-windows-shell-file)
(cons "/c" args))))
(defcustom eshell-interpreter-alist
(if (eshell-under-windows-p)
'(("\\.\\(bat\\|cmd\\)\\'" . eshell-invoke-batch-file)))
"An alist defining interpreter substitutions.
Each member is a cons cell of the form:
(MATCH . INTERPRETER)
MATCH should be a regexp, which is matched against the command
name, or a function of arity 2 receiving the COMMAND and its
ARGS (a list). If either returns a non-nil value, then
INTERPRETER will be used for that command.
If INTERPRETER is a string, it will be called as the command name,
with the original command name passed as the first argument, with all
subsequent arguments following. If INTERPRETER is a function, it will
be called with all of those arguments. Note that interpreter
functions should throw `eshell-replace-command' with the alternate
command form, or they should return a value compatible with the
possible return values of `eshell-external-command', which see."
:type '(repeat (cons (choice regexp (function :tag "Predicate"))
(choice string (function :tag "Interpreter"))))
:group 'eshell-ext)
(defcustom eshell-alternate-command-hook nil
"A hook run whenever external command lookup fails.
If a functions wishes to provide an alternate command, they must throw
it using the tag `eshell-replace-command'. This is done because the
substituted command need not be external at all, and therefore must be
passed up to a higher level for re-evaluation.
Or, if the function returns a filename, that filename will be invoked
with the current command arguments rather than the command specified
by the user on the command line."
:type 'hook
:group 'eshell-ext)
(defcustom eshell-command-interpreter-max-length 256
"The maximum length of any command interpreter string, plus args."
:type 'integer
:group 'eshell-ext)
(defcustom eshell-explicit-command-char ?*
"If this char occurs before a command name, call it externally.
That is, although `vi' may be an alias, `\vi' will always call the
external version."
:type 'character
:group 'eshell-ext)
;;; Functions:
(defun eshell-ext-initialize ()
"Initialize the external command handling code."
(add-hook 'eshell-named-command-hook 'eshell-explicit-command nil t))
(defun eshell-explicit-command (command args)
"If a command name begins with `*', call it externally always.
This bypasses all Lisp functions and aliases."
(when (and (> (length command) 1)
(eq (aref command 0) eshell-explicit-command-char))
(let ((cmd (eshell-search-path (substring command 1))))
(if cmd
(or (eshell-external-command cmd args)
(error "%s: external command failed" cmd))
(error "%s: external command not found"
(substring command 1))))))
(autoload 'eshell-close-handles "esh-io")
(defun eshell-remote-command (command args)
"Insert output from a remote COMMAND, using ARGS.
A remote command is something that executes on a different machine.
An external command simply means external to Emacs.
Note that this function is very crude at the moment. It gathers up
all the output from the remote command, and sends it all at once,
causing the user to wonder if anything's really going on..."
(let ((outbuf (generate-new-buffer " *eshell remote output*"))
(errbuf (generate-new-buffer " *eshell remote error*"))
(command (or (file-remote-p command 'localname) command))
(exitcode 1))
(unwind-protect
(progn
(setq exitcode
(shell-command
(mapconcat 'shell-quote-argument
(append (list command) args) " ")
outbuf errbuf))
(eshell-print (with-current-buffer outbuf (buffer-string)))
(eshell-error (with-current-buffer errbuf (buffer-string))))
(eshell-close-handles exitcode 'nil)
(kill-buffer outbuf)
(kill-buffer errbuf))))
(defun eshell-external-command (command args)
"Insert output from an external COMMAND, using ARGS."
(setq args (eshell-stringify-list (eshell-flatten-list args)))
(let ((interp (eshell-find-interpreter
command
args
;; `eshell-find-interpreter' does not work correctly
;; for Tramp file name syntax. But we don't need to
;; know the interpreter in that case, therefore the
;; check is suppressed.
(or (and (stringp command) (file-remote-p command))
(file-remote-p default-directory)))))
(cl-assert interp)
(if (functionp (car interp))
(apply (car interp) (append (cdr interp) args))
(eshell-gather-process-output
(car interp) (append (cdr interp) args)))))
(defun eshell/addpath (&rest args)
"Add a set of paths to PATH."
(eshell-eval-using-options
"addpath" args
'((?b "begin" nil prepend "add path element at beginning")
(?h "help" nil nil "display this usage message")
:usage "[-b] PATH
Adds the given PATH to $PATH.")
(if args
(progn
(setq eshell-path-env (getenv "PATH")
args (mapconcat 'identity args path-separator)
eshell-path-env
(if prepend
(concat args path-separator eshell-path-env)
(concat eshell-path-env path-separator args)))
(setenv "PATH" eshell-path-env))
(dolist (dir (parse-colon-path (getenv "PATH")))
(eshell-printn dir)))))
(put 'eshell/addpath 'eshell-no-numeric-conversions t)
(defun eshell-script-interpreter (file)
"Extract the script to run from FILE, if it has #!<interp> in it.
Return nil, or a list of the form:
(INTERPRETER [ARGS] FILE)"
(let ((maxlen eshell-command-interpreter-max-length))
(if (and (file-readable-p file)
(file-regular-p file))
(with-temp-buffer
(insert-file-contents-literally file nil 0 maxlen)
(if (looking-at "#![ \t]*\\([^ \r\t\n]+\\)\\([ \t]+\\(.+\\)\\)?")
(if (match-string 3)
(list (match-string 1)
(match-string 3)
file)
(list (match-string 1)
file)))))))
(defun eshell-find-interpreter (file args &optional no-examine-p)
"Find the command interpreter with which to execute FILE.
If NO-EXAMINE-P is non-nil, FILE will not be inspected for a script
line of the form #!<interp>."
(let ((finterp
(catch 'found
(ignore
(dolist (possible eshell-interpreter-alist)
(cond
((functionp (car possible))
(let ((fn (car possible)))
(and (funcall fn file args)
(throw 'found (cdr possible)))))
((stringp (car possible))
(and (string-match (car possible) file)
(throw 'found (cdr possible))))
(t
(error "Invalid interpreter-alist test"))))))))
(if finterp ; first check
(list finterp file)
(let ((fullname (if (file-name-directory file) file
(eshell-search-path file)))
(suffixes eshell-binary-suffixes))
(if (and fullname
(not (file-remote-p fullname))
(file-remote-p default-directory))
(setq fullname (expand-file-name
(concat "./" fullname) default-directory)))
(if (and fullname (not (or eshell-force-execution
(file-executable-p fullname))))
(while suffixes
(let ((try (concat fullname (car suffixes))))
(if (or (file-executable-p try)
(and eshell-force-execution
(file-readable-p try)))
(setq fullname try suffixes nil)
(setq suffixes (cdr suffixes))))))
(cond ((not (and fullname (file-exists-p fullname)))
(let ((name (or fullname file)))
(unless (setq fullname
(run-hook-with-args-until-success
'eshell-alternate-command-hook file))
(error "%s: command not found" name))))
((not (or eshell-force-execution
(file-executable-p fullname)))
(error "%s: Permission denied" fullname)))
(let (interp)
(unless no-examine-p
(setq interp (eshell-script-interpreter fullname))
(if interp
(setq interp
(cons (car (eshell-find-interpreter (car interp) args t))
(cdr interp)))))
(or interp (list fullname)))))))
;;; esh-ext.el ends here