2013-09-12 16:15:53 -04:00
|
|
|
;;; esh-util.el --- general utilities -*- lexical-binding:t -*-
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2022-01-01 02:45:51 -05:00
|
|
|
;; Copyright (C) 1999-2022 Free Software Foundation, Inc.
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2000-10-16 12:27:09 +00:00
|
|
|
;; Author: John Wiegley <johnw@gnu.org>
|
|
|
|
|
2000-06-23 04:39:18 +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 04:39:18 +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 04:39:18 +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 04:39:18 +00:00
|
|
|
|
2007-12-05 07:07:12 +00:00
|
|
|
;;; Commentary:
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2007-12-05 07:07:12 +00:00
|
|
|
;;; Code:
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2021-04-11 22:46:48 -04:00
|
|
|
(require 'seq)
|
Cleanup Eshell to rely less on dynamic scoping.
* lisp/eshell/esh-opt.el (eshell-eval-using-options): Don't bind usage-msg,
last-value, and ext-command here. Bind `args' closer to `body'.
(temp-args, last-value, usage-msg, ext-command, args): Don't defvar.
(eshell--args): Declare new dynamic var.
(eshell-do-opt): Add argument `args'. Bind our own usage-msg,
last-value, and ext-command. Pass `args' to `body'.
(eshell-process-args): Bind eshell--args.
(eshell-set-option): Use eshell--args.
* lisp/eshell/eshell.el (eshell): Use derived-mode-p.
* lisp/eshell/esh-var.el (eshell-parse-variable): Use backquote.
(eshell-parse-variable-ref): Remove unused vars `end' and `err'.
(eshell-glob-function): Declare.
* lisp/eshell/esh-util.el: Require cl-lib.
(eshell-read-hosts-file): Avoid add-to-list.
* lisp/eshell/esh-cmd.el (eshell-parse-lisp-argument): Remove unused var
`err'.
* lisp/eshell/em-unix.el (compilation-scroll-output, locate-history-list):
Declare.
(eshell/diff): Remove unused var `err'.
* lisp/eshell/em-rebind.el (eshell-delete-backward-char): Remove unused arg
`killflag'.
* lisp/eshell/em-pred.el (eshell-parse-modifiers): Remove unused var `err'.
* lisp/eshell/em-ls.el (eshell-ls-highlight-alist): Move defvars before
first use.
* lisp/eshell/em-glob.el (eshell-glob-matches, message-shown):
Move declaration before first use.
* lisp/eshell/em-alias.el (eshell-maybe-replace-by-alias): Use backquotes.
* autorevert.el (auto-revert-notify-handler): Use `cl-dolist' since we
rely on cl-return.
2013-09-12 01:20:07 -04:00
|
|
|
(eval-when-compile (require 'cl-lib))
|
|
|
|
|
2000-06-23 04:39:18 +00:00
|
|
|
(defgroup eshell-util nil
|
|
|
|
"This is general utility code, meant for use by Eshell itself."
|
|
|
|
:tag "General utilities"
|
|
|
|
:group 'eshell)
|
|
|
|
|
|
|
|
;;; User Variables:
|
|
|
|
|
2000-10-29 05:18:48 +00:00
|
|
|
(defcustom eshell-stringify-t t
|
2015-05-21 10:04:45 -07:00
|
|
|
"If non-nil, the string representation of t is \"t\".
|
2000-10-29 05:18:48 +00:00
|
|
|
If nil, t will be represented only in the exit code of the function,
|
|
|
|
and not printed as a string. This causes Lisp functions to behave
|
|
|
|
similarly to external commands, as far as successful result output."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'boolean)
|
2000-10-29 05:18:48 +00:00
|
|
|
|
2000-06-23 04:39:18 +00:00
|
|
|
(defcustom eshell-group-file "/etc/group"
|
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, the name of the group file on your system."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type '(choice (const :tag "No group file" nil) file))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defcustom eshell-passwd-file "/etc/passwd"
|
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, the name of the passwd file on your system."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type '(choice (const :tag "No passwd file" nil) file))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defcustom eshell-hosts-file "/etc/hosts"
|
Move several completions from eshell to pcomplete (Bug#10585)
* lisp/eshell/em-unix.el (eshell-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
Move from here...
* lisp/pcmpl-unix.el (pcmpl-unix-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
...to here. Make old names into aliases.
* lisp/eshell/esh-util.el (eshell-hosts-file)
(eshell-host-names, eshell-host-timestamp)
(eshell-read-hosts-file, eshell-read-hosts)
(eshell-read-host-names): Move from here...
* lisp/pcomplete.el (pcomplete-hosts-file)
(pcomplete--host-name-cache)
(pcomplete--host-name-cache-timestamp)
(pcomplete-read-hosts-file, pcomplete-read-hosts)
(pcomplete-read-host-names): ...to here. Make old names into
aliases.
* lisp/eshell/em-unix.el (eshell-complete-host-reference): Update
caller.
2020-09-02 02:45:39 +02:00
|
|
|
"The name of the /etc/hosts file.
|
|
|
|
Use `pcomplete-hosts-file' instead; this variable is obsolete and
|
|
|
|
has no effect."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type '(choice (const :tag "No hosts file" nil) file))
|
Move several completions from eshell to pcomplete (Bug#10585)
* lisp/eshell/em-unix.el (eshell-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
Move from here...
* lisp/pcmpl-unix.el (pcmpl-unix-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
...to here. Make old names into aliases.
* lisp/eshell/esh-util.el (eshell-hosts-file)
(eshell-host-names, eshell-host-timestamp)
(eshell-read-hosts-file, eshell-read-hosts)
(eshell-read-host-names): Move from here...
* lisp/pcomplete.el (pcomplete-hosts-file)
(pcomplete--host-name-cache)
(pcomplete--host-name-cache-timestamp)
(pcomplete-read-hosts-file, pcomplete-read-hosts)
(pcomplete-read-host-names): ...to here. Make old names into
aliases.
* lisp/eshell/em-unix.el (eshell-complete-host-reference): Update
caller.
2020-09-02 02:45:39 +02:00
|
|
|
;; Don't make it into an alias, because it doesn't really work with
|
|
|
|
;; custom and risks creating duplicate entries. Just point users to
|
|
|
|
;; the other variable, which is less frustrating.
|
|
|
|
(make-obsolete-variable 'eshell-hosts-file nil "28.1")
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defcustom eshell-handle-errors 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, Eshell will handle errors itself.
|
2000-06-23 04:39:18 +00:00
|
|
|
Setting this to nil is offered as an aid to debugging only."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'boolean)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2021-12-12 09:12:14 +01:00
|
|
|
(defcustom eshell-private-file-modes #o600 ; umask 177
|
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 file-modes value to use for creating \"private\" files."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'integer)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2021-12-12 09:12:14 +01:00
|
|
|
(defcustom eshell-private-directory-modes #o700 ; umask 077
|
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 file-modes value to use for creating \"private\" directories."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'integer)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defcustom eshell-tar-regexp
|
2010-09-25 14:42:48 -07:00
|
|
|
"\\.t\\(ar\\(\\.\\(gz\\|bz2\\|xz\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
|
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
|
|
|
"Regular expression used to match tar file names."
|
2010-09-25 14:42:48 -07:00
|
|
|
:version "24.1" ; added xz
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'regexp)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defcustom eshell-convert-numeric-arguments 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, converting arguments of numeric form to Lisp numbers.
|
2000-06-23 04:39:18 +00:00
|
|
|
Numeric form is tested using the regular expression
|
2001-05-10 03:51:34 +00:00
|
|
|
`eshell-number-regexp'.
|
|
|
|
|
2011-11-19 01:18:31 -08:00
|
|
|
NOTE: If you find that numeric conversions are interfering with the
|
2001-05-10 03:51:34 +00:00
|
|
|
specification of filenames (for example, in calling `find-file', or
|
|
|
|
some other Lisp function that deals with files, not numbers), add the
|
2012-09-17 13:41:04 +08:00
|
|
|
following in your init file:
|
2001-05-10 03:51:34 +00:00
|
|
|
|
2015-09-03 15:31:12 -07:00
|
|
|
(put \\='find-file \\='eshell-no-numeric-conversions t)
|
2001-05-10 03:51:34 +00:00
|
|
|
|
|
|
|
Any function with the property `eshell-no-numeric-conversions' set to
|
|
|
|
a non-nil value, will be passed strings, not numbers, even when an
|
|
|
|
argument matches `eshell-number-regexp'."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'boolean)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2001-05-10 03:30:15 +00:00
|
|
|
(defcustom eshell-number-regexp "-?\\([0-9]*\\.\\)?[0-9]+\\(e[-0-9.]+\\)?"
|
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
|
|
|
"Regular expression used to match numeric arguments.
|
2000-06-23 04:39:18 +00:00
|
|
|
If `eshell-convert-numeric-arguments' is non-nil, and an argument
|
|
|
|
matches this regexp, it will be converted to a Lisp number, using the
|
|
|
|
function `string-to-number'."
|
2021-04-11 22:46:48 -04:00
|
|
|
:type 'regexp)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2000-10-13 09:02:39 +00:00
|
|
|
(defcustom eshell-ange-ls-uids 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
|
|
|
"List of user/host/id strings, used to determine remote ownership."
|
2001-01-26 06:19:25 +00:00
|
|
|
:type '(repeat (cons :tag "Host for User/UID map"
|
|
|
|
(string :tag "Hostname")
|
|
|
|
(repeat (cons :tag "User/UID List"
|
|
|
|
(string :tag "Username")
|
2021-04-11 22:46:48 -04:00
|
|
|
(repeat :tag "UIDs" string))))))
|
2000-10-13 09:02:39 +00:00
|
|
|
|
2000-06-23 04:39:18 +00:00
|
|
|
;;; Internal Variables:
|
|
|
|
|
|
|
|
(defvar eshell-group-names nil
|
|
|
|
"A cache to hold the names of groups.")
|
|
|
|
|
|
|
|
(defvar eshell-group-timestamp nil
|
|
|
|
"A timestamp of when the group file was read.")
|
|
|
|
|
|
|
|
(defvar eshell-user-names nil
|
|
|
|
"A cache to hold the names of users.")
|
|
|
|
|
|
|
|
(defvar eshell-user-timestamp nil
|
|
|
|
"A timestamp of when the user file was read.")
|
|
|
|
|
Move several completions from eshell to pcomplete (Bug#10585)
* lisp/eshell/em-unix.el (eshell-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
Move from here...
* lisp/pcmpl-unix.el (pcmpl-unix-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
...to here. Make old names into aliases.
* lisp/eshell/esh-util.el (eshell-hosts-file)
(eshell-host-names, eshell-host-timestamp)
(eshell-read-hosts-file, eshell-read-hosts)
(eshell-read-host-names): Move from here...
* lisp/pcomplete.el (pcomplete-hosts-file)
(pcomplete--host-name-cache)
(pcomplete--host-name-cache-timestamp)
(pcomplete-read-hosts-file, pcomplete-read-hosts)
(pcomplete-read-host-names): ...to here. Make old names into
aliases.
* lisp/eshell/em-unix.el (eshell-complete-host-reference): Update
caller.
2020-09-02 02:45:39 +02:00
|
|
|
;;; Obsolete variables:
|
2000-06-23 04:39:18 +00:00
|
|
|
|
Move several completions from eshell to pcomplete (Bug#10585)
* lisp/eshell/em-unix.el (eshell-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
Move from here...
* lisp/pcmpl-unix.el (pcmpl-unix-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
...to here. Make old names into aliases.
* lisp/eshell/esh-util.el (eshell-hosts-file)
(eshell-host-names, eshell-host-timestamp)
(eshell-read-hosts-file, eshell-read-hosts)
(eshell-read-host-names): Move from here...
* lisp/pcomplete.el (pcomplete-hosts-file)
(pcomplete--host-name-cache)
(pcomplete--host-name-cache-timestamp)
(pcomplete-read-hosts-file, pcomplete-read-hosts)
(pcomplete-read-host-names): ...to here. Make old names into
aliases.
* lisp/eshell/em-unix.el (eshell-complete-host-reference): Update
caller.
2020-09-02 02:45:39 +02:00
|
|
|
(define-obsolete-variable-alias 'eshell-host-names
|
|
|
|
'pcomplete--host-name-cache "28.1")
|
|
|
|
(define-obsolete-variable-alias 'eshell-host-timestamp
|
|
|
|
'pcomplete--host-name-cache-timestamp "28.1")
|
|
|
|
(defvar pcomplete--host-name-cache)
|
|
|
|
(defvar pcomplete--host-name-cache-timestamp)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
;;; Functions:
|
|
|
|
|
|
|
|
(defsubst eshell-under-windows-p ()
|
|
|
|
"Return non-nil if we are running under MS-DOS/Windows."
|
|
|
|
(memq system-type '(ms-dos windows-nt)))
|
|
|
|
|
|
|
|
(defmacro eshell-condition-case (tag form &rest handlers)
|
2011-03-09 23:16:04 -08:00
|
|
|
"If `eshell-handle-errors' is non-nil, this is `condition-case'.
|
|
|
|
Otherwise, evaluates FORM with no error handling."
|
2017-09-23 10:04:36 -04:00
|
|
|
(declare (indent 2) (debug (sexp form &rest form)))
|
2000-06-23 04:39:18 +00:00
|
|
|
(if eshell-handle-errors
|
2013-09-16 14:23:30 -04:00
|
|
|
`(condition-case-unless-debug ,tag
|
2000-06-23 04:39:18 +00:00
|
|
|
,form
|
|
|
|
,@handlers)
|
|
|
|
form))
|
|
|
|
|
|
|
|
(defun eshell-find-delimiter
|
|
|
|
(open close &optional bound reverse-p backslash-p)
|
|
|
|
"From point, find the CLOSE delimiter corresponding to OPEN.
|
2022-03-27 12:09:58 -07:00
|
|
|
The matching is bounded by BOUND. If REVERSE-P is non-nil,
|
|
|
|
process the region backwards.
|
|
|
|
|
|
|
|
If BACKSLASH-P is non-nil, or OPEN and CLOSE are different
|
|
|
|
characters, then a backslash can be used to escape a delimiter
|
|
|
|
(or another backslash). Otherwise, the delimiter is escaped by
|
|
|
|
doubling it up."
|
2000-06-23 04:39:18 +00:00
|
|
|
(save-excursion
|
|
|
|
(let ((depth 1)
|
|
|
|
(bound (or bound (point-max))))
|
2022-03-27 12:09:58 -07:00
|
|
|
(when (if reverse-p
|
|
|
|
(eq (char-before) close)
|
|
|
|
(eq (char-after) open))
|
|
|
|
(forward-char (if reverse-p -1 1)))
|
2000-06-23 04:39:18 +00:00
|
|
|
(while (and (> depth 0)
|
2022-03-27 12:09:58 -07:00
|
|
|
(funcall (if reverse-p #'> #'<) (point) bound))
|
|
|
|
(let ((c (if reverse-p (char-before) (char-after))))
|
2000-06-23 04:39:18 +00:00
|
|
|
(cond ((and (not reverse-p)
|
|
|
|
(or (not (eq open close))
|
|
|
|
backslash-p)
|
|
|
|
(eq c ?\\)
|
2022-03-27 12:09:58 -07:00
|
|
|
(memq (char-after (1+ (point)))
|
|
|
|
(list open close ?\\)))
|
2000-06-23 04:39:18 +00:00
|
|
|
(forward-char 1))
|
|
|
|
((and reverse-p
|
|
|
|
(or (not (eq open close))
|
|
|
|
backslash-p)
|
2022-03-27 12:09:58 -07:00
|
|
|
(eq (char-before (1- (point))) ?\\)
|
|
|
|
(memq c (list open close ?\\)))
|
2000-06-23 04:39:18 +00:00
|
|
|
(forward-char -1))
|
|
|
|
((eq open close)
|
2022-03-27 12:09:58 -07:00
|
|
|
(when (eq c open)
|
|
|
|
(if (and (not backslash-p)
|
|
|
|
(eq (if reverse-p
|
|
|
|
(char-before (1- (point)))
|
|
|
|
(char-after (1+ (point))))
|
|
|
|
open))
|
|
|
|
(forward-char (if reverse-p -1 1))
|
|
|
|
(setq depth (1- depth)))))
|
2000-06-23 04:39:18 +00:00
|
|
|
((= c open)
|
|
|
|
(setq depth (+ depth (if reverse-p -1 1))))
|
|
|
|
((= c close)
|
|
|
|
(setq depth (+ depth (if reverse-p 1 -1))))))
|
|
|
|
(forward-char (if reverse-p -1 1)))
|
2022-03-27 12:09:58 -07:00
|
|
|
(when (= depth 0)
|
|
|
|
(if reverse-p (point) (1- (point)))))))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2022-05-01 22:09:17 -07:00
|
|
|
(defun eshell-convertible-to-number-p (string)
|
|
|
|
"Return non-nil if STRING can be converted to a number.
|
|
|
|
If `eshell-convert-numeric-aguments', always return nil."
|
|
|
|
(and eshell-convert-numeric-arguments
|
|
|
|
(string-match
|
|
|
|
(concat "\\`\\s-*" eshell-number-regexp "\\s-*\\'")
|
|
|
|
string)))
|
|
|
|
|
|
|
|
(defun eshell-convert-to-number (string)
|
|
|
|
"Try to convert STRING to a number.
|
|
|
|
If STRING doesn't look like a number (or
|
|
|
|
`eshell-convert-numeric-aguments' is nil), just return STRING
|
|
|
|
unchanged."
|
|
|
|
(if (eshell-convertible-to-number-p string)
|
|
|
|
(string-to-number string)
|
|
|
|
string))
|
|
|
|
|
2022-02-28 17:38:39 -08:00
|
|
|
(defun eshell-convert (string &optional to-string)
|
|
|
|
"Convert STRING into a more-native Lisp object.
|
|
|
|
If TO-STRING is non-nil, always return a single string with
|
|
|
|
trailing newlines removed. Otherwise, this behaves as follows:
|
|
|
|
|
|
|
|
* Return non-strings as-is.
|
|
|
|
|
|
|
|
* Split multiline strings by line.
|
|
|
|
|
2022-05-01 22:09:17 -07:00
|
|
|
* If `eshell-convert-numeric-aguments' is non-nil and every line
|
|
|
|
of output looks like a number, convert them to numbers."
|
2022-02-28 17:38:39 -08:00
|
|
|
(cond
|
|
|
|
((not (stringp string))
|
|
|
|
(if to-string
|
|
|
|
(eshell-stringify string)
|
|
|
|
string))
|
|
|
|
(to-string (string-trim-right string "\n+"))
|
|
|
|
(t (let ((len (length string)))
|
|
|
|
(if (= len 0)
|
|
|
|
string
|
|
|
|
(when (eq (aref string (1- len)) ?\n)
|
2000-06-23 04:39:18 +00:00
|
|
|
(setq string (substring string 0 (1- len))))
|
2022-05-01 22:09:17 -07:00
|
|
|
(if (string-search "\n" string)
|
|
|
|
(let ((lines (split-string string "\n")))
|
|
|
|
(if (seq-every-p #'eshell-convertible-to-number-p lines)
|
|
|
|
(mapcar #'string-to-number lines)
|
|
|
|
lines))
|
|
|
|
(eshell-convert-to-number string)))))))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
Prefer defvar-local in remaining libraries
* lisp/align.el (align-mode-rules-list)
(align-mode-exclude-rules-list):
* lisp/bookmark.el (bookmark-current-bookmark)
(bookmark-annotation-name)
(bookmark--annotation-from-bookmark-list):
* lisp/calc/calc-embed.el (calc-embedded-all-active)
(calc-embedded-some-active):
* lisp/comint.el (comint-password-function):
* lisp/completion.el (completion-syntax-table):
* lisp/dframe.el (dframe-track-mouse-function)
(dframe-help-echo-function, dframe-mouse-click-function)
(dframe-mouse-position-function, dframe-timer)
(dframe-attached-frame, dframe-controlled):
* lisp/ehelp.el (electric-help-orig-major-mode):
* lisp/eshell/esh-util.el (eshell-path-env):
* lisp/expand.el (expand-pos, expand-index, expand-point):
* lisp/face-remap.el (text-scale-mode-remapping)
(text-scale-mode-lighter, text-scale-mode-amount)
(text-scale-remap-header-line, buffer-face-mode-remapping):
* lisp/ffap.el (ffap-menu-alist):
* lisp/files-x.el (connection-local-variables-alist):
* lisp/foldout.el (foldout-fold-list, foldout-mode-line-string):
* lisp/follow.el (follow-start-end-invalid):
* lisp/forms.el (forms--mode-setup):
* lisp/gnus/message.el (message-cross-post-old-target)
(message-options):
* lisp/help-mode.el (help-xref-stack, help-xref-forward-stack)
(help-xref-stack-item, help-xref-stack-forward-item):
* lisp/hexl.el (hexl-mode--old-var-vals, hexl-ascii-overlay):
* lisp/hilit-chg.el (hilit-chg-string):
* lisp/ido.el (ido-eoinput):
* lisp/imenu.el (imenu-generic-expression)
(imenu-create-index-function, imenu-default-goto-function)
(imenu-prev-index-position-function)
(imenu-extract-index-name-function, imenu-name-lookup-function)
(imenu-syntax-alist, imenu-case-fold-search):
* lisp/jka-compr.el (jka-compr-really-do-compress):
* lisp/language/ethio-util.el (ethio-prefer-ascii-space):
* lisp/leim/quail/hangul.el (hangul-input-method-help-text):
* lisp/leim/quail/japanese.el (quail-japanese-package-saved):
* lisp/linum.el (linum-overlays, linum-available):
* lisp/man.el (Man-original-frame, Man-arguments, Man--sections)
(Man--refpages, Man-page-list, Man-current-page)
(Man-page-mode-string):
* lisp/pcomplete.el (pcomplete-current-completions)
(pcomplete-last-completion-length)
(pcomplete-last-completion-stub, pcomplete-last-completion-raw)
(pcomplete-last-window-config, pcomplete-window-restore-timer):
* lisp/reveal.el (reveal-open-spots, reveal-last-tick):
* lisp/ruler-mode.el (ruler-mode):
* lisp/scroll-lock.el (scroll-lock-preserve-screen-pos-save):
* lisp/server.el (server-buffer-clients, server-existing-buffer):
* lisp/tab-line.el (tab-line-exclude):
* lisp/tar-mode.el (tar-data-buffer, tar-data-swapped):
* lisp/thumbs.el (thumbs-current-tmp-filename)
(thumbs-current-image-filename, thumbs-extra-images)
(thumbs-image-num, thumbs-buffer, thumbs-marked-list):
* lisp/tutorial.el (tutorial--point-before-chkeys)
(tutorial--point-after-chkeys, tutorial--lang):
* lisp/url/url-vars.el (url-current-object)
(url-current-mime-headers, url-current-lastloc):
* lisp/view.el (view-mode, view-old-buffer-read-only)
(view-old-Helper-return-blurb, view-page-size)
(view-half-page-size, view-last-regexp, view-return-to-alist)
(view-exit-action, view-overlay):
* lisp/wid-edit.el (widget-global-map, widget-field-new)
(widget-field-list, widget-field-last, widget-field-was):
* lisp/woman.el (woman-imenu-done): Prefer defvar-local.
2021-02-02 09:55:40 +01:00
|
|
|
(defvar-local eshell-path-env (getenv "PATH")
|
2009-11-24 10:25:54 +00:00
|
|
|
"Content of $PATH.
|
2015-09-17 16:08:20 -07:00
|
|
|
It might be different from \(getenv \"PATH\"), when
|
2009-11-24 10:25:54 +00:00
|
|
|
`default-directory' points to a remote host.")
|
|
|
|
|
2022-09-15 12:24:37 -07:00
|
|
|
(make-obsolete-variable 'eshell-path-env 'eshell-get-path "29.1")
|
|
|
|
|
|
|
|
(defvar-local eshell-path-env-list nil)
|
|
|
|
|
|
|
|
(connection-local-set-profile-variables
|
|
|
|
'eshell-connection-default-profile
|
|
|
|
'((eshell-path-env-list . nil)))
|
|
|
|
|
|
|
|
(connection-local-set-profiles
|
|
|
|
'(:application eshell)
|
|
|
|
'eshell-connection-default-profile)
|
|
|
|
|
|
|
|
(defun eshell-get-path (&optional literal-p)
|
2019-06-08 11:32:38 +03:00
|
|
|
"Return $PATH as a list.
|
2022-09-15 12:24:37 -07:00
|
|
|
If LITERAL-P is nil, return each directory of the path as a full,
|
|
|
|
possibly-remote file name; on MS-Windows, add the current
|
|
|
|
directory as the first directory in the path as well.
|
|
|
|
|
|
|
|
If LITERAL-P is non-nil, return the local part of each directory,
|
|
|
|
as the $PATH was actually specified."
|
|
|
|
(with-connection-local-application-variables 'eshell
|
|
|
|
(let ((remote (file-remote-p default-directory))
|
|
|
|
(path
|
|
|
|
(or eshell-path-env-list
|
|
|
|
;; If not already cached, get the path from
|
|
|
|
;; `exec-path', removing the last element, which is
|
|
|
|
;; `exec-directory'.
|
|
|
|
(setq-connection-local eshell-path-env-list
|
|
|
|
(butlast (exec-path))))))
|
|
|
|
(when (and (not literal-p)
|
|
|
|
(not remote)
|
|
|
|
(eshell-under-windows-p))
|
|
|
|
(push "." path))
|
|
|
|
(if (and remote (not literal-p))
|
|
|
|
(mapcar (lambda (x) (file-name-concat remote x)) path)
|
|
|
|
path))))
|
|
|
|
|
|
|
|
(defun eshell-set-path (path)
|
|
|
|
"Set the Eshell $PATH to PATH.
|
|
|
|
PATH can be either a list of directories or a string of
|
|
|
|
directories separated by `path-separator'."
|
|
|
|
(with-connection-local-application-variables 'eshell
|
|
|
|
(setq-connection-local
|
|
|
|
eshell-path-env-list
|
|
|
|
(if (listp path)
|
|
|
|
path
|
|
|
|
;; Don't use `parse-colon-path' here, since we don't want
|
2022-11-11 15:46:23 +01:00
|
|
|
;; the additional translations it does on each element.
|
2022-09-15 12:24:37 -07:00
|
|
|
(split-string path (path-separator))))))
|
2019-05-30 10:13:00 +02:00
|
|
|
|
2009-11-24 10:25:54 +00:00
|
|
|
(defun eshell-parse-colon-path (path-env)
|
|
|
|
"Split string with `parse-colon-path'.
|
|
|
|
Prepend remote identification of `default-directory', if any."
|
2022-09-15 12:24:37 -07:00
|
|
|
(declare (obsolete nil "29.1"))
|
2009-11-24 10:25:54 +00:00
|
|
|
(let ((remote (file-remote-p default-directory)))
|
|
|
|
(if remote
|
|
|
|
(mapcar
|
|
|
|
(lambda (x) (concat remote x))
|
|
|
|
(parse-colon-path path-env))
|
|
|
|
(parse-colon-path path-env))))
|
|
|
|
|
2000-06-23 04:39:18 +00:00
|
|
|
(defun eshell-split-path (path)
|
|
|
|
"Split a path into multiple subparts."
|
|
|
|
(let ((len (length path))
|
|
|
|
(i 0) (li 0)
|
|
|
|
parts)
|
|
|
|
(if (and (eshell-under-windows-p)
|
|
|
|
(> len 2)
|
2005-05-31 00:14:26 +00:00
|
|
|
(eq (aref path 0) ?/)
|
|
|
|
(eq (aref path 1) ?/))
|
2000-06-23 04:39:18 +00:00
|
|
|
(setq i 2))
|
|
|
|
(while (< i len)
|
2005-05-31 00:14:26 +00:00
|
|
|
(if (and (eq (aref path i) ?/)
|
2000-06-23 04:39:18 +00:00
|
|
|
(not (get-text-property i 'escaped path)))
|
2005-05-31 00:14:26 +00:00
|
|
|
(setq parts (cons (if (= li i) "/"
|
2000-06-23 04:39:18 +00:00
|
|
|
(substring path li (1+ i))) parts)
|
|
|
|
li (1+ i)))
|
|
|
|
(setq i (1+ i)))
|
|
|
|
(if (< li i)
|
|
|
|
(setq parts (cons (substring path li i) parts)))
|
|
|
|
(if (and (eshell-under-windows-p)
|
|
|
|
(string-match "\\`[A-Za-z]:\\'" (car (last parts))))
|
2005-05-31 00:14:26 +00:00
|
|
|
(setcar (last parts) (concat (car (last parts)) "/")))
|
2000-06-23 04:39:18 +00:00
|
|
|
(nreverse parts)))
|
|
|
|
|
|
|
|
(defun eshell-to-flat-string (value)
|
|
|
|
"Make value a string. If separated by newlines change them to spaces."
|
2022-05-02 16:56:49 -07:00
|
|
|
(declare (obsolete nil "29.1"))
|
2000-06-23 04:39:18 +00:00
|
|
|
(let ((text (eshell-stringify value)))
|
|
|
|
(if (string-match "\n+\\'" text)
|
|
|
|
(setq text (replace-match "" t t text)))
|
|
|
|
(while (string-match "\n+" text)
|
|
|
|
(setq text (replace-match " " t t text)))
|
|
|
|
text))
|
|
|
|
|
New function flatten-tree
Co-authored-by: Basil L. Contovounesios <contovob@tcd.ie>
* doc/lispref/lists.texi: Document `flatten-tree'.
* lisp/progmodes/js.el (js--maybe-join):
* lisp/printing.el (pr-switches):
* lisp/lpr.el (lpr-print-region):
* lisp/gnus/nnimap.el (nnimap-find-wanted-parts):
* lisp/gnus/message.el (message-talkative-question):
* lisp/gnus/gnus-sum.el (gnus-remove-thread)
(gnus-thread-highest-number, gnus-thread-latest-date):
* lisp/eshell/esh-util.el (eshell-flatten-and-stringify):
* lisp/eshell/esh-opt.el (eshell-eval-using-options):
* lisp/eshell/esh-ext.el (eshell-external-command):
* lisp/eshell/em-xtra.el (eshell/expr):
* lisp/eshell/em-unix.el (eshell/rm, eshell-mvcpln-template)
(eshell/cat, eshell/make, eshell-poor-mans-grep, eshell-grep)
(eshell/du, eshell/time, eshell/diff, eshell/locate):
* lisp/eshell/em-tramp.el (eshell/su, eshell/sudo):
* lisp/eshell/em-term.el (eshell-exec-visual):
* lisp/eshell/em-dirs.el (eshell-dirs-substitute-cd, eshell/cd):
* lisp/eshell/em-basic.el (eshell/printnl):
Use new flatten-tree.
* lisp/progmodes/js.el (js--flatten-list):
* lisp/lpr.el (lpr-flatten-list):
* lisp/gnus/message.el (message-flatten-list):
* lisp/eshell/esh-util.el (eshell-flatten-list):
Obsolete in favor of Emacs-wide `flatten-tree'.
* lisp/subr.el (flatten-list): Alias to `flatten-tree' for
discoverability.
* lisp/subr.el (flatten-tree): New defun.
* test/lisp/subr-tests.el (subr-tests-flatten-tree): New test.
2018-12-17 12:15:09 +01:00
|
|
|
(define-obsolete-function-alias 'eshell-flatten-list #'flatten-tree "27.1")
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defun eshell-stringify (object)
|
|
|
|
"Convert OBJECT into a string value."
|
|
|
|
(cond
|
|
|
|
((stringp object) object)
|
|
|
|
((numberp object)
|
|
|
|
(number-to-string object))
|
2022-09-18 17:42:09 -07:00
|
|
|
((and (eq object t)
|
|
|
|
(not eshell-stringify-t))
|
|
|
|
nil)
|
2000-06-23 04:39:18 +00:00
|
|
|
(t
|
2022-09-18 17:42:09 -07:00
|
|
|
(string-trim-right (pp-to-string object)))))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defsubst eshell-stringify-list (args)
|
|
|
|
"Convert each element of ARGS into a string value."
|
2021-04-11 22:46:48 -04:00
|
|
|
(mapcar #'eshell-stringify args))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2022-11-08 22:49:23 -08:00
|
|
|
(defsubst eshell-list-to-string (list)
|
|
|
|
"Convert LIST into a single string separated by spaces."
|
|
|
|
(mapconcat #'eshell-stringify list " "))
|
|
|
|
|
2000-06-23 04:39:18 +00:00
|
|
|
(defsubst eshell-flatten-and-stringify (&rest args)
|
|
|
|
"Flatten and stringify all of the ARGS into a single string."
|
2022-11-08 22:49:23 -08:00
|
|
|
(eshell-list-to-string (flatten-tree args)))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defsubst eshell-directory-files (regexp &optional directory)
|
|
|
|
"Return a list of files in the given DIRECTORY matching REGEXP."
|
|
|
|
(directory-files (or directory default-directory)
|
|
|
|
directory regexp))
|
|
|
|
|
|
|
|
(defun eshell-regexp-arg (prompt)
|
|
|
|
"Return list of regexp and prefix arg using PROMPT."
|
|
|
|
(let* (;; Don't clobber this.
|
|
|
|
(last-command last-command)
|
|
|
|
(regexp (read-from-minibuffer prompt nil nil nil
|
|
|
|
'minibuffer-history-search-history)))
|
|
|
|
(list (if (string-equal regexp "")
|
|
|
|
(setcar minibuffer-history-search-history
|
|
|
|
(nth 1 minibuffer-history-search-history))
|
|
|
|
regexp)
|
|
|
|
(prefix-numeric-value current-prefix-arg))))
|
|
|
|
|
|
|
|
(defun eshell-printable-size (filesize &optional human-readable
|
|
|
|
block-size use-colors)
|
|
|
|
"Return a printable FILESIZE."
|
|
|
|
(let ((size (float (or filesize 0))))
|
|
|
|
(if human-readable
|
|
|
|
(if (< size human-readable)
|
|
|
|
(if (= (round size) 0)
|
|
|
|
"0"
|
|
|
|
(if block-size
|
|
|
|
"1.0k"
|
|
|
|
(format "%.0f" size)))
|
|
|
|
(setq size (/ size human-readable))
|
|
|
|
(if (< size human-readable)
|
|
|
|
(if (<= size 9.94)
|
|
|
|
(format "%.1fk" size)
|
|
|
|
(format "%.0fk" size))
|
|
|
|
(setq size (/ size human-readable))
|
|
|
|
(if (< size human-readable)
|
|
|
|
(let ((str (if (<= size 9.94)
|
|
|
|
(format "%.1fM" size)
|
|
|
|
(format "%.0fM" size))))
|
|
|
|
(if use-colors
|
|
|
|
(put-text-property 0 (length str)
|
|
|
|
'face 'bold str))
|
|
|
|
str)
|
|
|
|
(setq size (/ size human-readable))
|
|
|
|
(if (< size human-readable)
|
|
|
|
(let ((str (if (<= size 9.94)
|
|
|
|
(format "%.1fG" size)
|
|
|
|
(format "%.0fG" size))))
|
|
|
|
(if use-colors
|
|
|
|
(put-text-property 0 (length str)
|
|
|
|
'face 'bold-italic str))
|
|
|
|
str)))))
|
|
|
|
(if block-size
|
|
|
|
(setq size (/ size block-size)))
|
|
|
|
(format "%.0f" size))))
|
|
|
|
|
|
|
|
(defun eshell-winnow-list (entries exclude &optional predicates)
|
|
|
|
"Pare down the ENTRIES list using the EXCLUDE regexp, and PREDICATES.
|
|
|
|
The original list is not affected. If the result is only one element
|
|
|
|
long, it will be returned itself, rather than returning a one-element
|
|
|
|
list."
|
|
|
|
(let ((flist (list t))
|
|
|
|
valid p listified)
|
|
|
|
(unless (listp entries)
|
|
|
|
(setq entries (list entries)
|
|
|
|
listified t))
|
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 entries)
|
2000-06-23 04:39:18 +00:00
|
|
|
(unless (and exclude (string-match exclude entry))
|
|
|
|
(setq p predicates valid (null p))
|
|
|
|
(while p
|
|
|
|
(if (funcall (car p) entry)
|
|
|
|
(setq valid t)
|
|
|
|
(setq p nil valid nil))
|
|
|
|
(setq p (cdr p)))
|
|
|
|
(when valid
|
|
|
|
(nconc flist (list entry)))))
|
|
|
|
(if listified
|
|
|
|
(cadr flist)
|
|
|
|
(cdr flist))))
|
|
|
|
|
|
|
|
(defsubst eshell-redisplay ()
|
|
|
|
"Allow Emacs to redisplay buffers."
|
|
|
|
;; for some strange reason, Emacs 21 is prone to trigger an
|
|
|
|
;; "args out of range" error in `sit-for', if this function
|
|
|
|
;; runs while point is in the minibuffer and the users attempt
|
|
|
|
;; to use completion. Don't ask me.
|
2007-12-05 07:07:12 +00:00
|
|
|
(condition-case nil
|
2022-10-18 18:43:50 -04:00
|
|
|
(sit-for 0)
|
2007-12-05 07:07:12 +00:00
|
|
|
(error nil)))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defun eshell-read-passwd-file (file)
|
|
|
|
"Return an alist correlating gids to group names in FILE."
|
|
|
|
(let (names)
|
|
|
|
(when (file-readable-p file)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents file)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(let* ((fields
|
|
|
|
(split-string (buffer-substring
|
|
|
|
(point) (progn (end-of-line)
|
|
|
|
(point))) ":")))
|
2000-08-29 00:37:10 +00:00
|
|
|
(if (and (and fields (nth 0 fields) (nth 2 fields))
|
2005-05-31 00:14:26 +00:00
|
|
|
(not (assq (string-to-number (nth 2 fields)) names)))
|
|
|
|
(setq names (cons (cons (string-to-number (nth 2 fields))
|
2000-06-23 04:39:18 +00:00
|
|
|
(nth 0 fields))
|
|
|
|
names))))
|
|
|
|
(forward-line))))
|
|
|
|
names))
|
|
|
|
|
|
|
|
(defun eshell-read-passwd (file result-var timestamp-var)
|
|
|
|
"Read the contents of /etc/passwd for user names."
|
|
|
|
(if (or (not (symbol-value result-var))
|
|
|
|
(not (symbol-value timestamp-var))
|
2010-11-09 19:57:32 -08:00
|
|
|
(time-less-p
|
2000-06-23 04:39:18 +00:00
|
|
|
(symbol-value timestamp-var)
|
file-attributes cleanup
Mostly, this replaces magic-number calls like (nth 4 A) with
more-informative calls like (file-attribute-access-time A).
It also fixes some documentation and minor timestamp coding
issues that I noticed while looking into this.
* doc/lispref/files.texi (File Attributes):
* lisp/files.el (file-attribute-size)
(file-attribute-inode-number, file-attribute-device-number):
* src/dired.c (Fdirectory_files_and_attributes)
(Ffile_attributes):
Mention which attributes must be integers, or nonnegative integers,
as opposed to merely being numbers. Remove no-longer-correct
talk about representing large integers as conses of integers.
* doc/lispref/files.texi (Magic File Names):
* doc/misc/gnus.texi (Low-level interface to the spam-stat dictionary):
* lisp/autorevert.el (auto-revert-find-file-function)
(auto-revert-tail-mode, auto-revert-handler):
* lisp/auth-source.el (auth-source-netrc-parse):
* lisp/cedet/ede/files.el (ede--inode-for-dir):
* lisp/cedet/semantic/db-file.el (object-write):
* lisp/cedet/semantic/db-mode.el (semanticdb-kill-hook):
* lisp/cedet/semantic/db.el (semanticdb-needs-refresh-p)
(semanticdb-synchronize):
* lisp/cedet/srecode/table.el (srecode-mode-table-new):
* lisp/desktop.el (desktop-save, desktop-read):
* lisp/dired-aux.el (dired-file-set-difference)
(dired-do-chxxx, dired-do-chmod, dired-copy-file-recursive)
(dired-create-files):
* lisp/dired.el (dired-directory-changed-p, dired-readin):
* lisp/dos-w32.el (w32-direct-print-region-helper):
* lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads)
(autoload-find-destination, update-directory-autoloads):
* lisp/emacs-lisp/shadow.el (load-path-shadows-same-file-or-nonexistent):
* lisp/epg.el (epg--start, epg-wait-for-completion):
* lisp/eshell/em-ls.el (eshell-ls-filetype-p)
(eshell-ls-applicable, eshell-ls-size-string)
(eshell-ls-file, eshell-ls-dir, eshell-ls-files)
(eshell-ls-entries):
* lisp/eshell/em-pred.el (eshell-predicate-alist)
(eshell-pred-file-type, eshell-pred-file-links)
(eshell-pred-file-size):
* lisp/eshell/em-unix.el (eshell-shuffle-files, eshell/cat)
(eshell-du-sum-directory, eshell/du):
* lisp/eshell/esh-util.el (eshell-read-passwd)
(eshell-read-hosts):
* lisp/files.el (remote-file-name-inhibit-cache)
(find-file-noselect, insert-file-1, dir-locals-find-file)
(dir-locals-read-from-dir, backup-buffer)
(file-ownership-preserved-p, copy-directory)
(read-file-modes):
* lisp/find-lisp.el (find-lisp-format):
* lisp/gnus/gnus-agent.el (gnus-agent-unfetch-articles)
(gnus-agent-read-agentview, gnus-agent-expire-group-1)
(gnus-agent-request-article, gnus-agent-regenerate-group)
(gnus-agent-update-files-total-fetched-for)
(gnus-agent-update-view-total-fetched-for):
* lisp/gnus/gnus-cache.el (gnus-cache-read-active)
(gnus-cache-update-file-total-fetched-for)
(gnus-cache-update-overview-total-fetched-for):
* lisp/gnus/gnus-cloud.el (gnus-cloud-file-new-p):
* lisp/gnus/gnus-score.el (gnus-score-score-files):
* lisp/gnus/gnus-start.el (gnus-save-newsrc-file)
(gnus-master-read-slave-newsrc):
* lisp/gnus/gnus-sum.el (gnus-summary-import-article):
* lisp/gnus/gnus-util.el (gnus-file-newer-than)
(gnus-cache-file-contents):
* lisp/gnus/mail-source.el (mail-source-delete-old-incoming)
(mail-source-callback, mail-source-movemail):
* lisp/gnus/nneething.el (nneething-create-mapping)
(nneething-make-head):
* lisp/gnus/nnfolder.el (nnfolder-read-folder):
* lisp/gnus/nnheader.el (nnheader-file-size)
(nnheader-insert-nov-file):
* lisp/gnus/nnmail.el (nnmail-activate):
* lisp/gnus/nnmaildir.el (nnmaildir--group-maxnum)
(nnmaildir--new-number, nnmaildir--update-nov)
(nnmaildir--scan, nnmaildir-request-scan)
(nnmaildir-request-update-info)
(nnmaildir-request-expire-articles):
* lisp/gnus/nnmh.el (nnmh-request-list-1)
(nnmh-request-expire-articles, nnmh-update-gnus-unreads):
* lisp/gnus/nnml.el (nnml-request-expire-articles):
* lisp/gnus/spam-stat.el (spam-stat-save, spam-stat-load)
(spam-stat-process-directory, spam-stat-test-directory):
* lisp/ido.el (ido-directory-too-big-p)
(ido-file-name-all-completions):
* lisp/image-dired.el (image-dired-get-thumbnail-image)
(image-dired-create-thumb-1):
* lisp/info.el (info-insert-file-contents):
* lisp/ls-lisp.el (ls-lisp-insert-directory)
(ls-lisp-handle-switches, ls-lisp-classify-file)
(ls-lisp-format):
* lisp/mail/blessmail.el:
* lisp/mail/feedmail.el (feedmail-default-date-generator)
(feedmail-default-message-id-generator):
* lisp/mail/mailabbrev.el (mail-abbrevs-sync-aliases)
(mail-abbrevs-setup):
* lisp/mail/mspools.el (mspools-size-folder):
* lisp/mail/rmail.el (rmail-insert-inbox-text):
* lisp/mail/sendmail.el (sendmail-sync-aliases):
* lisp/mh-e/mh-alias.el (mh-alias-tstamp):
* lisp/net/ange-ftp.el (ange-ftp-parse-netrc)
(ange-ftp-write-region, ange-ftp-file-newer-than-file-p)
(ange-ftp-cf1):
* lisp/net/eudcb-mab.el (eudc-mab-query-internal):
* lisp/net/eww.el (eww-read-bookmarks):
* lisp/net/netrc.el (netrc-parse):
* lisp/net/newst-backend.el (newsticker--image-get):
* lisp/nxml/rng-loc.el (rng-get-parsed-schema-locating-file):
* lisp/obsolete/fast-lock.el (fast-lock-save-cache):
* lisp/obsolete/vc-arch.el (vc-arch-state)
(vc-arch-diff3-rej-p):
* lisp/org/ob-eval.el (org-babel--shell-command-on-region):
* lisp/org/org-attach.el (org-attach-commit):
* lisp/org/org-macro.el (org-macro-initialize-templates):
* lisp/org/org.el (org-babel-load-file)
(org-file-newer-than-p):
* lisp/org/ox-html.el (org-html-format-spec):
* lisp/org/ox-publish.el (org-publish-find-date)
(org-publish-cache-ctime-of-src):
* lisp/pcmpl-gnu.el (pcomplete/tar):
* lisp/pcmpl-rpm.el (pcmpl-rpm-packages):
* lisp/play/cookie1.el (cookie-snarf):
* lisp/progmodes/cmacexp.el (c-macro-expansion):
* lisp/ps-bdf.el (bdf-file-mod-time):
* lisp/server.el (server-ensure-safe-dir):
* lisp/simple.el (shell-command-on-region):
* lisp/speedbar.el (speedbar-item-info-file-helper)
(speedbar-check-obj-this-line):
* lisp/thumbs.el (thumbs-cleanup-thumbsdir):
* lisp/time.el (display-time-mail-check-directory)
(display-time-file-nonempty-p):
* lisp/url/url-cache.el (url-is-cached):
* lisp/url/url-file.el (url-file-asynch-callback):
* lisp/vc/diff-mode.el (diff-delete-if-empty):
* lisp/vc/pcvs-info.el (cvs-fileinfo-from-entries):
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
* lisp/vc/vc-cvs.el (vc-cvs-checkout-model)
(vc-cvs-state-heuristic, vc-cvs-merge-news)
(vc-cvs-retrieve-tag, vc-cvs-parse-status, vc-cvs-parse-entry):
* lisp/vc/vc-hg.el (vc-hg--slurp-hgignore-1)
(vc-hg--ignore-patterns-valid-p)
(vc-hg--cached-dirstate-search, vc-hg-state-fast):
* lisp/vc/vc-hooks.el (vc-after-save):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
* lisp/vc/vc-svn.el (vc-svn-merge-news, vc-svn-parse-status):
* lisp/vc/vc.el (vc-checkout, vc-checkin, vc-revert-file):
* lisp/xdg.el (xdg-mime-apps):
Prefer (file-attribute-size A) to (nth 7 A), and similarly
for other file attributes accessors.
* doc/lispref/files.texi (File Attributes):
* doc/lispref/intro.texi (Version Info):
* doc/lispref/os.texi (Idle Timers):
* lisp/erc/erc.el (erc-string-to-emacs-time):
* lisp/files.el (file-attribute-access-time)
(file-attribute-modification-time)
(file-attribute-status-change-time):
* lisp/net/tramp-compat.el:
(tramp-compat-file-attribute-modification-time)
(tramp-compat-file-attribute-size):
* src/buffer.c (syms_of_buffer):
* src/editfns.c (Fget_internal_run_time):
* src/fileio.c (Fvisited_file_modtime)
(Fset_visited_file_modtime):
* src/keyboard.c (Fcurrent_idle_time):
* src/process.c (Fprocess_attributes):
Defer implementation details about timestamp format to the
section that talks about timestamp format, to make it easier
to change the documentation later if timestamp formats are
extended.
* lisp/gnus/gnus-util.el (gnus-file-newer-than):
* lisp/speedbar.el (speedbar-check-obj-this-line):
* lisp/vc/vc-rcs.el (vc-rcs-workfile-is-newer):
Prefer time-less-p to doing it by hand.
* lisp/ls-lisp.el (ls-lisp-format): Inode numbers are no longer conses.
* lisp/vc/vc-bzr.el (vc-bzr-state-heuristic):
Use eql, not eq, to compare integers that might be bignums.
* lisp/org/ox-publish.el (org-publish-cache-ctime-of-src):
Prefer float-time to doing time arithmetic by hand.
2018-09-23 18:30:46 -07:00
|
|
|
(file-attribute-modification-time (file-attributes file))))
|
2000-06-23 04:39:18 +00:00
|
|
|
(progn
|
|
|
|
(set result-var (eshell-read-passwd-file file))
|
|
|
|
(set timestamp-var (current-time))))
|
|
|
|
(symbol-value result-var))
|
|
|
|
|
|
|
|
(defun eshell-read-group-names ()
|
|
|
|
"Read the contents of /etc/group for group names."
|
|
|
|
(if eshell-group-file
|
|
|
|
(eshell-read-passwd eshell-group-file 'eshell-group-names
|
|
|
|
'eshell-group-timestamp)))
|
|
|
|
|
|
|
|
(defsubst eshell-group-id (name)
|
|
|
|
"Return the user id for user NAME."
|
|
|
|
(car (rassoc name (eshell-read-group-names))))
|
|
|
|
|
|
|
|
(defsubst eshell-group-name (gid)
|
|
|
|
"Return the group name for the given GID."
|
|
|
|
(cdr (assoc gid (eshell-read-group-names))))
|
|
|
|
|
|
|
|
(defun eshell-read-user-names ()
|
|
|
|
"Read the contents of /etc/passwd for user names."
|
|
|
|
(if eshell-passwd-file
|
|
|
|
(eshell-read-passwd eshell-passwd-file 'eshell-user-names
|
|
|
|
'eshell-user-timestamp)))
|
|
|
|
|
|
|
|
(defsubst eshell-user-id (name)
|
|
|
|
"Return the user id for user NAME."
|
|
|
|
(car (rassoc name (eshell-read-user-names))))
|
|
|
|
|
Move several completions from eshell to pcomplete (Bug#10585)
* lisp/eshell/em-unix.el (eshell-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
Move from here...
* lisp/pcmpl-unix.el (pcmpl-unix-complete-hostname)
(pcomplete/ftp, pcomplete/ncftp, pcomplete/ping)
(pcomplete/rlogin, pcomplete/telnet, pcomplete/rsh):
...to here. Make old names into aliases.
* lisp/eshell/esh-util.el (eshell-hosts-file)
(eshell-host-names, eshell-host-timestamp)
(eshell-read-hosts-file, eshell-read-hosts)
(eshell-read-host-names): Move from here...
* lisp/pcomplete.el (pcomplete-hosts-file)
(pcomplete--host-name-cache)
(pcomplete--host-name-cache-timestamp)
(pcomplete-read-hosts-file, pcomplete-read-hosts)
(pcomplete-read-host-names): ...to here. Make old names into
aliases.
* lisp/eshell/em-unix.el (eshell-complete-host-reference): Update
caller.
2020-09-02 02:45:39 +02:00
|
|
|
(autoload 'pcomplete-read-hosts-file "pcomplete")
|
|
|
|
(autoload 'pcomplete-read-hosts "pcomplete")
|
|
|
|
(autoload 'pcomplete-read-host-names "pcomplete")
|
|
|
|
(define-obsolete-function-alias 'eshell-read-hosts-file
|
|
|
|
#'pcomplete-read-hosts-file "28.1")
|
|
|
|
(define-obsolete-function-alias 'eshell-read-hosts
|
|
|
|
#'pcomplete-read-hosts "28.1")
|
|
|
|
(define-obsolete-function-alias 'eshell-read-host-names
|
|
|
|
#'pcomplete-read-host-names "28.1")
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defsubst eshell-copy-environment ()
|
|
|
|
"Return an unrelated copy of `process-environment'."
|
2021-04-11 22:46:48 -04:00
|
|
|
(mapcar #'concat process-environment))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defun eshell-subgroups (groupsym)
|
|
|
|
"Return all of the subgroups of GROUPSYM."
|
|
|
|
(let ((subgroups (get groupsym 'custom-group))
|
|
|
|
(subg (list t)))
|
|
|
|
(while subgroups
|
|
|
|
(if (eq (cadr (car subgroups)) 'custom-group)
|
|
|
|
(nconc subg (list (caar subgroups))))
|
|
|
|
(setq subgroups (cdr subgroups)))
|
|
|
|
(cdr subg)))
|
|
|
|
|
|
|
|
(defmacro eshell-with-file-modes (modes &rest forms)
|
|
|
|
"Evaluate, with file-modes set to MODES, the given FORMS."
|
2014-09-29 14:14:08 -04:00
|
|
|
(declare (obsolete with-file-modes "25.1"))
|
2014-05-14 10:15:15 -07:00
|
|
|
`(with-file-modes ,modes ,@forms))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defmacro eshell-with-private-file-modes (&rest forms)
|
|
|
|
"Evaluate FORMS with private file modes set."
|
2014-05-14 10:15:15 -07:00
|
|
|
`(with-file-modes ,eshell-private-file-modes ,@forms))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defsubst eshell-make-private-directory (dir &optional parents)
|
|
|
|
"Make DIR with file-modes set to `eshell-private-directory-modes'."
|
2014-05-14 10:15:15 -07:00
|
|
|
(with-file-modes eshell-private-directory-modes
|
|
|
|
(make-directory dir parents)))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
(defsubst eshell-substring (string sublen)
|
|
|
|
"Return the beginning of STRING, up to SUBLEN bytes."
|
|
|
|
(if string
|
|
|
|
(if (> (length string) sublen)
|
|
|
|
(substring string 0 sublen)
|
|
|
|
string)))
|
|
|
|
|
2009-03-21 14:00:26 +00:00
|
|
|
(defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
|
2020-09-23 13:35:55 +02:00
|
|
|
"Make sure to use the handler for `directory-files-and-attributes'."
|
2009-11-29 20:19:48 +00:00
|
|
|
(let* ((dir (expand-file-name dir)))
|
|
|
|
(if (string-equal (file-remote-p dir 'method) "ftp")
|
|
|
|
(let ((files (directory-files dir full match nosort)))
|
|
|
|
(mapcar
|
|
|
|
(lambda (file)
|
|
|
|
(cons file (eshell-file-attributes (expand-file-name file dir))))
|
|
|
|
files))
|
|
|
|
(directory-files-and-attributes dir full match nosort id-format))))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2000-10-13 09:02:39 +00:00
|
|
|
(defun eshell-current-ange-uids ()
|
|
|
|
(if (string-match "/\\([^@]+\\)@\\([^:]+\\):" default-directory)
|
|
|
|
(let* ((host (match-string 2 default-directory))
|
|
|
|
(user (match-string 1 default-directory))
|
|
|
|
(host-users (assoc host eshell-ange-ls-uids)))
|
|
|
|
(when host-users
|
|
|
|
(setq host-users (cdr host-users))
|
|
|
|
(cdr (assoc user host-users))))))
|
|
|
|
|
2019-08-01 13:38:41 +02:00
|
|
|
(autoload 'parse-time-string "parse-time")
|
2000-10-13 09:02:39 +00:00
|
|
|
|
2000-10-14 08:16:50 +00:00
|
|
|
(eval-when-compile
|
2022-08-08 17:11:52 +02:00
|
|
|
(require 'ange-ftp)) ; ange-ftp-parse-filename
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-22 21:57:27 -07:00
|
|
|
|
|
|
|
(defvar tramp-file-name-structure)
|
|
|
|
(declare-function ange-ftp-ls "ange-ftp"
|
|
|
|
(file lsargs parse &optional no-error wildcard))
|
|
|
|
(declare-function ange-ftp-file-modtime "ange-ftp" (file))
|
2000-10-14 08:16:50 +00:00
|
|
|
|
2000-10-13 09:02:39 +00:00
|
|
|
(defun eshell-parse-ange-ls (dir)
|
Silence many eshell compilation warnings
* lisp/eshell/em-tramp.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/em-xtra.el: Adjust requires.
(eshell-parse-command): Autoload.
* lisp/eshell/esh-ext.el: Adjust requires.
(eshell-parse-command, eshell-close-handles): Autoload.
* lisp/eshell/esh-io.el: Adjust requires.
(eshell-output-filter): Autoload.
* lisp/eshell/esh-util.el: No need to load tramp when compiling.
(tramp-file-name-structure, ange-ftp-ls, ange-ftp-file-modtime): Declare.
(eshell-parse-ange-ls): Require ange-ftp and tramp.
* lisp/eshell/em-alias.el, lisp/eshell/em-banner.el, lisp/eshell/em-basic.el:
* lisp/eshell/em-cmpl.el, lisp/eshell/em-glob.el, lisp/eshell/em-pred.el:
* lisp/eshell/em-prompt.el, lisp/eshell/em-rebind.el, lisp/eshell/em-smart.el:
* lisp/eshell/em-term.el, lisp/eshell/esh-arg.el, lisp/eshell/esh-mode.el:
* lisp/eshell/esh-opt.el, lisp/eshell/esh-proc.el:
* lisp/eshell/esh-var.el: Adjust requires.
* lisp/eshell/eshell.el: Do not require esh-util twice.
(eshell-add-input-to-history): Declare.
(eshell-command): Check history module is active before using it.
2013-05-22 21:57:27 -07:00
|
|
|
(require 'ange-ftp)
|
|
|
|
(require 'tramp)
|
2009-11-29 20:19:48 +00:00
|
|
|
(let ((ange-ftp-name-format
|
|
|
|
(list (nth 0 tramp-file-name-structure)
|
|
|
|
(nth 3 tramp-file-name-structure)
|
|
|
|
(nth 2 tramp-file-name-structure)
|
|
|
|
(nth 4 tramp-file-name-structure)))
|
|
|
|
;; ange-ftp uses `ange-ftp-ftp-name-arg' and `ange-ftp-ftp-name-res'
|
|
|
|
;; for optimization in `ange-ftp-ftp-name'. If Tramp wasn't active,
|
|
|
|
;; there could be incorrect values from previous calls in case the
|
|
|
|
;; "ftp" method is used in the Tramp file name. So we unset
|
|
|
|
;; those values.
|
|
|
|
(ange-ftp-ftp-name-arg "")
|
|
|
|
(ange-ftp-ftp-name-res nil)
|
|
|
|
entry)
|
2000-10-13 09:02:39 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(insert (ange-ftp-ls dir "-la" nil))
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (looking-at "^total [0-9]+$")
|
|
|
|
(forward-line 1))
|
|
|
|
;; Some systems put in a blank line here.
|
|
|
|
(if (eolp) (forward-line 1))
|
|
|
|
(while (looking-at
|
|
|
|
`,(concat "\\([dlscb-][rwxst-]+\\)"
|
|
|
|
"\\s-*" "\\([0-9]+\\)" "\\s-+"
|
|
|
|
"\\(\\S-+\\)" "\\s-+"
|
|
|
|
"\\(\\S-+\\)" "\\s-+"
|
|
|
|
"\\([0-9]+\\)" "\\s-+" "\\(.*\\)"))
|
|
|
|
(let* ((perms (match-string 1))
|
|
|
|
(links (string-to-number (match-string 2)))
|
|
|
|
(user (match-string 3))
|
|
|
|
(group (match-string 4))
|
|
|
|
(size (string-to-number (match-string 5)))
|
2009-02-24 03:30:46 +00:00
|
|
|
(name (ange-ftp-parse-filename))
|
2000-10-13 09:02:39 +00:00
|
|
|
(mtime
|
2019-08-01 13:38:41 +02:00
|
|
|
(let ((moment (parse-time-string (match-string 6))))
|
2019-08-01 13:46:28 +02:00
|
|
|
(if (decoded-time-second moment)
|
|
|
|
(setf (decoded-time-year moment)
|
|
|
|
(decoded-time-year (decode-time)))
|
|
|
|
(setf (decoded-time-second moment) 0)
|
|
|
|
(setf (decoded-time-minute moment) 0)
|
|
|
|
(setf (decoded-time-hour moment) 0))
|
2019-08-01 13:38:41 +02:00
|
|
|
(encode-time moment)))
|
2000-10-13 09:02:39 +00:00
|
|
|
symlink)
|
|
|
|
(if (string-match "\\(.+\\) -> \\(.+\\)" name)
|
|
|
|
(setq symlink (match-string 2 name)
|
|
|
|
name (match-string 1 name)))
|
|
|
|
(setq entry
|
|
|
|
(cons
|
|
|
|
(cons name
|
|
|
|
(list (if (eq (aref perms 0) ?d)
|
|
|
|
t
|
|
|
|
symlink)
|
|
|
|
links user group
|
|
|
|
nil mtime nil
|
|
|
|
size perms nil nil)) entry)))
|
|
|
|
(forward-line)))
|
|
|
|
entry))
|
|
|
|
|
2010-02-07 01:23:10 -05:00
|
|
|
(defun eshell-file-attributes (file &optional id-format)
|
|
|
|
"Return the attributes of FILE, playing tricks if it's over ange-ftp.
|
|
|
|
The optional argument ID-FORMAT specifies the preferred uid and
|
2015-11-17 15:28:50 -08:00
|
|
|
gid format. Valid values are `string' and `integer', defaulting to
|
|
|
|
`integer'. See `file-attributes'."
|
2022-03-19 12:41:13 -07:00
|
|
|
(let* ((expanded-file (expand-file-name file))
|
2000-10-13 09:02:39 +00:00
|
|
|
entry)
|
2022-03-19 12:41:13 -07:00
|
|
|
(if (string-equal (file-remote-p expanded-file 'method) "ftp")
|
|
|
|
(let ((base (file-name-nondirectory expanded-file))
|
|
|
|
(dir (file-name-directory expanded-file)))
|
2009-11-29 20:19:48 +00:00
|
|
|
(if (string-equal "" base) (setq base "."))
|
2009-11-24 10:25:54 +00:00
|
|
|
(unless entry
|
|
|
|
(setq entry (eshell-parse-ange-ls dir))
|
|
|
|
(if entry
|
|
|
|
(let ((fentry (assoc base (cdr entry))))
|
|
|
|
(if fentry
|
|
|
|
(setq entry (cdr fentry))
|
2009-11-29 20:19:48 +00:00
|
|
|
(setq entry nil)))))
|
|
|
|
entry)
|
2010-02-07 01:23:10 -05:00
|
|
|
(file-attributes file id-format))))
|
2000-10-13 09:02:39 +00:00
|
|
|
|
2000-08-29 00:37:10 +00:00
|
|
|
(defsubst eshell-processp (proc)
|
|
|
|
"If the `processp' function does not exist, PROC is not a process."
|
|
|
|
(and (fboundp 'processp) (processp proc)))
|
|
|
|
|
2022-01-30 18:53:53 -08:00
|
|
|
(defun eshell-process-pair-p (procs)
|
|
|
|
"Return non-nil if PROCS is a pair of process objects."
|
|
|
|
(and (consp procs)
|
|
|
|
(eshell-processp (car procs))
|
|
|
|
(eshell-processp (cdr procs))))
|
|
|
|
|
|
|
|
(defun eshell-make-process-pair (procs)
|
|
|
|
"Make a pair of process objects from PROCS if possible.
|
|
|
|
This represents the head and tail of a pipeline of processes,
|
|
|
|
where the head and tail may be the same process."
|
|
|
|
(pcase procs
|
|
|
|
((pred eshell-processp) (cons procs procs))
|
|
|
|
((pred eshell-process-pair-p) procs)))
|
|
|
|
|
2021-04-11 22:46:48 -04:00
|
|
|
;; (defun eshell-copy-file
|
|
|
|
;; (file newname &optional ok-if-already-exists keep-date)
|
|
|
|
;; "Copy FILE to NEWNAME. See docs for `copy-file'."
|
|
|
|
;; (let (copied)
|
|
|
|
;; (if (string-match "\\`\\([^:]+\\):\\(.*\\)" file)
|
|
|
|
;; (let ((front (match-string 1 file))
|
|
|
|
;; (back (match-string 2 file))
|
|
|
|
;; buffer)
|
|
|
|
;; (if (and front (string-match eshell-tar-regexp front)
|
|
|
|
;; (setq buffer (find-file-noselect front)))
|
|
|
|
;; (with-current-buffer buffer
|
|
|
|
;; (goto-char (point-min))
|
|
|
|
;; (if (re-search-forward (concat " " (regexp-quote back)
|
|
|
|
;; "$") nil t)
|
|
|
|
;; (progn
|
|
|
|
;; (tar-copy (if (file-directory-p newname)
|
|
|
|
;; (expand-file-name
|
|
|
|
;; (file-name-nondirectory back) newname)
|
|
|
|
;; newname))
|
|
|
|
;; (setq copied t))
|
|
|
|
;; (error "%s not found in tar file %s" back front))))))
|
|
|
|
;; (unless copied
|
|
|
|
;; (copy-file file newname ok-if-already-exists keep-date))))
|
|
|
|
|
|
|
|
;; (defun eshell-file-attributes (filename)
|
|
|
|
;; "Return a list of attributes of file FILENAME.
|
|
|
|
;; See the documentation for `file-attributes'."
|
|
|
|
;; (let (result)
|
|
|
|
;; (when (string-match "\\`\\([^:]+\\):\\(.*\\)\\'" filename)
|
|
|
|
;; (let ((front (match-string 1 filename))
|
|
|
|
;; (back (match-string 2 filename))
|
|
|
|
;; buffer)
|
|
|
|
;; (when (and front (string-match eshell-tar-regexp front)
|
|
|
|
;; (setq buffer (find-file-noselect front)))
|
|
|
|
;; (with-current-buffer buffer
|
|
|
|
;; (goto-char (point-min))
|
|
|
|
;; (when (re-search-forward (concat " " (regexp-quote back)
|
|
|
|
;; "\\s-*$") nil t)
|
|
|
|
;; (let* ((descrip (tar-current-descriptor))
|
|
|
|
;; (tokens (tar-desc-tokens descrip)))
|
|
|
|
;; (setq result
|
|
|
|
;; (list
|
|
|
|
;; (cond
|
|
|
|
;; ((eq (tar-header-link-type tokens) 5)
|
|
|
|
;; t)
|
|
|
|
;; ((eq (tar-header-link-type tokens) t)
|
|
|
|
;; (tar-header-link-name tokens)))
|
|
|
|
;; 1
|
|
|
|
;; (tar-header-uid tokens)
|
|
|
|
;; (tar-header-gid tokens)
|
|
|
|
;; (tar-header-date tokens)
|
|
|
|
;; (tar-header-date tokens)
|
|
|
|
;; (tar-header-date tokens)
|
|
|
|
;; (tar-header-size tokens)
|
|
|
|
;; (file-modes-number-to-symbolic
|
|
|
|
;; (logior (tar-header-mode tokens)
|
|
|
|
;; (cond
|
|
|
|
;; ((eq (tar-header-link-type tokens) 5) 16384)
|
|
|
|
;; ((eq (tar-header-link-type tokens) t) 32768))))
|
|
|
|
;; nil nil nil))))))))
|
|
|
|
;; (or result
|
|
|
|
;; (file-attributes filename))))
|
2000-06-23 04:39:18 +00:00
|
|
|
|
2021-04-03 01:21:32 +02:00
|
|
|
;; Obsolete.
|
|
|
|
|
2021-04-05 15:14:19 +02:00
|
|
|
(define-obsolete-function-alias 'eshell-uniquify-list #'seq-uniq "28.1")
|
|
|
|
(define-obsolete-function-alias 'eshell-uniqify-list #'seq-uniq "28.1")
|
2021-02-01 05:32:16 +01:00
|
|
|
(define-obsolete-function-alias 'eshell-copy-tree #'copy-tree "28.1")
|
|
|
|
(define-obsolete-function-alias 'eshell-user-name #'user-login-name "28.1")
|
|
|
|
|
2021-04-03 01:21:32 +02:00
|
|
|
(defun eshell-sublist (l &optional n m)
|
|
|
|
"Return from LIST the N to M elements.
|
|
|
|
If N or M is nil, it means the end of the list."
|
|
|
|
(declare (obsolete seq-subseq "28.1"))
|
|
|
|
(seq-subseq l n (1+ m)))
|
|
|
|
|
2007-12-05 07:07:12 +00:00
|
|
|
(provide 'esh-util)
|
2000-06-23 04:39:18 +00:00
|
|
|
|
|
|
|
;;; esh-util.el ends here
|