comparison lisp/net/tramp.el @ 91367:c70e45a7acfd

Merge from emacs--devo--0 Revision: [e-mail]/emacs--unicode--0--patch-324

91366:86f3a8f0a3a6

	     (tramp-copy-args            nil)
	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line nil))
    ("sudo"  (tramp-login-program        "sudo")
             (tramp-login-args           (("-u" "%u")
					  ("-s" "-p" "Password:")))
	     (tramp-remote-sh            "/bin/sh")
	     (tramp-copy-program         nil)
	     (tramp-copy-args            nil)
	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line nil))

	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line "xy") ;see docstring for "xy"
	     (tramp-default-port         22))
    ("plinkx"
             (tramp-login-program        "plink")
	     (tramp-login-args           (("-load" "%h") ("-t")
					  (,(format
					     "env 'TERM=%s' 'PROMPT_COMMAND=' 'PS1=$ '"
					     tramp-terminal-type))
					  ("/bin/sh")))
	     (tramp-remote-sh            "/bin/sh")

  :type '(repeat (choice
		  (const :tag "Default Directories" tramp-default-remote-path)
		  (string :tag "Directory"))))

(defcustom tramp-remote-process-environment
  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_CTYPE=C" "LC_TIME=C"
    ,(concat "TERM=" tramp-terminal-type)
    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
    "autocorrect=" "correct=")

  "*List of environment variables to be set on the remote host.

  :type '(choice (const nil) integer))

;;; Internal Variables:

(defvar tramp-end-of-output
  (concat
   "///" (md5 (concat
	       (prin1-to-string process-environment) (current-time-string))))
  "String used to recognize end of output.")

(defvar tramp-current-method nil
  "Connection method for this *tramp* buffer.")

	 (t
	  ;; One of them must be a Tramp file.
	  (error "Tramp implementation says this cannot happen")))

      ;; When newname did exist, we have wrong cached values.
      (when t2
	(with-parsed-tramp-file-name newname nil
	  (tramp-flush-file-property v localname))))))

(defun tramp-handle-shell-command
  (command &optional output-buffer error-buffer)
  "Like `shell-command' for Tramp files."
  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
	 (args (split-string (substring command 0 asynchronous) " "))
	 (output-buffer
	  (cond
	   ((bufferp output-buffer) output-buffer)
	   ((stringp output-buffer) (get-buffer-create output-buffer))
	   (output-buffer (current-buffer))
	   (t (generate-new-buffer
	       (if asynchronous
		   "*Async Shell Command*"
		 "*Shell Command Output*")))))
	 (error-buffer
	  (cond

	   ((stringp error-buffer) (get-buffer-create error-buffer))))
	 (buffer
	  (if (and (not asynchronous) error-buffer)
	      (with-parsed-tramp-file-name default-directory nil
		(list output-buffer (tramp-make-tramp-temp-file v)))
	    output-buffer)))

    (prog1
	;; Run the process.
	(if (integerp asynchronous)
	    (apply 'start-file-process "*Async Shell*" buffer args)
	  (apply 'process-file (car args) nil buffer nil (cdr args)))
      ;; Insert error messages if they were separated.
      (when (listp buffer)
	(with-current-buffer error-buffer (insert-file-contents (cadr buffer)))
	(delete-file (cadr buffer)))
      ;; There's some output, display it.
      (when (with-current-buffer output-buffer (> (point-max) (point-min)))
	(if (functionp 'display-message-or-buffer)
	    (funcall (symbol-function 'display-message-or-buffer) output-buffer)
	  (pop-to-buffer output-buffer))))))

;; File Editing.

(defvar tramp-handle-file-local-copy-hook nil
  "Normal hook to be run at the end of `tramp-handle-file-local-copy'.")

	  (let ((tramp-end-of-output "$ "))
	    (tramp-send-command
	     vec
	     (format "PROMPT_COMMAND='' PS1='$ ' PS2='' PS3='' exec %s" shell)
	     t))
	  (tramp-message vec 5 "Setting remote shell prompt...")
	  ;; Douglas Gray Stephens <[e-mail]> says that we
	  ;; must use "\n" here, not tramp-rsh-end-of-line.  Kai left the
	  ;; last tramp-rsh-end-of-line, Douglas wanted to replace that,
	  ;; as well.
	  (tramp-send-command
	   vec
	   (format "PS1='%s%s%s'"
		   tramp-rsh-end-of-line
		   tramp-end-of-output
		   tramp-rsh-end-of-line)
	   t)
	  (tramp-send-command vec "PS2=''" t)
	  (tramp-send-command vec "PS3=''" t)
	  (tramp-send-command vec "PROMPT_COMMAND=''" t)
	  (tramp-message vec 5 "Setting remote shell prompt...done"))
	 (t (tramp-message
	     vec 5 "Remote `%s' groks tilde expansion, good"
	     (tramp-get-method-parameter
	      (tramp-file-name-method vec) 'tramp-remote-sh))
	    (tramp-set-connection-property

  (tramp-message vec 5 "Setting shell prompt")
  ;; We can set $PS1 to `tramp-end-of-output' only when the echo has
  ;; been disabled.  Otherwise, the echo of the command would be
  ;; regarded as prompt already.
  (tramp-send-command
   vec
   (format "PS1='%s%s%s'"
	   tramp-rsh-end-of-line
           tramp-end-of-output
	   tramp-rsh-end-of-line)
   t)
  (tramp-send-command vec "PS2=''" t)
  (tramp-send-command vec "PS3=''" t)
  (tramp-send-command vec "PROMPT_COMMAND=''" t)

  ;; Try to set up the coding system correctly.

	  (tramp-error
	   vec 'file-error
	   "Method `%s' is not supported for multi-hops."
	   (tramp-file-name-method item)))))

    ;; Result.
    target-alist))

(defun tramp-maybe-open-connection (vec)
  "Maybe open a connection VEC.

(defun tramp-wait-for-output (proc &optional timeout)
  "Wait for output from remote rsh command."
  (with-current-buffer (process-buffer proc)
    ;; Initially, `tramp-end-of-output' is "$ ".  There might be
    ;; leading escape sequences, which must be ignored.
    (let* ((regexp (format "^[^$\n]*%s\r?$" (regexp-quote tramp-end-of-output)))
	   (found (tramp-wait-for-regexp proc timeout regexp)))
      (if found
	  (let (buffer-read-only)
	    (goto-char (point-max))
	    (re-search-backward regexp nil t)

      (unless match (error "Not a Tramp file name: %s" name))
      (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
	    (user      (match-string (nth 2 tramp-file-name-structure) name))
	    (host      (match-string (nth 3 tramp-file-name-structure) name))
	    (localname (match-string (nth 4 tramp-file-name-structure) name)))
	(if nodefault
	    (vector method user host localname)
	  (vector
	   (tramp-find-method method user host)
	   (tramp-find-user   method user host)

  "Return t if this is an out-of-band method, nil otherwise."
  (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program))

(defun tramp-local-host-p (vec)
  "Return t if this points to the local host, nil otherwise."
  (let ((host (tramp-file-name-real-host vec)))
    (and
     (stringp host)
     (string-match
      (concat "^" (regexp-opt (list "localhost" (system-name)) t) "$") host))))

;; Variables local to connection.

(defun tramp-get-remote-path (vec)
  (with-connection-property vec "remote-path"

     (progn
       (tramp-send-command
	vec (format "( %s / -nt / )" (tramp-get-test-command vec)))
       (with-current-buffer (tramp-get-buffer vec)
	 (goto-char (point-min))
	 (when (looking-at
		(format "\n%s\r?\n" (regexp-quote tramp-end-of-output)))
	   (format "%s %%s -nt %%s" (tramp-get-test-command vec)))))
     (progn
       (tramp-send-command
	vec
	(format

91367:c70e45a7acfd

	     (tramp-copy-args            nil)
	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line nil))
    ("sudo"  (tramp-login-program        "sudo")
             (tramp-login-args           (("-u" "%u")
					  ("-s") ("-H") ("-p" "Password:")))
	     (tramp-remote-sh            "/bin/sh")
	     (tramp-copy-program         nil)
	     (tramp-copy-args            nil)
	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line nil))

	     (tramp-copy-keep-date       nil)
	     (tramp-password-end-of-line "xy") ;see docstring for "xy"
	     (tramp-default-port         22))
    ("plinkx"
             (tramp-login-program        "plink")
	     ;; ("%h") must be a single element, see
	     ;; `tramp-compute-multi-hops'.
	     (tramp-login-args           (("-load") ("%h") ("-t")
					  (,(format
					     "env 'TERM=%s' 'PROMPT_COMMAND=' 'PS1=$ '"
					     tramp-terminal-type))
					  ("/bin/sh")))
	     (tramp-remote-sh            "/bin/sh")

  :type '(repeat (choice
		  (const :tag "Default Directories" tramp-default-remote-path)
		  (string :tag "Directory"))))

(defcustom tramp-remote-process-environment
  `("HISTFILE=$HOME/.tramp_history" "HISTSIZE=1" "LC_ALL=C"
    ,(concat "TERM=" tramp-terminal-type)
    "CDPATH=" "HISTORY=" "MAIL=" "MAILCHECK=" "MAILPATH="
    "autocorrect=" "correct=")

  "*List of environment variables to be set on the remote host.

  :type '(choice (const nil) integer))

;;; Internal Variables:

(defvar tramp-end-of-output
  (format
   "%s///%s%s"
   tramp-rsh-end-of-line
   (md5 (concat (prin1-to-string process-environment) (current-time-string)))
   tramp-rsh-end-of-line)
  "String used to recognize end of output.")

(defvar tramp-current-method nil
  "Connection method for this *tramp* buffer.")

	 (t
	  ;; One of them must be a Tramp file.
	  (error "Tramp implementation says this cannot happen")))

      ;; In case of `rename', we must flush the cache of the source file.
      (when (and t1 (eq op 'rename))
	(with-parsed-tramp-file-name filename nil
	  (tramp-flush-file-property v localname)))

      ;; When newname did exist, we have wrong cached values.
      (when t2
	(with-parsed-tramp-file-name newname nil
	  (tramp-flush-file-property v localname))))))

(defun tramp-handle-shell-command
  (command &optional output-buffer error-buffer)
  "Like `shell-command' for Tramp files."
  (let* ((asynchronous (string-match "[ \t]*&[ \t]*\\'" command))
	 ;; We cannot use `shell-file-name' and `shell-command-switch',
	 ;; they are variables of the local host.
	 (args (list "/bin/sh" "-c" (substring command 0 asynchronous)))
	 (output-buffer
	  (cond
	   ((bufferp output-buffer) output-buffer)
	   ((stringp output-buffer) (get-buffer-create output-buffer))
	   (output-buffer (current-buffer))
	   (t (get-buffer-create
	       (if asynchronous
		   "*Async Shell Command*"
		 "*Shell Command Output*")))))
	 (error-buffer
	  (cond

	   ((stringp error-buffer) (get-buffer-create error-buffer))))
	 (buffer
	  (if (and (not asynchronous) error-buffer)
	      (with-parsed-tramp-file-name default-directory nil
		(list output-buffer (tramp-make-tramp-temp-file v)))
	    output-buffer))
	 (proc (get-buffer-process output-buffer)))

    ;; Check whether there is another process running.  Tramp does not
    ;; support 2 (asynchronous) processes in parallel.
    (when proc
      (if (yes-or-no-p "A command is running.  Kill it? ")
	  (ignore-errors (kill-process proc))
	(error "Shell command in progress")))

    (with-current-buffer output-buffer
      (setq buffer-read-only nil
	    buffer-undo-list t)
      (erase-buffer))

    (if (integerp asynchronous)
	(prog1
	    ;; Run the process.
	    (apply 'start-file-process "*Async Shell*" buffer args)
	  ;; Display output.
	  (pop-to-buffer output-buffer))

      (prog1
	  ;; Run the process.
	  (apply 'process-file (car args) nil buffer nil (cdr args))
	;; Insert error messages if they were separated.
	(when (listp buffer)
	  (with-current-buffer error-buffer
	    (insert-file-contents (cadr buffer)))
	  (delete-file (cadr buffer)))
	;; There's some output, display it.
	(when (with-current-buffer output-buffer (> (point-max) (point-min)))
	  (if (functionp 'display-message-or-buffer)
	      (funcall (symbol-function 'display-message-or-buffer)
		       output-buffer)
	    (pop-to-buffer output-buffer)))))))

;; File Editing.

(defvar tramp-handle-file-local-copy-hook nil
  "Normal hook to be run at the end of `tramp-handle-file-local-copy'.")

	  (let ((tramp-end-of-output "$ "))
	    (tramp-send-command
	     vec
	     (format "PROMPT_COMMAND='' PS1='$ ' PS2='' PS3='' exec %s" shell)
	     t))
	  ;; Setting prompts.
	  (tramp-message vec 5 "Setting remote shell prompt...")
	  (tramp-send-command vec (format "PS1='%s'" 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-message vec 5 "Setting remote shell prompt...done"))

	 (t (tramp-message
	     vec 5 "Remote `%s' groks tilde expansion, good"
	     (tramp-get-method-parameter
	      (tramp-file-name-method vec) 'tramp-remote-sh))
	    (tramp-set-connection-property

  (tramp-message vec 5 "Setting shell prompt")
  ;; We can set $PS1 to `tramp-end-of-output' only when the echo has
  ;; been disabled.  Otherwise, the echo of the command would be
  ;; regarded as prompt already.
  (tramp-send-command vec (format "PS1='%s'" tramp-end-of-output) t)
  (tramp-send-command vec "PS2=''" t)
  (tramp-send-command vec "PS3=''" t)
  (tramp-send-command vec "PROMPT_COMMAND=''" t)

  ;; Try to set up the coding system correctly.

	  (tramp-error
	   vec 'file-error
	   "Method `%s' is not supported for multi-hops."
	   (tramp-file-name-method item)))))

    ;; In case the host name is not used for the remote shell
    ;; command, the user could be misguided by applying a random
    ;; hostname.
    (let* ((v (car target-alist))
	   (method (tramp-file-name-method v))
	   (host (tramp-file-name-host v)))
      (unless
	  (or
	   ;; There are multi-hops.
	   (cdr target-alist)
	   ;; The host name is used for the remote shell command.
	   (member
	    '("%h") (tramp-get-method-parameter method 'tramp-login-args))
	   ;; The host is local.  We cannot use `tramp-local-host-p'
	   ;; here, because it opens a connection as well.
	   (string-match
	    (concat "^" (regexp-opt (list "localhost" (system-name)) t) "$")
	    host))
	(tramp-error
	 v 'file-error
	 "Host `%s' looks like a remote host, `%s' can only use the local host"
	 host method)))

    ;; Result.
    target-alist))

(defun tramp-maybe-open-connection (vec)
  "Maybe open a connection VEC.

(defun tramp-wait-for-output (proc &optional timeout)
  "Wait for output from remote rsh command."
  (with-current-buffer (process-buffer proc)
    ;; Initially, `tramp-end-of-output' is "$ ".  There might be
    ;; leading escape sequences, which must be ignored.
    (let* ((regexp
	    (if (string-match (regexp-quote "\n") tramp-end-of-output)
		(mapconcat
		 'identity (split-string tramp-end-of-output "\n") "\r?\n")
	      (format "^[^$\n]*%s\r?$" (regexp-quote tramp-end-of-output))))
	   (found (tramp-wait-for-regexp proc timeout regexp)))
      (if found
	  (let (buffer-read-only)
	    (goto-char (point-max))
	    (re-search-backward regexp nil t)

      (unless match (error "Not a Tramp file name: %s" name))
      (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
	    (user      (match-string (nth 2 tramp-file-name-structure) name))
	    (host      (match-string (nth 3 tramp-file-name-structure) name))
	    (localname (match-string (nth 4 tramp-file-name-structure) name)))
	(when (member method '("multi" "multiu"))
	  (error
	   "`%s' method is no longer supported, see (info \"(tramp)Multi-hops\")"
	   method))
	(if nodefault
	    (vector method user host localname)
	  (vector
	   (tramp-find-method method user host)
	   (tramp-find-user   method user host)

  "Return t if this is an out-of-band method, nil otherwise."
  (tramp-get-method-parameter (tramp-file-name-method vec) 'tramp-copy-program))

(defun tramp-local-host-p (vec)
  "Return t if this points to the local host, nil otherwise."
  ;; We cannot use `tramp-file-name-real-host'.  A port is an
  ;; indication for an ssh tunnel or alike.
  (let ((host (tramp-file-name-host vec)))
    (and
     (stringp host)
     (string-match
      (concat "^" (regexp-opt (list "localhost" (system-name)) t) "$") host)
     ;; The local temp directory must be writable for the other user.
     (file-writable-p
      (tramp-make-tramp-file-name
       (tramp-file-name-method vec)
       (tramp-file-name-user vec)
       host
       (tramp-compat-temporary-file-directory))))))

;; Variables local to connection.

(defun tramp-get-remote-path (vec)
  (with-connection-property vec "remote-path"

     (progn
       (tramp-send-command
	vec (format "( %s / -nt / )" (tramp-get-test-command vec)))
       (with-current-buffer (tramp-get-buffer vec)
	 (goto-char (point-min))
	 (when (looking-at (regexp-quote tramp-end-of-output))
	   (format "%s %%s -nt %%s" (tramp-get-test-command vec)))))
     (progn
       (tramp-send-command
	vec
	(format