Work on Tramp's (symbolic) links

* doc/misc/tramp.texi (Traces and Profiles): Mention the
backtrace when tramp-verbose is greater than or equal to 10.

* lisp/net/tramp-adb.el (tramp-adb-file-name-handler-alist):
Use `tramp-handle-add-name-to-file'.

* lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist): Use
`tramp-handle-add-name-to-file' and `tramp-handle-file-truename'.

* lisp/net/tramp-sh.el (tramp-sh-handle-make-symbolic-link): Improve.

* lisp/net/tramp-smb.el (tramp-smb-errors):
Add "NT_STATUS_CONNECTION_DISCONNECTED" and
"NT_STATUS_OBJECT_PATH_SYNTAX_BAD".
(tramp-smb-file-name-handler-alist): Use `tramp-handle-file-truename'.
(tramp-smb-do-file-attributes-with-stat): Return non-nil only
if one of the attributes is non-nil.
(tramp-smb-handle-file-local-copy): Use `file-truename'.
(tramp-smb-handle-file-truename): Move to tramp.el.
(tramp-smb-handle-insert-directory): Show symlinks.
(tramp-smb-handle-make-symbolic-link): Improve.
(tramp-smb-read-file-entry): Handle extended file modes in Samba.

* lisp/net/tramp.el (tramp-handle-add-name-to-file)
(tramp-handle-file-truename): New defuns.

* test/lisp/net/tramp-tests.el (tramp-test21-file-links): Extend test.
(tramp--test-check-files): Make check for "smb".

1 files changed, 51 insertions, 44 deletions

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 85966f122d2..597ca6a6202 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1063,52 +1063,59 @@ component is used as the target of the symlink."
        'make-symbolic-link (list target linkname ok-if-already-exists))
 
     (with-parsed-tramp-file-name linkname nil
-      (let ((ln (tramp-get-remote-ln v))
-	    (cwd (tramp-run-real-handler
-		  'file-name-directory (list localname))))
-	(unless ln
-	  (tramp-error
-	   v 'file-error
+      ;; If TARGET is a Tramp name, use just the localname component.
+      (when (and (tramp-tramp-file-p target)
+		 (tramp-file-name-equal-p v (tramp-dissect-file-name target)))
+	(setq target
+	      (tramp-file-name-localname
+	       (tramp-dissect-file-name (expand-file-name target)))))
+
+      ;; If TARGET is still remote, quote it.
+      (if (tramp-tramp-file-p target)
+	  (make-symbolic-link
+	   (let (file-name-handler-alist) (tramp-compat-file-name-quote target))
+	   linkname ok-if-already-exists)
+
+	(let ((ln (tramp-get-remote-ln v))
+	      (cwd (tramp-run-real-handler
+		    'file-name-directory (list localname))))
+	  (unless ln
+	    (tramp-error
+	     v 'file-error
 	   "Making a symbolic link.  ln(1) does not exist on the remote host."))
 
-	;; Do the 'confirm if exists' thing.
-	(when (file-exists-p linkname)
-	  ;; What to do?
-	  (if (or (null ok-if-already-exists) ; not allowed to exist
-		  (and (numberp ok-if-already-exists)
-		       (not (yes-or-no-p
-			     (format
-			      "File %s already exists; make it a link anyway? "
-			      localname)))))
-	      (tramp-error v 'file-already-exists localname)
-	    (delete-file linkname)))
-
-	;; If TARGET is a Tramp name, use just the localname component.
-	(when (and (tramp-tramp-file-p target)
-		   (tramp-file-name-equal-p
-		    v (tramp-dissect-file-name target)))
-	  (setq target
-		(tramp-file-name-localname
-		 (tramp-dissect-file-name (expand-file-name target)))))
-
-	(tramp-flush-file-property v (file-name-directory localname))
-	(tramp-flush-file-property v localname)
-
-	;; Right, they are on the same host, regardless of user, method,
-	;; etc.  We now make the link on the remote machine. This will
-	;; occur as the user that TARGET belongs to.
-	(and (tramp-send-command-and-check
-              v (format "cd %s" (tramp-shell-quote-argument cwd)))
-             (tramp-send-command-and-check
-              v (format
-		 "%s -sf %s %s" ln
-		 (tramp-shell-quote-argument target)
-		 ;; The command could exceed PATH_MAX, so we use
-		 ;; relative file names.  However, relative file names
-		 ;; could start with "-".  `tramp-shell-quote-argument'
-		 ;; does not handle this, we must do it ourselves.
-		 (tramp-shell-quote-argument
-                  (concat "./" (file-name-nondirectory localname))))))))))
+	  ;; Do the 'confirm if exists' thing.
+	  (when (file-exists-p linkname)
+	    ;; What to do?
+	    (if (or (null ok-if-already-exists) ; not allowed to exist
+		    (and (numberp ok-if-already-exists)
+			 (not
+			  (yes-or-no-p
+			   (format
+			    "File %s already exists; make it a link anyway? "
+			    localname)))))
+		(tramp-error v 'file-already-exists localname)
+	      (delete-file linkname)))
+
+	  (tramp-flush-file-property v (file-name-directory localname))
+	  (tramp-flush-file-property v localname)
+
+	  ;; Right, they are on the same host, regardless of user,
+	  ;; method, etc.  We now make the link on the remote
+	  ;; machine. This will occur as the user that TARGET belongs to.
+	  (and (tramp-send-command-and-check
+		v (format "cd %s" (tramp-shell-quote-argument cwd)))
+               (tramp-send-command-and-check
+		v (format
+		   "%s -sf %s %s" ln
+		   (tramp-shell-quote-argument target)
+		   ;; The command could exceed PATH_MAX, so we use
+		   ;; relative file names.  However, relative file
+		   ;; names could start with "-".
+		   ;; `tramp-shell-quote-argument' does not handle
+		   ;; this, we must do it ourselves.
+		   (tramp-shell-quote-argument
+                    (concat "./" (file-name-nondirectory localname)))))))))))
 
 (defun tramp-sh-handle-file-truename (filename)
   "Like `file-truename' for Tramp files."