diff options
Diffstat (limited to 'lisp/eshell/em-glob.el')
| -rw-r--r-- | lisp/eshell/em-glob.el | 233 |
1 files changed, 136 insertions, 97 deletions
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el index a94fb276b83..9722aeae18e 100644 --- a/lisp/eshell/em-glob.el +++ b/lisp/eshell/em-glob.el @@ -183,6 +183,10 @@ interpretation." (defvar eshell-glob-matches) (defvar message-shown) +(defvar eshell-glob-recursive-alist + '(("**/" . recurse) + ("***/" . recurse-symlink))) + (defun eshell-glob-regexp (pattern) "Convert glob-pattern PATTERN to a regular expression. The basic syntax is: @@ -232,8 +236,86 @@ resulting regular expression." (regexp-quote (substring pattern matched-in-pattern)) "\\'"))) +(defun eshell-glob-convert-1 (glob &optional last) + "Convert a GLOB matching a single element of a file name to regexps. +If LAST is non-nil, this glob is the last element of a file name. + +The result is a pair of regexps, the first for file names to +include, and the second for ones to exclude." + (let ((len (length glob)) (index 1) (incl glob) excl) + ;; We can't use `directory-file-name' because it strips away text + ;; properties in the string. + (let ((last (1- (length incl)))) + (when (eq (aref incl last) ?/) + (setq incl (substring incl 0 last)))) + ;; Split the glob if it contains a negation like x~y. + (while (and (eq incl glob) + (setq index (string-search "~" glob index))) + (if (or (get-text-property index 'escaped glob) + (or (= (1+ index) len))) + (setq index (1+ index)) + (setq incl (substring glob 0 index) + excl (substring glob (1+ index))))) + (setq incl (eshell-glob-regexp incl) + excl (and excl (eshell-glob-regexp excl))) + ;; Exclude dot files if requested. + (if (or eshell-glob-include-dot-files + (eq (aref glob 0) ?.)) + (unless (or eshell-glob-include-dot-dot + (not last)) + (setq excl (if excl + (concat "\\(\\`\\.\\.?\\'\\|" excl "\\)") + "\\`\\.\\.?\\'"))) + (setq excl (if excl + (concat "\\(\\`\\.\\|" excl "\\)") + "\\`\\."))) + (cons incl excl))) + +(defun eshell-glob-convert (glob) + "Convert an Eshell glob-pattern GLOB to regexps. +The result is a list of three elements: + +1. The base directory to search in. + +2. A list containing elements of the following forms: + + * Regexp pairs as generated by `eshell-glob-convert-1'. + + * `recurse', indicating that searches should recurse into + subdirectories. + + * `recurse-symlink', like `recurse', but also following + symlinks. + +3. A boolean indicating whether to match directories only." + (let ((globs (eshell-split-path glob)) + (isdir (eq (aref glob (1- (length glob))) ?/)) + start-dir result last-saw-recursion) + (if (and (cdr globs) + (file-name-absolute-p (car globs))) + (setq start-dir (car globs) + globs (cdr globs)) + (setq start-dir ".")) + (while globs + (if-let ((recurse (cdr (assoc (car globs) + eshell-glob-recursive-alist)))) + (if last-saw-recursion + (setcar result recurse) + (push recurse result) + (setq last-saw-recursion t)) + (push (eshell-glob-convert-1 (car globs) (null (cdr globs))) + result) + (setq last-saw-recursion nil)) + (setq globs (cdr globs))) + (list (file-name-as-directory start-dir) + (nreverse result) + isdir))) + (defun eshell-extended-glob (glob) - "Return a list of files generated from GLOB, perhaps looking for DIRS-ONLY. + "Return a list of files matched by GLOB. +If no files match, signal an error (if `eshell-error-if-no-glob' +is non-nil), or otherwise return GLOB itself. + This function almost fully supports zsh style filename generation syntax. Things that are not supported are: @@ -243,20 +325,11 @@ syntax. Things that are not supported are: foo~x(a|b) (a|b) will be interpreted as a predicate/modifier list Mainly they are not supported because file matching is done with Emacs -regular expressions, and these cannot support the above constructs. - -If this routine fails, it returns nil. Otherwise, it returns a list -the form: - - (INCLUDE-REGEXP EXCLUDE-REGEXP (PRED-FUNC-LIST) (MOD-FUNC-LIST))" - (let ((paths (eshell-split-path glob)) +regular expressions, and these cannot support the above constructs." + (let ((globs (eshell-glob-convert glob)) eshell-glob-matches message-shown) (unwind-protect - (if (and (cdr paths) - (file-name-absolute-p (car paths))) - (eshell-glob-entries (file-name-as-directory (car paths)) - (cdr paths)) - (eshell-glob-entries (file-name-as-directory ".") paths)) + (apply #'eshell-glob-entries globs) (if message-shown (message nil))) (or (and eshell-glob-matches (sort eshell-glob-matches #'string<)) @@ -265,94 +338,60 @@ the form: glob)))) ;; FIXME does this really need to abuse eshell-glob-matches, message-shown? -(defun eshell-glob-entries (path globs &optional recurse-p) - "Glob the entries in PATH, possibly recursing if RECURSE-P is non-nil." +(defun eshell-glob-entries (path globs only-dirs) + "Match the entries in PATH against GLOBS. +GLOBS is a list of globs as converted by `eshell-glob-convert', +which see. + +If ONLY-DIRS is non-nil, only match directories; otherwise, match +directories and files." (let* ((entries (ignore-errors - (file-name-all-completions "" path))) - (case-fold-search eshell-glob-case-insensitive) - (glob (car globs)) - (len (length glob)) - dirs rdirs - incl excl - name isdir pathname) - (while (cond - ((and (= len 3) (equal glob "**/")) - (setq recurse-p 2 - globs (cdr globs) - glob (car globs) - len (length glob))) - ((and (= len 4) (equal glob "***/")) - (setq recurse-p 3 - globs (cdr globs) - glob (car globs) - len (length glob))))) - (if (and recurse-p (not glob)) - (error "`**' cannot end a globbing pattern")) - (let ((index 1)) - (setq incl glob) - (while (and (eq incl glob) - (setq index (string-search "~" glob index))) - (if (or (get-text-property index 'escaped glob) - (or (= (1+ index) len))) - (setq index (1+ index)) - (setq incl (substring glob 0 index) - excl (substring glob (1+ index)))))) - ;; can't use `directory-file-name' because it strips away text - ;; properties in the string - (let ((len (1- (length incl)))) - (if (eq (aref incl len) ?/) - (setq incl (substring incl 0 len))) - (when excl - (setq len (1- (length excl))) - (if (eq (aref excl len) ?/) - (setq excl (substring excl 0 len))))) - (setq incl (eshell-glob-regexp incl) - excl (and excl (eshell-glob-regexp excl))) - (if (or eshell-glob-include-dot-files - (eq (aref glob 0) ?.)) - (unless (or eshell-glob-include-dot-dot - (cdr globs)) - (setq excl (if excl - (concat "\\(\\`\\.\\.?\\'\\|" excl "\\)") - "\\`\\.\\.?\\'"))) - (setq excl (if excl - (concat "\\(\\`\\.\\|" excl "\\)") - "\\`\\."))) + (file-name-all-completions "" path))) + (case-fold-search eshell-glob-case-insensitive) + glob glob-remainder recurse-p) + (if (rassq (car globs) eshell-glob-recursive-alist) + (setq recurse-p (car globs) + glob (or (cadr globs) + (eshell-glob-convert-1 "*" t)) + glob-remainder (cddr globs)) + (setq glob (car globs) + glob-remainder (cdr globs))) (when (and recurse-p eshell-glob-show-progress) (message "Building file list...%d so far: %s" - (length eshell-glob-matches) path) + (length eshell-glob-matches) path) (setq message-shown t)) - (if (equal path "./") (setq path "")) - (while entries - (setq name (car entries) - len (length name) - isdir (eq (aref name (1- len)) ?/)) - (if (let ((fname (directory-file-name name))) - (and (not (and excl (string-match excl fname))) - (string-match incl fname))) - (if (cdr globs) - (if isdir - (setq dirs (cons (concat path name) dirs))) - (setq eshell-glob-matches - (cons (concat path name) eshell-glob-matches)))) - (if (and recurse-p isdir - (or (> len 3) - (not (or (and (= len 2) (equal name "./")) - (and (= len 3) (equal name "../"))))) - (setq pathname (concat path name)) - (not (and (= recurse-p 2) - (file-symlink-p - (directory-file-name pathname))))) - (setq rdirs (cons pathname rdirs))) - (setq entries (cdr entries))) - (setq dirs (nreverse dirs) - rdirs (nreverse rdirs)) - (while dirs - (eshell-glob-entries (car dirs) (cdr globs)) - (setq dirs (cdr dirs))) - (while rdirs - (eshell-glob-entries (car rdirs) globs recurse-p) - (setq rdirs (cdr rdirs))))) + (when (equal path "./") (setq path "")) + (let ((incl (car glob)) + (excl (cdr glob)) + dirs rdirs) + (dolist (name entries) + (let* ((len (length name)) + (isdir (eq (aref name (1- len)) ?/)) + pathname) + (when (let ((fname (directory-file-name name))) + (and (not (and excl (string-match excl fname))) + (string-match incl fname))) + (if glob-remainder + (when isdir + (push (concat path name) dirs)) + (when (or (not only-dirs) + (and isdir + (not (and (eq recurse-p 'recurse) + (file-symlink-p + (directory-file-name + (concat path name))))))) + (push (concat path name) eshell-glob-matches)))) + (when (and recurse-p isdir + (not (member name '("./" "../"))) + (setq pathname (concat path name)) + (not (and (eq recurse-p 'recurse) + (file-symlink-p + (directory-file-name pathname))))) + (push pathname rdirs)))) + (dolist (dir (nreverse dirs)) + (eshell-glob-entries dir glob-remainder only-dirs)) + (dolist (rdir (nreverse rdirs)) + (eshell-glob-entries rdir globs only-dirs))))) (provide 'em-glob) |