[Tramp-checkins] CVS: tramp/lisp tramp.el,2.65,2.66

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

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

Modified Files:
	tramp.el 
Log Message:
(tramp-find-shell): If starting bash for tilde
expansion, provide `--norc' argument.
(tramp-handle-file-truename): More debugging output.  More Obiwan
errors.


Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.65
retrieving revision 2.66
diff -C2 -d -r2.65 -r2.66
*** tramp.el	2002/01/04 17:28:52	2.65
--- tramp.el	2002/01/04 17:55:24	2.66
***************
*** 1379,1396 ****
      (tramp-message 10 "Finding true name for `%s'" filename)
      (while (and steps (< numchase numchase-limit))
!       (setq thisstep (car steps))
        (setq symlink-target
  	    (nth 0 (tramp-handle-file-attributes
  		    (tramp-make-tramp-file-name
  		     multi-method method user host
! 		     (concat "/" (mapconcat 'identity (reverse steps) "/")
! 			     "/" thisstep)))))
        (cond ((string= "." thisstep)
! 	     (pop steps))
  	    ((string= ".." thisstep)
! 	     (pop steps)
  	     (pop result))
  	    ((stringp symlink-target)
  	     ;; It's a symlink, follow it.
  	     (setq numchase (1+ numchase))
  	     (setq steps
--- 1379,1403 ----
      (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
  		    (tramp-make-tramp-file-name
  		     multi-method method user host
! 		     (mapconcat 'identity
! 				(append '("") (reverse result) (list thisstep))
! 				"/")))))
        (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
***************
*** 1400,1412 ****
  	    (t
  	     ;; It's a file.
- 	     (pop steps)
  	     (setq result (cons thisstep result)))))
      (when (>= numchase numchase-limit)
        (error "Maximum number (%d) of symlinks exceeded" numchase-limit))
!     (tramp-message 10 "True name of `%s' is `%s'"
! 		   filename (mapconcat 'identity (reverse result) "/"))
      (tramp-make-tramp-file-name
       multi-method method user host
!      (concat "/" (mapconcat 'identity (reverse result) "/")))))
  
  ;; Basic functions.
--- 1407,1420 ----
  	    (t
  	     ;; It's a file.
  	     (setq result (cons thisstep result)))))
      (when (>= numchase numchase-limit)
        (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) "/"))
      (tramp-make-tramp-file-name
       multi-method method user host
!      (mapconcat 'identity (cons "" result) "/"))))
  
  ;; Basic functions.