mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

Refine multi-hop specs in Tramp

Browse source 
* lisp/net/tramp.el (tramp-tramp-file-p): Suppress "/:" and "/c:".

* test/lisp/net/tramp-tests.el
(tramp-test01-file-name-syntax): Multi-hop specs don't need a
method.  "/h:" is allowed on non MS Windows.
This commit is contained in:
Michael Albinus 2016-11-09 15:34:40 +01:00
parent 112111c4e4
commit dba9bc9752
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/net/tramp.el
View file

@ -1146,6 +1146,11 @@ entry does not exist, return nil."
"Return t if NAME is a string with Tramp file name syntax."
(save-match-data
(and (stringp name)
;; No "/:" and "/c:". This is not covered by `tramp-file-name-regexp'.
(not (string-match
(if (memq system-type '(cygwin windows-nt))
"^/[[:alpha:]]?:" "^/:")
name))
(string-match tramp-file-name-regexp name))))
(defun tramp-find-method (method user host)

11
test/lisp/net/tramp-tests.el
View file

@ -185,6 +185,8 @@ handled properly. BODY shall not contain a timeout."
(should (tramp-tramp-file-p "/method1:user1@host1|method2:user2@host2:"))
(should (tramp-tramp-file-p
"/method1:user1@host1|method2:user2@host2|method3:user3@host3:"))
(should (tramp-tramp-file-p "/host1|host2:"))
(should (tramp-tramp-file-p "/user1@host1|user2@host2:"))
;; No strings.
(should-not (tramp-tramp-file-p nil))
@ -193,12 +195,13 @@ handled properly. BODY shall not contain a timeout."
(should-not (tramp-tramp-file-p "/::"))
(should-not (tramp-tramp-file-p "/:@:"))
(should-not (tramp-tramp-file-p "/:[]:"))
;; Multihops require a method.
(should-not (tramp-tramp-file-p "/host1|host2:"))
;; Methods or hostnames shall be at least two characters on MS Windows.
(when (memq system-type '(cygwin windows-nt))
(let ((system-type 'windows-nt))
(should-not (tramp-tramp-file-p "/c:/path/to/file"))
(should-not (tramp-tramp-file-p "/c::/path/to/file"))))
(should-not (tramp-tramp-file-p "/c::/path/to/file")))
(let ((system-type 'gnu/linux))
(should (tramp-tramp-file-p "/h:/path/to/file"))
(should (tramp-tramp-file-p "/m::/path/to/file"))))
(ert-deftest tramp-test02-file-name-dissect ()
"Check remote file name components."