Menu
▾
▴
[Tramp-checkins] CVS: tramp/lisp ChangeLog,2.100,2.101 tramp.el,2.100,2.101
|
From: Kai Gro?j. <ka...@us...> - 2002-05-22 09:23:40
|
Update of /cvsroot/tramp/tramp/lisp
In directory usw-pr-cvs1:/tmp/cvs-serv19218/tramp/lisp
Modified Files:
ChangeLog tramp.el
Log Message:
(tramp-find-shell, tramp-open-connection-telnet)
(tramp-open-connection-rsh, tramp-open-connection-su)
(tramp-open-connection-multi, tramp-multi-connect-telnet)
(tramp-multi-connect-rlogin)
(tramp-open-connection-setup-interactive-shell): Shell prompt
must match at end of buffer.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/ChangeLog,v
retrieving revision 2.100
retrieving revision 2.101
diff -C2 -d -r2.100 -r2.101
*** ChangeLog 21 May 2002 10:48:43 -0000 2.100
--- ChangeLog 22 May 2002 09:23:36 -0000 2.101
***************
*** 1,2 ****
--- 1,11 ----
+ 2002-05-22 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+ * tramp.el (tramp-find-shell, tramp-open-connection-telnet)
+ (tramp-open-connection-rsh, tramp-open-connection-su)
+ (tramp-open-connection-multi, tramp-multi-connect-telnet)
+ (tramp-multi-connect-rlogin)
+ (tramp-open-connection-setup-interactive-shell): Shell prompt
+ must match at end of buffer.
+
2002-05-21 Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
Index: tramp.el
===================================================================
RCS file: /cvsroot/tramp/tramp/lisp/tramp.el,v
retrieving revision 2.100
retrieving revision 2.101
diff -C2 -d -r2.100 -r2.101
*** tramp.el 21 May 2002 10:48:43 -0000 2.100
--- tramp.el 22 May 2002 09:23:36 -0000 2.101
***************
*** 3190,3194 ****
(unless (tramp-wait-for-regexp
(get-buffer-process (current-buffer))
! 60 (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't find remote `%s' prompt." shell))
--- 3190,3194 ----
(unless (tramp-wait-for-regexp
(get-buffer-process (current-buffer))
! 60 (format "\\(\\$ *\\|\\(%s\\)\\'\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't find remote `%s' prompt." shell))
***************
*** 3333,3337 ****
(unless (setq found
(tramp-wait-for-regexp
! p 30 (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
--- 3333,3337 ----
(unless (setq found
(tramp-wait-for-regexp
! p 30 (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
***************
*** 3402,3406 ****
p 60
(format
! "\\(%s\\)\\|\\(%s\\)"
tramp-password-prompt-regexp
shell-prompt-pattern)))
--- 3402,3406 ----
p 60
(format
! "\\(%s\\)\\|\\(%s\\)\\'"
tramp-password-prompt-regexp
shell-prompt-pattern)))
***************
*** 3421,3425 ****
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
--- 3421,3425 ----
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
***************
*** 3487,3491 ****
(unless (setq found (tramp-wait-for-regexp
p 30
! (format "\\(%s\\)\\|\\(%s\\)"
tramp-password-prompt-regexp
shell-prompt-pattern)))
--- 3487,3491 ----
(unless (setq found (tramp-wait-for-regexp
p 30
! (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-password-prompt-regexp
shell-prompt-pattern)))
***************
*** 3501,3505 ****
(unless (setq found
(tramp-wait-for-regexp
! p 30 (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
--- 3501,3505 ----
(unless (setq found
(tramp-wait-for-regexp
! p 30 (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
***************
*** 3559,3563 ****
(process-kill-without-query p)
(tramp-message 9 "Waiting 60s for local shell to come up...")
! (unless (tramp-wait-for-regexp p 60 shell-prompt-pattern)
(pop-to-buffer (buffer-name))
(kill-process p)
--- 3559,3564 ----
(process-kill-without-query p)
(tramp-message 9 "Waiting 60s for local shell to come up...")
! (unless (tramp-wait-for-regexp
! p 60 (format "%s\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(kill-process p)
***************
*** 3621,3625 ****
(tramp-message 9 "Waiting 60s for remote shell to come up...")
(unless (setq found (tramp-wait-for-regexp
! p 60 (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
--- 3622,3626 ----
(tramp-message 9 "Waiting 60s for remote shell to come up...")
(unless (setq found (tramp-wait-for-regexp
! p 60 (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern)))
***************
*** 3658,3662 ****
(unless (setq found
(tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)"
tramp-password-prompt-regexp
shell-prompt-pattern)))
--- 3659,3663 ----
(unless (setq found
(tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-password-prompt-regexp
shell-prompt-pattern)))
***************
*** 3670,3674 ****
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
--- 3671,3675 ----
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
***************
*** 3708,3712 ****
(tramp-message 9 "Waiting 60s for shell or passwd prompt for %s" (or user (user-login-name)))
(unless (setq found (tramp-wait-for-regexp
! p 60 (format "\\(%s\\)\\|\\(%s\\)"
tramp-password-prompt-regexp
shell-prompt-pattern)))
--- 3709,3713 ----
(tramp-message 9 "Waiting 60s for shell or passwd prompt for %s" (or user (user-login-name)))
(unless (setq found (tramp-wait-for-regexp
! p 60 (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-password-prompt-regexp
shell-prompt-pattern)))
***************
*** 3721,3725 ****
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
--- 3722,3726 ----
(tramp-message 9 "Sent password, waiting 60s for remote shell prompt")
(setq found (tramp-wait-for-regexp p 60
! (format "\\(%s\\)\\|\\(%s\\)\\'"
tramp-wrong-passwd-regexp
shell-prompt-pattern))))
***************
*** 3818,3823 ****
(tramp-message 9 "Waiting 30s for remote `%s' to come up..."
(tramp-get-remote-sh multi-method method))
! (unless (tramp-wait-for-regexp p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Remote `%s' didn't come up. See buffer `%s' for details"
--- 3819,3824 ----
(tramp-message 9 "Waiting 30s for remote `%s' to come up..."
(tramp-get-remote-sh multi-method method))
! (unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Remote `%s' didn't come up. See buffer `%s' for details"
***************
*** 3827,3832 ****
(process-send-string
nil (format "stty -inlcr -echo kill '^U'%s" tramp-rsh-end-of-line))
! (unless (tramp-wait-for-regexp p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `stty -echo', see buffer `%s'" (buffer-name)))
--- 3828,3833 ----
(process-send-string
nil (format "stty -inlcr -echo kill '^U'%s" tramp-rsh-end-of-line))
! (unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `stty -echo', see buffer `%s'" (buffer-name)))
***************
*** 3834,3839 ****
(process-send-string nil (format "TERM=dumb; export TERM%s"
tramp-rsh-end-of-line))
! (unless (tramp-wait-for-regexp p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `TERM=dumb; export TERM', see buffer `%s'" (buffer-name)))
--- 3835,3840 ----
(process-send-string nil (format "TERM=dumb; export TERM%s"
tramp-rsh-end-of-line))
! (unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `TERM=dumb; export TERM', see buffer `%s'" (buffer-name)))
***************
*** 3846,3850 ****
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `echo foo; echo bar' to determine line endings'"))
--- 3847,3851 ----
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `echo foo; echo bar' to determine line endings'"))
***************
*** 3874,3879 ****
(process-send-string nil (format "stty -onlcr%s" tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `stty -onlcr', see buffer `%s'" (buffer-name))))))
--- 3875,3879 ----
(process-send-string nil (format "stty -onlcr%s" tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `stty -onlcr', see buffer `%s'" (buffer-name))))))
***************
*** 3885,3890 ****
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error (concat "Couldn't `HISTFILE=$HOME/.tramp_history; "
--- 3885,3889 ----
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error (concat "Couldn't `HISTFILE=$HOME/.tramp_history; "
***************
*** 3897,3902 ****
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `set +o vi +o emacs', see buffer `%s'"
--- 3896,3900 ----
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `set +o vi +o emacs', see buffer `%s'"
***************
*** 3908,3913 ****
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `unset MAIL MAILCHECK MAILPATH', see buffer `%s'"
--- 3906,3910 ----
tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `unset MAIL MAILCHECK MAILPATH', see buffer `%s'"
***************
*** 3918,3923 ****
nil (format "unset CDPATH%s" tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30
! (format "\\(\\$\\|%s\\)" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `unset CDPATH', see buffer `%s'"
--- 3915,3919 ----
nil (format "unset CDPATH%s" tramp-rsh-end-of-line))
(unless (tramp-wait-for-regexp
! p 30 (format "\\(\\$ *\\|%s\\)\\'" shell-prompt-pattern))
(pop-to-buffer (buffer-name))
(error "Couldn't `unset CDPATH', see buffer `%s'"
|