GNU bug report logs -
#27496
26.0.50; dired-do-shell-command just checks the first wildcard
Previous Next
Reported by: Tino Calancha <tino.calancha <at> gmail.com>
Date: Mon, 26 Jun 2017 10:46:02 UTC
Severity: minor
Tags: patch
Found in version 26.0.50
Done: Tino Calancha <tino.calancha <at> gmail.com>
Bug is archived. No further changes may be made.
Full log
View this message in rfc822 format
[Message part 1 (text/plain, inline)]
Your bug report
#27496: 26.0.50; dired-do-shell-command just checks the first wildcard
which was filed against the emacs package, has been closed.
The explanation is attached below, along with your original report.
If you require more details, please reply to 27496 <at> debbugs.gnu.org.
--
27496: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=27496
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
Tino Calancha <tino.calancha <at> gmail.com> writes:
> emacs -Q:
> ;; Evaluate following form.
> (let ((foo (make-temp-file "foo" 'dir))
> (bar (make-temp-file "bar" 'dir)))
> (dired foo)
> (dired-up-directory)
> (revert-buffer)
> (dired-do-shell-command
> (format "cp -r ? %s/?" bar) nil (dired-get-marked-files t nil)))
>
> ;; Should ask confirmation because "/?".
>
> If we change the last line to:
> (format "cp -r ./? %s/?" bar) nil (dired-get-marked-files t nil)))
> then it asks confirmation because "./?".
Fixed in master branch as commit
6e39940adba7b96dfe520caa52a1b92a1a84a84f
[Message part 3 (message/rfc822, inline)]
Severity: minor
Tags: patch
emacs -Q:
;; Evaluate following form.
(let ((foo (make-temp-file "foo" 'dir))
(bar (make-temp-file "bar" 'dir)))
(dired foo)
(dired-up-directory)
(revert-buffer)
(dired-do-shell-command
(format "cp -r ? %s/?" bar) nil (dired-get-marked-files t nil)))
;; Should ask confirmation because "/?".
If we change the last line to:
(format "cp -r ./? %s/?" bar) nil (dired-get-marked-files t nil)))
then it asks confirmation because "./?".
--8<-----------------------------cut here---------------start------------->8---
commit dd809606eefea96a034eb4fe8da237003321ffd3
Author: Tino Calancha <tino.calancha <at> gmail.com>
Date: Mon Jun 26 19:16:57 2017 +0900
Ask confirmation for all suspicious wildcards
* lisp/dired-aux.el (dired-do-shell-command): Check that all
the wildcards are right. Otherwise, ask fo confirmation (Bug#27496).
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 121bebeb65..f257a454f9 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -704,31 +704,41 @@ dired-do-shell-command
(dired-read-shell-command "! on %s: " current-prefix-arg files)
current-prefix-arg
files)))
- (let* ((on-each (not (string-match-p dired-star-subst-regexp command)))
- (no-subst (not (string-match-p dired-quark-subst-regexp command)))
- (star (string-match-p "\\*" command))
- (qmark (string-match-p "\\?" command))
- ;; Get confirmation for wildcards that may have been meant
- ;; to control substitution of a file name or the file name list.
- (ok (cond ((not (or on-each no-subst))
- (error "You can not combine `*' and `?' substitution marks"))
- ((and star on-each)
- (y-or-n-p (format-message
- "Confirm--do you mean to use `*' as a wildcard? ")))
- ((and qmark no-subst)
- (y-or-n-p (format-message
- "Confirm--do you mean to use `?' as a wildcard? ")))
- (t))))
- (when ok
- (if on-each
- (dired-bunch-files (- 10000 (length command))
- (lambda (&rest files)
- (dired-run-shell-command
- (dired-shell-stuff-it command files t arg)))
- nil file-list)
- ;; execute the shell command
- (dired-run-shell-command
- (dired-shell-stuff-it command file-list nil arg))))))
+ (cl-flet ((need-confirm-p
+ (cmd str)
+ (let ((res cmd)
+ (str (regexp-quote str))
+ (regexp (if (string= str "?")
+ dired-quark-subst-regexp
+ dired-star-subst-regexp)))
+ ;; Drop all ? and * surrounded by spaces.
+ (while (and (string-match-p str res)
+ (string-match regexp res))
+ (setq res (replace-match "" t t res 0)))
+ (string-match-p str res))))
+ (let* ((on-each (not (string-match-p dired-star-subst-regexp command)))
+ (no-subst (not (string-match-p dired-quark-subst-regexp command)))
+ ;; Get confirmation for wildcards that may have been meant
+ ;; to control substitution of a file name or the file name list.
+ (ok (cond ((not (or on-each no-subst))
+ (error "You can not combine `*' and `?' substitution marks"))
+ ((need-confirm-p command "*")
+ (y-or-n-p (format-message
+ "Confirm--do you mean to use `*' as a wildcard? ")))
+ ((need-confirm-p command "?")
+ (y-or-n-p (format-message
+ "Confirm--do you mean to use `?' as a wildcard? ")))
+ (t))))
+ (when ok
+ (if on-each
+ (dired-bunch-files (- 10000 (length command))
+ (lambda (&rest files)
+ (dired-run-shell-command
+ (dired-shell-stuff-it command files t arg)))
+ nil file-list)
+ ;; execute the shell command
+ (dired-run-shell-command
+ (dired-shell-stuff-it command file-list nil arg)))))))
;; Might use {,} for bash or csh:
(defvar dired-mark-prefix ""
--8<-----------------------------cut here---------------end--------------->8---
In GNU Emacs 26.0.50 (build 9, x86_64-pc-linux-gnu, GTK+ Version 3.22.11)
of 2017-06-26 built
Repository revision: 1771d9b8082cf967e3f8b6a436d8766560be9e8d
This bug report was last modified 7 years and 328 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.