Quote file name commands in eshell.

* lisp/eshell/esh-arg.el (eshell-quote-argument): New function.

* lisp/eshell/esh-ext.el (eshell-invoke-batch-file):
* lisp/eshell/em-unix.el (eshell/cat, eshell/du): Use it to quote the
first arg to eshell-parse-command.

Fixes: debbugs:10523

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c374c71db38e9b9bf29fe3679736da90909bcb66..8bde5f91046cceeba1a1933bb2f42379e02b1b14 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-28  Chong Yidong  <cyd@gnu.org>
+
+       * eshell/esh-arg.el (eshell-quote-argument): New function.
+
+       * eshell/esh-ext.el (eshell-invoke-batch-file):
+       * eshell/em-unix.el (eshell/cat, eshell/du): Use it to quote the
+       first arg to eshell-parse-command (Bug#10523).
+
 2012-01-28  Drew Adams  <drew.adams@oracle.com>
 
        * net/ange-ftp.el (ange-ftp-canonize-filename): Check, that

diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index 296e2ee8b246f9dc1266e85e986fc92f77d7857a..6ac53e30e86862b35123f8e4d8c7f889782a60d9 100644 (file)
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -599,7 +599,7 @@ symlink, then revert to the system's definition of cat."
       (let ((ext-cat (eshell-search-path "cat")))
        (if ext-cat
            (throw 'eshell-replace-command
-                  (eshell-parse-command ext-cat args))
+                  (eshell-parse-command (eshell-quote-argument ext-cat) args))
          (if eshell-in-pipeline-p
              (error "Eshell's `cat' does not work in pipelines")
            (error "Eshell's `cat' cannot display one of the files given"))))
@@ -855,7 +855,7 @@ external command."
                           (file-remote-p (expand-file-name arg) 'method) "ftp")
                          (throw 'have-ange-path t))))))
        (throw 'eshell-replace-command
-              (eshell-parse-command ext-du args))
+              (eshell-parse-command (eshell-quote-argument ext-du) args))
       (eshell-eval-using-options
        "du" args
        '((?a "all" nil show-all

diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 8143f2d65bef1e7e1c5025598721d48876ec726f..ad52a5d4a712e845addab29a1ed1e2c72fea63df 100644 (file)
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -202,6 +202,18 @@ If POS is nil, the location of point is checked."
     (or (= pos (point-max))
        (memq (char-after pos) eshell-delimiter-argument-list))))
 
+(defun eshell-quote-argument (string)
+  "Return STRING with magic characters quoted.
+Magic characters are those in `eshell-special-chars-outside-quoting'."
+  (let ((index 0))
+    (mapconcat (lambda (c)
+                (prog1
+                    (or (eshell-quote-backslash string index)
+                        (char-to-string c))
+                  (setq index (1+ index))))
+              string
+              "")))
+
 ;; Argument parsing
 
 (defun eshell-parse-arguments (beg end)

diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index a33ccc82978583d70a8cf4e270acd4ecbd51e4f2..cf57a1dce7931ee3fd31ab5bbac0b403b2a27c78 100644 (file)
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -108,7 +108,9 @@ wholly ignored."
   ;; argument...
   (setcar args (subst-char-in-string ?/ ?\\ (car args)))
   (throw 'eshell-replace-command
-        (eshell-parse-command eshell-windows-shell-file (cons "/c" args))))
+        (eshell-parse-command
+         (eshell-quote-argument eshell-windows-shell-file)
+         (cons "/c" args))))
 
 (defcustom eshell-interpreter-alist
   (if (eshell-under-windows-p)