* net/tramp.el (tramp-open-shell): New defun.

(tramp-find-shell, tramp-open-connection-setup-interactive-shell):
Use it.

2 files changed, 33 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b1c419f55e..a4a0fa5c873 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2010-07-23  Michael Albinus  <michael.albinus@gmx.de>
 
+        * net/tramp.el (tramp-open-shell): New defun.
+        (tramp-find-shell, tramp-open-connection-setup-interactive-shell):
+        Use it.
+
+2010-07-23  Michael Albinus  <michael.albinus@gmx.de>
+
         * net/tramp.el (tramp-file-name-regexp-unified)
         (tramp-completion-file-name-regexp-unified): On W32 systems, do
         not regard the volume letter as remote filename.  (Bug#5447)
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1e679c9262e..0afc4c95799 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -6598,7 +6598,29 @@ file exists and nonzero exit status otherwise."
        vec 'file-error "Couldn't find command to check if file exists"))
     result))
 
-;; CCC test ksh or bash found for tilde expansion?
+(defun tramp-open-shell (vec shell)
+  "Opens shell SHELL."
+  (with-progress-reporter vec 5 (format "Opening remote shell `%s'" shell)
+    ;; Find arguments for this shell.
+    (let ((tramp-end-of-output tramp-initial-end-of-output)
+          (alist tramp-sh-extra-args)
+          item extra-args)
+      (while (and alist (null extra-args))
+        (setq item (pop alist))
+        (when (string-match (car item) shell)
+          (setq extra-args (cdr item))))
+      (when extra-args (setq shell (concat shell " " extra-args)))
+      (tramp-send-command
+       vec (format "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
+                   (shell-quote-argument tramp-end-of-output) shell)
+       t))
+    ;; Setting prompts.
+    (tramp-send-command
+     vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
+    (tramp-send-command vec "PS2=''" t)
+    (tramp-send-command vec "PS3=''" t)
+    (tramp-send-command vec "PROMPT_COMMAND=''" t)))
+
 (defun tramp-find-shell (vec)
   "Opens a shell on the remote host which groks tilde expansion."
   (unless (tramp-get-connection-property vec "remote-shell" nil)
@@ -6619,29 +6641,9 @@ file exists and nonzero exit status otherwise."
             (tramp-error
              vec 'file-error
              "Couldn't find a shell which groks tilde expansion"))
-          ;; Find arguments for this shell.
-          (let ((alist tramp-sh-extra-args)
-                item extra-args)
-            (while (and alist (null extra-args))
-              (setq item (pop alist))
-              (when (string-match (car item) shell)
-                (setq extra-args (cdr item))))
-            (when extra-args (setq shell (concat shell " " extra-args))))
           (tramp-message
            vec 5 "Starting remote shell `%s' for tilde expansion" shell)
-          (let ((tramp-end-of-output tramp-initial-end-of-output))
-            (tramp-send-command
-             vec
-             (format "PROMPT_COMMAND='' PS1=%s PS2='' PS3='' exec %s"
-                     (shell-quote-argument tramp-end-of-output) shell)
-             t))
-          ;; Setting prompts.
-          (with-progress-reporter vec 5 (format "Setting remote shell prompt")
-            (tramp-send-command
-             vec (format "PS1=%s" (shell-quote-argument tramp-end-of-output)) t)
-            (tramp-send-command vec "PS2=''" t)
-            (tramp-send-command vec "PS3=''" t)
-            (tramp-send-command vec "PROMPT_COMMAND=''" t)))
+          (tramp-open-shell vec shell))
 
          (t (tramp-message
              vec 5 "Remote `%s' groks tilde expansion, good"
@@ -6922,14 +6924,9 @@ process to set up.  VEC specifies the connection."
     ;; way, we avoid the startup file clobbering $PS1.  $PROMP_COMMAND
     ;; is another way to set the prompt in /bin/bash, it must be
     ;; discarded as well.
-    (tramp-send-command
+    (tramp-open-shell
      vec
-     (format
-      "exec env ENV='' PROMPT_COMMAND='' PS1=%s PS2='' PS3='' %s"
-      (shell-quote-argument tramp-end-of-output)
-      (tramp-get-method-parameter
-       (tramp-file-name-method vec) 'tramp-remote-sh))
-     t)
+     (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-remote-sh))
 
     ;; Disable echo.
     (tramp-message vec 5 "Setting up remote shell environment")
@@ -7045,7 +7042,7 @@ process to set up.  VEC specifies the connection."
   ;; "echo $?"  part if the "test" part has an error.  In particular,
   ;; the OpenSolaris /bin/sh is a problem.  There are also other
   ;; problems with /bin/sh of OpenSolaris, like redirection of stderr
-  ;; in in function declarations, or changing HISTFILE in place.
+  ;; in function declarations, or changing HISTFILE in place.
   ;; Therefore, OpenSolaris' /bin/sh is replaced by bash, when
   ;; detected.
   (tramp-find-shell vec)
@@ -8890,7 +8887,6 @@ Only works for Bourne-like shells."
 ;;   likely to produce long command lines, and some shells choke on
 ;;   long command lines.
 ;; * How to deal with MULE in `insert-file-contents' and `write-region'?
-;; * Test remote ksh or bash for tilde expansion in `tramp-find-shell'?
 ;; * abbreviate-file-name
 ;; * Better error checking.  At least whenever we see something
 ;;   strange when doing zerop, we should kill the process and start