[Emacs-diffs] emacs-24 r116943: * net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file

[Michael Albinus]

------------------------------------------------------------
revno: 116943
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: emacs-24
timestamp: Fri 2014-04-11 14:59:36 +0200
message:
  * net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
  name twice due to backticks.  (Bug#17238)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-sh.el           trampsh.el-20100913133439-a1faifh29eqoi4nh-1

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-11 07:02:28 +0000
+++ b/lisp/ChangeLog    2014-04-11 12:59:36 +0000
@@ -1,3 +1,8 @@
+2014-04-11  Michael Albinus  <address@hidden>
+
+       * net/tramp-sh.el (tramp-sh-handle-file-truename): Quote the file
+       name twice due to backticks.  (Bug#17238)
+
 2014-04-11  Glenn Morris  <address@hidden>
 
        * term/w32-win.el (x-win-suspend-error):

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2014-04-10 07:17:40 +0000
+++ b/lisp/net/tramp-sh.el      2014-04-11 12:59:36 +0000
@@ -950,13 +950,15 @@
          (tramp-message v 4 "Finding true name for `%s'" filename)
          (cond
           ;; Use GNU readlink --canonicalize-missing where available.
+          ;; We must quote the file name twice due to the backticks.
           ((tramp-get-remote-readlink v)
            (setq result
                  (tramp-send-command-and-read
                   v
                   (format "echo \"\\\"`%s --canonicalize-missing %s`\\\"\""
                           (tramp-get-remote-readlink v)
-                          (tramp-shell-quote-argument localname)))))
+                          (tramp-shell-quote-argument
+                           (tramp-shell-quote-argument localname))))))
 
           ;; Use Perl implementation.
           ((and (tramp-get-remote-perl v)