emacs/lisp/eshell/esh-util.el

891 lines
32 KiB
EmacsLisp
Raw Normal View History

;;; esh-util.el --- general utilities -*- lexical-binding:t -*-
2000-06-23 04:39:18 +00:00
2024-01-02 09:47:10 +08:00
;; Copyright (C) 1999-2024 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.
;; 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
;; 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
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
2000-06-23 04:39:18 +00:00
;;; Commentary:
2000-06-23 04:39:18 +00:00
;;; Code:
2000-06-23 04:39:18 +00: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
"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."
:type 'boolean)
2000-10-29 05:18:48 +00:00
2000-06-23 04:39:18 +00:00
(defcustom eshell-group-file "/etc/group"
"If non-nil, the name of the group file on your system."
:type '(choice (const :tag "No group file" nil) file))
2000-06-23 04:39:18 +00:00
(defcustom eshell-passwd-file "/etc/passwd"
"If non-nil, the name of the passwd file on your system."
:type '(choice (const :tag "No passwd file" nil) file))
2000-06-23 04:39:18 +00:00
(defcustom eshell-hosts-file "/etc/hosts"
"The name of the /etc/hosts file.
Use `pcomplete-hosts-file' instead; this variable is obsolete and
has no effect."
:type '(choice (const :tag "No hosts file" nil) file))
;; 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
"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."
:type 'boolean)
2000-06-23 04:39:18 +00:00
(defcustom eshell-private-file-modes #o600 ; umask 177
"The file-modes value to use for creating \"private\" files."
:type 'integer)
2000-06-23 04:39:18 +00:00
(defcustom eshell-private-directory-modes #o700 ; umask 077
"The file-modes value to use for creating \"private\" directories."
:type 'integer)
2000-06-23 04:39:18 +00:00
(defcustom eshell-tar-regexp
"\\.t\\(ar\\(\\.\\(gz\\|bz2\\|xz\\|Z\\)\\)?\\|gz\\|a[zZ]\\|z2\\)\\'"
"Regular expression used to match tar file names."
:version "24.1" ; added xz
:type 'regexp)
2000-06-23 04:39:18 +00:00
(defcustom eshell-convert-numeric-arguments t
"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
`eshell-number-regexp'.
2011-11-19 01:18:31 -08:00
NOTE: If you find that numeric conversions are interfering with the
specification of filenames (for example, in calling `find-file', or
some other Lisp function that deals with files, not numbers), add the
Update docstrings and comments to use "init file" terminology. * bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes. * comint.el (comint-prompt-read-only): * custom.el (defcustom): * hi-lock.el (hi-lock-mode): * ibuffer.el (ibuffer-formats): * ielm.el (ielm-prompt-read-only): * novice.el (disable-command): * saveplace.el (toggle-save-place): * speedbar.el (speedbar-supported-extension-expressions): * startup.el (auto-save-list-file-prefix, init-file-user) (after-init-hook, inhibit-startup-echo-area-message): * strokes.el (strokes-help): * time-stamp.el (time-stamp): * calendar/calendar.el (calendar, diary-file): * calendar/diary-lib.el (diary-mail-entries, diary) (diary-list-entries-hook): * calendar/holidays.el (holidays, calendar-holidays): * calendar/lunar.el (lunar-phases): * calendar/solar.el (sunrise-sunset): * emulation/edt.el (edt-load-keys): * emulation/viper.el (viper-mode): * eshell/em-alias.el (eshell-command-aliases-list): * eshell/esh-util.el (eshell-convert-numeric-arguments): * international/ogonek.el (ogonek-information): * net/tramp-cmds.el (tramp-bug): * net/quickurl.el (quickurl-reread-hook-postfix): * play/decipher.el (decipher-font-lock-keywords): * progmodes/cc-styles.el (c-set-style): * progmodes/idlw-shell.el (idlwave-shell-prompt-pattern): * progmodes/inf-lisp.el (inferior-lisp-prompt): * progmodes/octave-mod.el (octave-mode): * progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password): * progmodes/verilog-mode.el (verilog-read-defines): * textmodes/two-column.el (2C-mode): Likewise.
2012-09-17 13:41:04 +08:00
following in your init file:
(put \\='find-file \\='eshell-no-numeric-conversions t)
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'."
:type 'boolean)
2000-06-23 04:39:18 +00:00
(defcustom eshell-ange-ls-uids nil
"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")
(repeat :tag "UIDs" string))))))
(defcustom eshell-debug-command nil
"A list of debug features to enable when running Eshell commands.
Possible entries are `form', to log the manipulation of Eshell
command forms, and `process', to log external process operations.
If nil, don't debug commands at all."
:version "30.1"
:type '(set (const :tag "Form manipulation" form)
(const :tag "Process operations" process)))
2000-06-23 04:39:18 +00:00
;;; Internal Variables:
(defvar eshell-number-regexp
(rx (? "-")
(or (seq (+ digit) (? "." (* digit)))
(seq (* digit) "." (+ digit)))
;; Optional exponent
(? (or "e" "E")
(or "+INF" "+NaN"
(seq (? (or "+" "-")) (+ digit)))))
"Regular expression used to match numeric arguments.
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'.")
(defvar eshell-integer-regexp (rx (? "-") (+ digit))
"Regular expression used to match integer arguments.")
2000-06-23 04:39:18 +00:00
(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.")
(defvar eshell-command-output-properties
`( field command-output
front-sticky (field)
rear-nonsticky (field)
;; Text inserted by a user in the middle of process output
;; should be marked as output. This is needed for commands
;; such as `yank' or `just-one-space' which don't use
;; `insert-and-inherit' and thus bypass default text property
;; inheritance.
insert-in-front-hooks (,#'eshell--mark-as-output
,#'eshell--mark-yanked-as-output))
"A list of text properties to apply to command output.")
(defvar eshell-debug-command-buffer "*eshell last cmd*"
"The name of the buffer to log debug messages about command invocation.")
;;; Obsolete variables:
2000-06-23 04:39:18 +00: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)
"If `eshell-handle-errors' is non-nil, this is `condition-case'.
Otherwise, evaluates FORM with no error handling."
(declare (indent 2) (debug (sexp form &rest form)))
`(if eshell-handle-errors
(condition-case-unless-debug ,tag
,form
,@handlers)
,form))
(defun eshell-debug-command-start (command)
"Start debugging output for the command string COMMAND.
If debugging is enabled (see `eshell-debug-command'), this will
start logging to `*eshell last cmd*'."
(when eshell-debug-command
(with-current-buffer (get-buffer-create eshell-debug-command-buffer)
(erase-buffer)
(insert "command: \"" command "\"\n"))))
(defun eshell-always-debug-command (kind string &rest objects)
"Output a debugging message to `*eshell last cmd*'.
KIND is the kind of message to log. STRING and OBJECTS are as
`format-message' (which see)."
(declare (indent 1))
(with-current-buffer (get-buffer-create eshell-debug-command-buffer)
(insert "\n\C-l\n[" (symbol-name kind) "] "
(apply #'format-message string objects))))
(defmacro eshell-debug-command (kind string &rest objects)
"Output a debugging message to `*eshell last cmd*' if debugging is enabled.
KIND is the kind of message to log (either `form' or `process'). If
present in `eshell-debug-command', output this message; otherwise, ignore it.
STRING and OBJECTS are as `format-message' (which see)."
(declare (indent 1))
(let ((kind-sym (make-symbol "kind")))
`(let ((,kind-sym ,kind))
(when (memq ,kind-sym eshell-debug-command)
(eshell-always-debug-command ,kind-sym ,string ,@objects)))))
2000-06-23 04:39:18 +00:00
(defun eshell--mark-as-output (start end &optional object)
"Mark the text from START to END as Eshell output.
OBJECT can be a buffer or string. If nil, mark the text in the
current buffer."
(with-silent-modifications
(add-text-properties start end eshell-command-output-properties
object)))
(defun eshell--mark-yanked-as-output (start end)
"Mark yanked text from START to END as Eshell output."
;; `yank' removes the field text property from the text it inserts
;; due to `yank-excluded-properties', so arrange for this text
;; property to be reapplied in the `after-change-functions'.
(letrec ((hook
(lambda (start1 end1 _len1)
(remove-hook 'after-change-functions hook t)
(when (and (= start start1)
(= end end1))
(eshell--mark-as-output start1 end1)))))
(add-hook 'after-change-functions hook nil t)))
(defun eshell--unmark-string-as-output (string)
"Unmark STRING as Eshell output."
(remove-list-of-text-properties
0 (length string)
'(rear-nonsticky front-sticky field insert-in-front-hooks)
string)
string)
(defsubst eshell--region-p (object)
"Return non-nil if OBJECT is a pair of numbers or markers."
(and (consp object)
(number-or-marker-p (car object))
(number-or-marker-p (cdr object))))
(defmacro eshell-with-temp-command (command &rest body)
"Temporarily insert COMMAND into the buffer and execute the forms in BODY.
COMMAND can be a string to insert, a cons cell (START . END)
specifying a region in the current buffer, or (:file . FILENAME)
to temporarily insert the contents of FILENAME.
Before executing BODY, narrow the buffer to the text for COMMAND
and and set point to the beginning of the narrowed region.
The value returned is the last form in BODY."
(declare (indent 1))
(let ((command-sym (make-symbol "command"))
(begin-sym (make-symbol "begin"))
(end-sym (make-symbol "end")))
`(let ((,command-sym ,command))
(if (eshell--region-p ,command-sym)
(save-restriction
(narrow-to-region (car ,command-sym) (cdr ,command-sym))
(goto-char (car ,command-sym))
,@body)
;; Since parsing relies partly on buffer-local state
;; (e.g. that of `eshell-parse-argument-hook'), we need to
;; perform the parsing in the Eshell buffer.
(let ((,begin-sym (point)) ,end-sym)
(with-silent-modifications
(if (stringp ,command-sym)
(insert ,command-sym)
(forward-char (cadr (insert-file-contents (cdr ,command-sym)))))
(setq ,end-sym (point))
(unwind-protect
(save-restriction
(narrow-to-region ,begin-sym ,end-sym)
(goto-char ,begin-sym)
,@body)
(delete-region ,begin-sym ,end-sym))))))))
2000-06-23 04:39:18 +00:00
(defun eshell-find-delimiter
(open close &optional bound reverse-p backslash-p)
"From point, find the CLOSE delimiter corresponding to OPEN.
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))))
(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)
(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 ?\\)
(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)
(eq (char-before (1- (point))) ?\\)
(memq c (list open close ?\\)))
2000-06-23 04:39:18 +00:00
(forward-char -1))
((eq open close)
(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)))
(when (= depth 0)
(if reverse-p (point) (1- (point)))))))
2000-06-23 04:39:18 +00: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))
Eshell variable expansion should always return strings inside quotes This is closer in behavior to regular shells, and gives Eshell users greater flexibility in how variables are expanded. * lisp/eshell/esh-util.el (eshell-convert): Add TO-STRING argument. * lisp/eshell/esh-var.el (eshell-parse-variable-ref): Add MODIFIER-P argument and adjust how 'eshell-convert' and 'eshell-apply-indices' are called. (eshell-get-variable, eshell-apply-indices): Add QUOTED argument. * test/lisp/eshell/esh-var-tests.el (eshell-test-value): New defvar. (esh-var-test/interp-convert-var-number) (esh-var-test/interp-convert-var-split-indices) (esh-var-test/interp-convert-quoted-var-number) (esh-var-test/interp-convert-quoted-var-split-indices) (esh-var-test/interp-convert-cmd-string-newline) (esh-var-test/interp-convert-cmd-multiline) (esh-var-test/interp-convert-cmd-number) (esh-var-test/interp-convert-cmd-split-indices) (esh-var-test/quoted-interp-convert-var-number) (esh-var-test/quoted-interp-convert-var-split-indices) (esh-var-test/quoted-interp-convert-quoted-var-number) (esh-var-test/quoted-interp-convert-quoted-var-split-indices) (esh-var-test/quoted-interp-convert-cmd-string-newline) (esh-var-test/quoted-interp-convert-cmd-multiline) (esh-var-test/quoted-interp-convert-cmd-number) (esh-var-test/quoted-interp-convert-cmd-split-indices): New tests. * doc/misc/eshell.texi (Arguments): Expand this section, and document the new behavior. (Dollars Expansion): Provide more detail about '$(lisp)' and '${command}' forms. * etc/NEWS (Eshell): Announce this change (bug#55236).
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.
* If `eshell-convert-numeric-aguments' is non-nil and every line
of output looks like a number, convert them to numbers."
Eshell variable expansion should always return strings inside quotes This is closer in behavior to regular shells, and gives Eshell users greater flexibility in how variables are expanded. * lisp/eshell/esh-util.el (eshell-convert): Add TO-STRING argument. * lisp/eshell/esh-var.el (eshell-parse-variable-ref): Add MODIFIER-P argument and adjust how 'eshell-convert' and 'eshell-apply-indices' are called. (eshell-get-variable, eshell-apply-indices): Add QUOTED argument. * test/lisp/eshell/esh-var-tests.el (eshell-test-value): New defvar. (esh-var-test/interp-convert-var-number) (esh-var-test/interp-convert-var-split-indices) (esh-var-test/interp-convert-quoted-var-number) (esh-var-test/interp-convert-quoted-var-split-indices) (esh-var-test/interp-convert-cmd-string-newline) (esh-var-test/interp-convert-cmd-multiline) (esh-var-test/interp-convert-cmd-number) (esh-var-test/interp-convert-cmd-split-indices) (esh-var-test/quoted-interp-convert-var-number) (esh-var-test/quoted-interp-convert-var-split-indices) (esh-var-test/quoted-interp-convert-quoted-var-number) (esh-var-test/quoted-interp-convert-quoted-var-split-indices) (esh-var-test/quoted-interp-convert-cmd-string-newline) (esh-var-test/quoted-interp-convert-cmd-multiline) (esh-var-test/quoted-interp-convert-cmd-number) (esh-var-test/quoted-interp-convert-cmd-split-indices): New tests. * doc/misc/eshell.texi (Arguments): Expand this section, and document the new behavior. (Dollars Expansion): Provide more detail about '$(lisp)' and '${command}' forms. * etc/NEWS (Eshell): Announce this change (bug#55236).
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))))
(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")
"Content of $PATH.
It might be different from \(getenv \"PATH\"), when
`default-directory' points to a remote host.")
(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)
"Return $PATH as a list.
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) (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.
(split-string path (path-separator))))))
(defun eshell-parse-colon-path (path-env)
"Split string with `parse-colon-path'.
Prepend remote identification of `default-directory', if any."
(declare (obsolete nil "29.1"))
(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))))
(defun eshell-split-filename (filename)
"Split a FILENAME into a list of file/directory components."
(let* ((remote (file-remote-p filename))
(filename (file-local-name filename))
(len (length filename))
(index 0) (curr-start 0)
parts)
(when (and (eshell-under-windows-p)
(string-prefix-p "//" filename))
(setq index 2))
(while (< index len)
(when (and (eq (aref filename index) ?/)
(not (get-text-property index 'escaped filename)))
(push (if (= curr-start index) "/"
(substring filename curr-start (1+ index)))
parts)
(setq curr-start (1+ index)))
(setq index (1+ index)))
(when (< curr-start len)
(push (substring filename curr-start) parts))
(setq parts (nreverse parts))
(when (and (eshell-under-windows-p)
(string-match "\\`[A-Za-z]:\\'" (car parts)))
(setcar parts (concat (car parts) "/")))
(if remote (cons remote parts) parts)))
(define-obsolete-function-alias 'eshell-split-path
'eshell-split-filename "30.1")
2000-06-23 04:39:18 +00:00
(defun eshell-to-flat-string (value)
"Make value a string. If separated by newlines change them to spaces."
(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))
(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))
((and (eq object t)
(not eshell-stringify-t))
nil)
2000-06-23 04:39:18 +00:00
(t
(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."
(mapcar #'eshell-stringify args))
2000-06-23 04:39:18 +00:00
Add support for the "splice operator" in Eshell This allows splicing lists in-place in argument lists, which is particularly important when defining aliases using the '$*' special variable (bug#59960). * lisp/eshell/esh-var.el (eshell-parse-variable): Add support for the splice operator. (eshell-interpolate-variable): Let 'eshell-parse-variable' handle adding 'eshell-escape-arg'. (eshell-complete-variable-reference): Handle the splice operator. * lisp/eshell/esh-arg.el (eshell-concat-groups) (eshell-prepare-splice): New functions... (eshell-resolve-current-argument): ... use them. (eshell-splice-args): New function. * lisp/eshell/esh-cmd.el (eshell-rewrite-named-command): Handle 'eshell-splice-args'. * lisp/eshell/esh-util.el (eshell-list-to-string): New function... (eshell-flatten-and-stringify): ... use it. * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): Remove 'eshell-splice-args' sigils in Eshell command forms so that we can perform completion on splice-expansions. * lisp/eshell/em-unix.el (eshell-complete-host-reference): Don't try to complete arguments containing "$@". * test/lisp/eshell/esh-var-tets.el (esh-var-test/interp-list-var) (esh-var-test/interp-list-var-concat, esh-var-test/interp-var-splice) (esh-var-test/interp-var-splice-concat) (esh-var-test/quoted-interp-list-var) (esh-var-test/quoted-interp-list-var-concat) (esh-var-test/quoted-interp-var-splice) (esh-var-test/quoted-interp-var-splice-concat): New tests. * test/lisp/eshell/em-alias-tests.el (em-alias-test/alias-all-args-var-splice): New test. * doc/misc/eshell.texi (Dollars Expansion): Explain the splice operator. (Aliases): Expand documentation and use '$@*'. (Built-ins, Bugs and Ideas): Use '$@*' where appropriate. * etc/NEWS: Announce this change.
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."
Add support for the "splice operator" in Eshell This allows splicing lists in-place in argument lists, which is particularly important when defining aliases using the '$*' special variable (bug#59960). * lisp/eshell/esh-var.el (eshell-parse-variable): Add support for the splice operator. (eshell-interpolate-variable): Let 'eshell-parse-variable' handle adding 'eshell-escape-arg'. (eshell-complete-variable-reference): Handle the splice operator. * lisp/eshell/esh-arg.el (eshell-concat-groups) (eshell-prepare-splice): New functions... (eshell-resolve-current-argument): ... use them. (eshell-splice-args): New function. * lisp/eshell/esh-cmd.el (eshell-rewrite-named-command): Handle 'eshell-splice-args'. * lisp/eshell/esh-util.el (eshell-list-to-string): New function... (eshell-flatten-and-stringify): ... use it. * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments): Remove 'eshell-splice-args' sigils in Eshell command forms so that we can perform completion on splice-expansions. * lisp/eshell/em-unix.el (eshell-complete-host-reference): Don't try to complete arguments containing "$@". * test/lisp/eshell/esh-var-tets.el (esh-var-test/interp-list-var) (esh-var-test/interp-list-var-concat, esh-var-test/interp-var-splice) (esh-var-test/interp-var-splice-concat) (esh-var-test/quoted-interp-list-var) (esh-var-test/quoted-interp-list-var-concat) (esh-var-test/quoted-interp-var-splice) (esh-var-test/quoted-interp-var-splice-concat): New tests. * test/lisp/eshell/em-alias-tests.el (em-alias-test/alias-all-args-var-splice): New test. * doc/misc/eshell.texi (Dollars Expansion): Explain the splice operator. (Aliases): Expand documentation and use '$@*'. (Built-ins, Bugs and Ideas): Use '$@*' where appropriate. * etc/NEWS: Announce this change.
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."
(when (and human-readable
(not (= human-readable 1000))
(not (= human-readable 1024)))
(error "human-readable must be 1000 or 1024"))
2000-06-23 04:39:18 +00:00
(let ((size (float (or filesize 0))))
(if human-readable
(let* ((flavor (and (= human-readable 1000) 'si))
(str (file-size-human-readable size flavor)))
(if (not use-colors)
str
(cond ((> size (expt human-readable 3))
(propertize str 'face 'bold-italic))
((> size (expt human-readable 2))
(propertize str 'face 'bold))
(t str))))
2000-06-23 04:39:18 +00:00
(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))
(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))))
Use connection-aware functions when getting the UID/GID in Eshell This means, for example, that when using Tramp to sudo in Eshell, "rm" queries the user before deleting anything (bug#63221). * lisp/eshell/esh-util.el (eshell-user-login-name): New function... * lisp/eshell/em-unix.el (eshell/whoami): ... use it. * lisp/eshell/em-ls.el (eshell-ls-applicable): Use 'file-user-uid' and 'eshell-user-login-name'. (eshell-ls-decorated-name): Use 'file-user-uid'. * lisp/eshell/em-pred.el (eshell-predicate-alist): Use 'file-user-uid' and 'file-group-gid'. * lisp/eshell/em-unix.el (eshell-interactive-query): New widget... (eshell-rm-interactive-query, eshell-mv-interactive-query) (eshell-cp-interactive-query, eshell-ln-interactive-query): ... use it. (eshell-interactive-query-p): New function... (eshell/rm, eshell/mv, eshell/cp, eshell/ln): ... use it. * lisp/simple.el (file-group-gid): New function. * lisp/net/ange-ftp.el (ange-ftp-file-group-gid): New function... (file-group-gid): ... use it. * lisp/net/tramp.el (tramp-handle-file-group-gid): * lisp/net/tramp-archive.el (tramp-archive-handle-file-group-gid): New functions. * lisp/net/tramp.el (tramp-file-name-for-operation): Add 'file-group-gid'. * lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist): * lisp/net/tramp-archive.el (tramp-archive-file-name-handler-alist): * lisp/net/tramp-crypt.el (tramp-crypt-file-name-handler-alist): * lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): * lisp/net/tramp-rclone.el (tramp-rclone-file-name-handler-alist): * lisp/net/tramp-sh.el (tramp-sh-file-name-handler-alist): * lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist): * lisp/net/tramp-sshfs.el (tramp-sshfs-file-name-handler-alist): * lisp/net/tramp-sudoedit.el (tramp-sudoedit-file-name-handler-alist): Add 'file-group-gid' mapping. * test/lisp/net/tramp-tests.el (tramp-test44-file-user-group-ids): * test/lisp/net/tramp-archive-tests.el (tramp-archive-test44-file-user-group-ids): Add tests for 'file-group-gid'. * doc/lispref/files.texi (Magic File Names): Mention 'file-group-gid'. * doc/lispref/os.texi (User Identification): Document 'file-group-gid', and move 'group-real-gid' to match the order of 'user-real-uid'. * etc/NEWS: Announce 'file-group-gid'.
2023-05-01 09:49:00 -07:00
(defun eshell-user-login-name ()
"Return the connection-aware value of the user's login name.
See also `user-login-name'."
(or (file-remote-p default-directory 'user) (user-login-name)))
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))
(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))
(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))))
(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'."
(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."
(declare (obsolete with-file-modes "25.1"))
`(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."
`(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'."
(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)))
(defun eshell-directory-files-and-attributes (dir &optional full match nosort id-format)
"Make sure to use the handler for `directory-files-and-attributes'."
(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
(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))))))
2000-10-14 08:16:50 +00:00
(eval-when-compile
(require 'ange-ftp)) ; ange-ftp-parse-filename
(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
(defun eshell-parse-ange-ls (dir)
(require 'ange-ftp)
(require 'tramp)
(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)
(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)))
(name (ange-ftp-parse-filename))
(mtime
(let ((moment (parse-time-string (match-string 6))))
(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))
(encode-time moment)))
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))
(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
gid format. Valid values are `string' and `integer', defaulting to
`integer'. See `file-attributes'."
(let* ((expanded-file (expand-file-name file))
entry)
(if (string-equal (file-remote-p expanded-file 'method) "ftp")
(let ((base (file-name-nondirectory expanded-file))
(dir (file-name-directory expanded-file)))
(if (string-equal "" base) (setq base "."))
(unless entry
(setq entry (eshell-parse-ange-ls dir))
(if entry
(let ((fentry (assoc base (cdr entry))))
(if fentry
(setq entry (cdr fentry))
(setq entry nil)))))
entry)
(file-attributes file id-format))))
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)))
(defun eshell-process-list-p (procs)
"Return non-nil if PROCS is a list of process objects."
(and (listp procs)
(seq-every-p #'eshell-processp procs)))
(defun eshell-make-process-list (procs)
"Make a list of process objects from PROCS if possible.
PROCS can be a single process or a list thereof. If PROCS is
anything else, return nil instead."
When executing an Eshell pipeline, send input to the first process Previously, input was sent to the last process in the pipeline, resulting in unexpected behavior when running commands like 'tr a-z A-Z | rev'. * lisp/eshell/esh-util.el (eshell-process-pair-p) (eshell-make-process-pair): New functions. * lisp/eshell/esh-cmd.el (eshell-last-async-proc): Rename to... (eshell-last-async-procs): ... this, and store a pair of processes. (eshell-interactive-process): Replace with... (eshell-interactive-process-p, eshell-head-process) (eshell-tail-process): ... these. (eshell-cmd-initialize): Set 'eshell-last-async-procs'. (eshell-do-pipelines): Set 'headproc'. (eshell-execute-pipeline): Return 'headproc' and 'tailproc'. (eshell-resume-eval): Use 'eshell-last-async-procs'. (eshell-do-eval): Make sure we work with a pair of processes. * lisp/eshell/esh-proc.el (eshell-send-eof-to-process): Move from here... * lisp/eshell/esh-mode.el (eshell-send-eof-to-process): ... to here, and only send EOF to the head process. * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments) * lisp/eshell/esh-mode.el (eshell-intercept-commands) (eshell-watch-for-password-prompt): Use 'eshell-interactive-process-p'. * lisp/eshell/em-rebind.el (eshell-delchar-or-maybe-eof) * lisp/eshell/em-term.el (eshell-term-send-raw-string) * lisp/eshell/esh-mode.el (eshell-self-insert-command) (eshell-send-input, eshell-send-invisible): Use 'eshell-head-process'. * lisp/eshell/esh-cmd.el (eshell-as-subcommand): Use 'eshell-tail-process'. * lisp/eshell/eshell.el (eshell-command): * test/lisp/eshell/eshell-tests-helpers.el (eshell-wait-for-subprocess): Use 'eshell-interactive-process-p' and 'eshell-tail-process'. * test/lisp/eshell/eshell-tests.el (eshell-test/pipe-headproc-stdin): New test.
2022-01-30 18:53:53 -08:00
(pcase procs
((pred eshell-processp) (list procs))
((pred eshell-process-list-p) procs)))
When executing an Eshell pipeline, send input to the first process Previously, input was sent to the last process in the pipeline, resulting in unexpected behavior when running commands like 'tr a-z A-Z | rev'. * lisp/eshell/esh-util.el (eshell-process-pair-p) (eshell-make-process-pair): New functions. * lisp/eshell/esh-cmd.el (eshell-last-async-proc): Rename to... (eshell-last-async-procs): ... this, and store a pair of processes. (eshell-interactive-process): Replace with... (eshell-interactive-process-p, eshell-head-process) (eshell-tail-process): ... these. (eshell-cmd-initialize): Set 'eshell-last-async-procs'. (eshell-do-pipelines): Set 'headproc'. (eshell-execute-pipeline): Return 'headproc' and 'tailproc'. (eshell-resume-eval): Use 'eshell-last-async-procs'. (eshell-do-eval): Make sure we work with a pair of processes. * lisp/eshell/esh-proc.el (eshell-send-eof-to-process): Move from here... * lisp/eshell/esh-mode.el (eshell-send-eof-to-process): ... to here, and only send EOF to the head process. * lisp/eshell/em-cmpl.el (eshell-complete-parse-arguments) * lisp/eshell/esh-mode.el (eshell-intercept-commands) (eshell-watch-for-password-prompt): Use 'eshell-interactive-process-p'. * lisp/eshell/em-rebind.el (eshell-delchar-or-maybe-eof) * lisp/eshell/em-term.el (eshell-term-send-raw-string) * lisp/eshell/esh-mode.el (eshell-self-insert-command) (eshell-send-input, eshell-send-invisible): Use 'eshell-head-process'. * lisp/eshell/esh-cmd.el (eshell-as-subcommand): Use 'eshell-tail-process'. * lisp/eshell/eshell.el (eshell-command): * test/lisp/eshell/eshell-tests-helpers.el (eshell-wait-for-subprocess): Use 'eshell-interactive-process-p' and 'eshell-tail-process'. * test/lisp/eshell/eshell-tests.el (eshell-test/pipe-headproc-stdin): New test.
2022-01-30 18:53:53 -08: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
;; Obsolete.
(define-obsolete-function-alias 'eshell-uniquify-list #'seq-uniq "28.1")
(define-obsolete-function-alias 'eshell-uniqify-list #'seq-uniq "28.1")
(define-obsolete-function-alias 'eshell-copy-tree #'copy-tree "28.1")
(define-obsolete-function-alias 'eshell-user-name #'user-login-name "28.1")
(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)))
(define-obsolete-function-alias 'eshell-redisplay #'redisplay "30.1")
(provide 'esh-util)
2000-06-23 04:39:18 +00:00
;;; esh-util.el ends here