diff options
| author | Michael Albinus | 2014-04-11 14:59:36 +0200 |
|---|---|---|
| committer | Michael Albinus | 2014-04-11 14:59:36 +0200 |
| commit | f628e17c4b814d93b40515af62ab1dbb2ca62226 (patch) | |
| tree | 0f4ca6f8f1420082ade881fc5ac39ae704086d46 /lisp | |
| parent | 95765a6ac3a02d60988bd9a4ad73f9d8154113da (diff) | |
| download | emacs-f628e17c4b814d93b40515af62ab1dbb2ca62226.tar.gz emacs-f628e17c4b814d93b40515af62ab1dbb2ca62226.zip | |
* net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
name twice due to backticks. (Bug#17238)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-sh.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a9d422e8b0..2c5b40ef86a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-04-11 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file | ||
| 4 | name twice due to backticks. (Bug#17238) | ||
| 5 | |||
| 1 | 2014-04-11 Glenn Morris <rgm@gnu.org> | 6 | 2014-04-11 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * term/w32-win.el (x-win-suspend-error): | 8 | * term/w32-win.el (x-win-suspend-error): |
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 8ff29a8b426..4d0b5ae54d4 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el | |||
| @@ -950,13 +950,15 @@ target of the symlink differ." | |||
| 950 | (tramp-message v 4 "Finding true name for `%s'" filename) | 950 | (tramp-message v 4 "Finding true name for `%s'" filename) |
| 951 | (cond | 951 | (cond |
| 952 | ;; Use GNU readlink --canonicalize-missing where available. | 952 | ;; Use GNU readlink --canonicalize-missing where available. |
| 953 | ;; We must quote the file name twice due to the backticks. | ||
| 953 | ((tramp-get-remote-readlink v) | 954 | ((tramp-get-remote-readlink v) |
| 954 | (setq result | 955 | (setq result |
| 955 | (tramp-send-command-and-read | 956 | (tramp-send-command-and-read |
| 956 | v | 957 | v |
| 957 | (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" | 958 | (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\"" |
| 958 | (tramp-get-remote-readlink v) | 959 | (tramp-get-remote-readlink v) |
| 959 | (tramp-shell-quote-argument localname))))) | 960 | (tramp-shell-quote-argument |
| 961 | (tramp-shell-quote-argument localname)))))) | ||
| 960 | 962 | ||
| 961 | ;; Use Perl implementation. | 963 | ;; Use Perl implementation. |
| 962 | ((and (tramp-get-remote-perl v) | 964 | ((and (tramp-get-remote-perl v) |