From 1d2e369d6cc534d812f5fc025fd9f1f52e7df710 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 2 Apr 2011 13:36:47 -0700 Subject: [PATCH] find-dired improvements for bug#4403. * lisp/find-dired.el (find-exec-terminator): New option. (find-ls-option): Test for -ls support. (find-ls-subdir-switches): Test for -b in find-ls-option. (find-dired, find-grep-dired): Doc fixes. (find-dired): Use find-exec-terminator. --- lisp/ChangeLog | 6 +++++ lisp/find-dired.el | 64 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 56 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77497f5c01a..9a5b1fd6cc4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2011-04-02 Glenn Morris + * find-dired.el (find-exec-terminator): New option. + (find-ls-option): Test for -ls support. + (find-ls-subdir-switches): Test for -b in find-ls-option. + (find-dired, find-grep-dired): Doc fixes. + (find-dired): Use find-exec-terminator. + * find-dired.el (find-ls-option, find-ls-subdir-switches) (find-grep-options): Do not autoload these defcustoms, remove purecopy. (find-name-arg): Remove purecopy. diff --git a/lisp/find-dired.el b/lisp/find-dired.el index d24a51edd35..a2b196dc029 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -33,27 +33,56 @@ :group 'dired :prefix "find-") +;; FIXME this option does not really belong in this file, it's more general. +;; Eg cf some tests in grep.el. +(defcustom find-exec-terminator + (if (eq 0 + (ignore-errors + (process-file find-program nil nil nil + null-device "-exec" "echo" "{}" "+"))) + "+" + (shell-quote-argument ";")) + "String that terminates \"find -exec COMMAND {} \". +The value should include any needed quoting for the shell. +Common values are \"+\" and \"\\\\;\", with the former more efficient +than the latter." + :version "24.1" + :group 'find-dired + :type 'string) + ;; find's -ls corresponds to these switches. ;; Note -b, at least GNU find quotes spaces etc. in filenames (defcustom find-ls-option - (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb") - '("-exec ls -ld {} \\;" . "-ld")) + (if (eq 0 + (ignore-errors + (process-file find-program nil nil nil null-device "-ls"))) + (cons "-ls" + (if (eq system-type 'berkeley-unix) + "-gilsb" + "-dilsb")) + (cons + (format "-exec ls -ld {} %s" find-exec-terminator) + "-ld")) "Description of the option to `find' to produce an `ls -l'-type listing. This is a cons of two strings (FIND-OPTION . LS-SWITCHES). FIND-OPTION gives the option (or options) to `find' that produce the desired output. LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output." + :version "24.1" ; add tests for -ls and -exec + support :type '(cons (string :tag "Find Option") (string :tag "Ls Switches")) :group 'find-dired) -(defcustom find-ls-subdir-switches "-al" +(defcustom find-ls-subdir-switches + (if (string-match "-[a-z]*b" (cdr find-ls-option)) + "-alb" + "-al") "`ls' switches for inserting subdirectories in `*Find*' buffers. This should contain the \"-l\" switch. Use the \"-F\" or \"-b\" switches if and only if you also use them for `find-ls-option'." + :version "24.1" ; add -b test :type 'string - :group 'find-dired - :version "22.1") + :group 'find-dired) (defcustom find-grep-options (if (or (eq system-type 'berkeley-unix) @@ -89,12 +118,12 @@ find also ignores case. Otherwise, -name is used." ;;;###autoload (defun find-dired (dir args) "Run `find' and go into Dired mode on a buffer of the output. -The command run (after changing into DIR) is +The command run (after changing into DIR) is essentially find . \\( ARGS \\) -ls -except that the variable `find-ls-option' specifies what to use -as the final argument." +except that the car of the variable `find-ls-option' specifies what to +use in place of \"-ls\" as the final argument." (interactive (list (read-directory-name "Run find in directory: " nil "" t) (read-string "Run find (with args): " find-args '(find-args-history . 1)))) @@ -135,11 +164,12 @@ as the final argument." " " args " " (shell-quote-argument ")") " ")) - (if (equal (car find-ls-option) "-exec ls -ld {} \\;") - (concat "-exec ls -ld " + (if (string-match "\\`\\(.*\\) {} \\(\\\\;\\|+\\)\\'" + (car find-ls-option)) + (format "%s %s %s" + (match-string 1 (car find-ls-option)) (shell-quote-argument "{}") - " " - (shell-quote-argument ";")) + find-exec-terminator) (car find-ls-option)))) ;; Start the find process. (shell-command (concat args "&") (current-buffer)) @@ -213,9 +243,14 @@ The command run (after changing into DIR) is "Find files in DIR containing a regexp REGEXP and start Dired on output. The command run (after changing into DIR) is - find . -exec grep -s -e REGEXP {} \\\; -ls + find . \\( -type f -exec `grep-program' `find-grep-options' \\ + -e REGEXP {} \\; \\) -ls -Thus ARG can also contain additional grep options." +where the car of the variable `find-ls-option' specifies what to +use in place of \"-ls\" as the final argument." + ;; Doc used to say "Thus ARG can also contain additional grep options." + ;; i) Presumably ARG == REGEXP? + ;; ii) No it can't have options, since it gets shell-quoted. (interactive "DFind-grep (directory): \nsFind-grep (grep regexp): ") ;; find -exec doesn't allow shell i/o redirections in the command, ;; or we could use `grep -l >/dev/null' @@ -228,6 +263,7 @@ Thus ARG can also contain additional grep options." " " (shell-quote-argument "{}") " " + ;; Doesn't work with "+". (shell-quote-argument ";")))) (defun find-dired-filter (proc string)