[Tramp-checkins] CVS: tramp/lisp ChangeLog,2.59,2.60 tramp.el,2.62,2.63

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

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

Modified Files:
	ChangeLog tramp.el 
Log Message:
(tramp-handle-file-truename): Another Obiwan error.
For relative symlinks "/a/b" pointing to "c/d", the "b" part
should not be part of the truename.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.59
retrieving revision 2.60
diff -C2 -d -r2.59 -r2.60
*** ChangeLog	2002/01/01 19:51:18	2.59
--- ChangeLog	2002/01/02 14:14:28	2.60
***************
*** 1,2 ****
--- 1,8 ----
+ 2002-01-02  Kai Großjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+ 
+ 	* tramp.el (tramp-handle-file-truename): Another Obiwan error.
+ 	For relative symlinks "/a/b" pointing to "c/d", the "b" part
+ 	should not be part of the truename.
+ 
  2002-01-01  Kai Grossjohann  <ka...@ls...>
  

Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.62
retrieving revision 2.63
diff -C2 -d -r2.62 -r2.63
*** tramp.el	2002/01/01 19:51:18	2.62
--- tramp.el	2002/01/02 14:14:28	2.63
***************
*** 1386,1400 ****
  	     (pop steps))
  	    (t
- 	     (setq curstri (concat curstri "/" thisstep))
  	     (setq symlink-target
  		   (nth 0 (file-attributes (tramp-make-tramp-file-name
  					    multi-method method user host
! 					    curstri))))
  	     (if (not (stringp symlink-target))
  		 ;; It's not a symlink; do next loop iteration.
! 		 (pop steps)
  	       ;; It's a symlink.
  	       (pop steps)
! 	       (when (string= curstri symlink-target)
  		 (error "Link `%s' points to itself" curstri))
  	       (setq steps (append (split-string symlink-target "/") steps)
--- 1386,1402 ----
  	     (pop steps))
  	    (t
  	     (setq symlink-target
  		   (nth 0 (file-attributes (tramp-make-tramp-file-name
  					    multi-method method user host
! 					    (concat curstri "/" thisstep)))))
  	     (if (not (stringp symlink-target))
  		 ;; It's not a symlink; do next loop iteration.
! 		 (progn
! 		   (pop steps)
! 		   (setq curstri (concat curstri "/" thisstep)))
  	       ;; It's a symlink.
  	       (pop steps)
! 	       (when (or (string= curstri symlink-target)
! 			 (string= thisstep symlink-target))
  		 (error "Link `%s' points to itself" curstri))
  	       (setq steps (append (split-string symlink-target "/") steps)