[Tramp-checkins] CVS: tramp/lisp ChangeLog,2.64,2.65 tramp.el,2.67,2.68

[Kai Gro?j. <ka...@us...>]

Update of /cvsroot/tramp/tramp/lisp
In directory usw-pr-cvs1:/tmp/cvs-serv31358/tramp/lisp

Modified Files:
	ChangeLog tramp.el 
Log Message:
(tramp-handle-file-truename): Use
`tramp-method-for-buffer' to make sure that log messages end up
in the right buffer.  Correct braino in symlink handling.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.64
retrieving revision 2.65
diff -C2 -d -r2.64 -r2.65
*** ChangeLog	2002/01/05 12:27:57	2.64
--- ChangeLog	2002/01/06 14:02:38	2.65
***************
*** 1,2 ****
--- 1,8 ----
+ 2002-01-06  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+ 
+ 	* tramp.el (tramp-handle-file-truename): Use
+ 	`tramp-method-for-buffer' to make sure that log messages end up
+ 	in the right buffer.  Correct braino in symlink handling.
+ 
  2002-01-05  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
  

Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.67
retrieving revision 2.68
diff -C2 -d -r2.67 -r2.68
*** tramp.el	2002/01/05 12:27:57	2.67
--- tramp.el	2002/01/06 14:02:38	2.68
***************
*** 1377,1387 ****
  	 (curstri "")
  	 symlink-target)
!     (tramp-message 10 "Finding true name for `%s'" filename)
      (while (and steps (< numchase numchase-limit))
        (setq thisstep (pop steps))
!       (tramp-message 10 "Check %s"
! 		     (mapconcat 'identity
! 				(append '("") (reverse result) (list thisstep))
! 				"/"))
        (setq symlink-target
  	    (nth 0 (tramp-handle-file-attributes
--- 1377,1391 ----
  	 (curstri "")
  	 symlink-target)
!     (tramp-message-for-buffer
!      multi-method method user host
!      10 "Finding true name for `%s'" filename)
      (while (and steps (< numchase numchase-limit))
        (setq thisstep (pop steps))
!       (tramp-message-for-buffer
!        multi-method method user host
!        10 "Check %s"
!        (mapconcat 'identity
! 		  (append '("") (reverse result) (list thisstep))
! 		  "/"))
        (setq symlink-target
  	    (nth 0 (tramp-handle-file-attributes
***************
*** 1392,1408 ****
  				"/")))))
        (cond ((string= "." thisstep)
! 	     (tramp-message 10 "Ignoring step `.'"))
  	    ((string= ".." thisstep)
! 	     (tramp-message 10 "Processing step `..'")
  	     (pop result))
  	    ((stringp symlink-target)
  	     ;; It's a symlink, follow it.
! 	     (tramp-message
  	      10 "Follow symlink to %s" symlink-target)
  	     (setq numchase (1+ numchase))
  	     (setq steps
! 		   (if (file-name-absolute-p symlink-target)
! 		       (tramp-split-string symlink-target "/")
! 		     (append (tramp-split-string symlink-target "/") steps))))
  	    (t
  	     ;; It's a file.
--- 1396,1415 ----
  				"/")))))
        (cond ((string= "." thisstep)
! 	     (tramp-message-for-buffer multi-method method user host
! 				       10 "Ignoring step `.'"))
  	    ((string= ".." thisstep)
! 	     (tramp-message-for-buffer multi-method method user host
! 				       10 "Processing step `..'")
  	     (pop result))
  	    ((stringp symlink-target)
  	     ;; It's a symlink, follow it.
! 	     (tramp-message-for-buffer
! 	      multi-method method user host
  	      10 "Follow symlink to %s" symlink-target)
  	     (setq numchase (1+ numchase))
+ 	     (when (file-name-absolute-p symlink-target)
+ 	       (setq result nil))
  	     (setq steps
! 		   (append (tramp-split-string symlink-target "/") steps)))
  	    (t
  	     ;; It's a file.
***************
*** 1411,1415 ****
        (error "Maximum number (%d) of symlinks exceeded" numchase-limit))
      (setq result (reverse result))
!     (tramp-message
       10 "True name of `%s' is `%s'"
       filename (mapconcat 'identity (cons "" result) "/"))
--- 1418,1423 ----
        (error "Maximum number (%d) of symlinks exceeded" numchase-limit))
      (setq result (reverse result))
!     (tramp-message-for-buffer
!      multi-method method user host
       10 "True name of `%s' is `%s'"
       filename (mapconcat 'identity (cons "" result) "/"))