comparison lisp/net/tramp.el @ 84942:437d3bb02139

* net/tramp.el (tramp-maybe-open-connection): Make test for alive connection more robust.

84941:89bab9e0761d

       '(0 0) '(0 0) '(0 0)		;CCC how to find out?
       ;; 7. Size in bytes (-1, if number is out of range).
       res-size
       ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
       res-filemodes
       ;; 9. t iff file's gid would change if file were deleted and
       ;; recreated.  Will be set in `tramp-convert-file-attributes'
       t
       ;; 10. inode number.
       res-inode
       ;; 11. Device number.  Will be replaced by a virtual device number.

	;; stty, instead.
	(tramp-send-command-internal vec "stty -onlcr"))))
  (tramp-send-command-internal vec "set +o vi +o emacs")
  (tramp-message vec 5 "Setting shell prompt")
  ;; Douglas Gray Stephens <[e-mail]> says that we must
  ;; use "\n" here, not tramp-rsh-end-of-line.  We also manually frob
  ;; the last time we sent a command, to avoid `tramp-send-command' to
  ;; send "echo are you awake".
  (tramp-send-command
   vec
   (format "PROMPT_COMMAND=''; PS1='%s%s%s'; PS2=''; PS3=''"
	   tramp-rsh-end-of-line
           tramp-end-of-output

    ;; using ssh, it can sometimes happen that the remote end has hung
    ;; up but the local ssh client doesn't recognize this until it
    ;; tries to send some data to the remote end.  So that's why we
    ;; try to send a command from time to time, then look again
    ;; whether the process is really alive.
    (when (and (> (tramp-time-diff
		   (current-time)
		   (tramp-get-connection-property p "last-cmd-time" '(0 0 0)))
		  60)
	       p (processp p) (memq (process-status p) '(run open)))
      (tramp-send-command vec "echo are you awake" t t)
      (unless (and (memq (process-status p) '(run open))
		   (tramp-wait-for-output p 10))
	(delete-process p)
	(setq p nil)))

    ;; New connection must be opened.
    (unless (and p (processp p) (memq (process-status p) '(run open)))

      ;; We call `tramp-get-buffer' in order to get a debug buffer for

    (and (stringp host)
	 (string-match tramp-host-with-port-regexp host)
	 (string-to-number (match-string 2 host)))))

(defun tramp-tramp-file-p (name)
  "Return t iff NAME is a tramp file."
  (save-match-data
    (string-match tramp-file-name-regexp name)))

(defun tramp-find-method (method user host)
  "Return the right method string to use.

84942:437d3bb02139

       '(0 0) '(0 0) '(0 0)		;CCC how to find out?
       ;; 7. Size in bytes (-1, if number is out of range).
       res-size
       ;; 8. File modes, as a string of ten letters or dashes as in ls -l.
       res-filemodes
       ;; 9. t if file's gid would change if file were deleted and
       ;; recreated.  Will be set in `tramp-convert-file-attributes'
       t
       ;; 10. inode number.
       res-inode
       ;; 11. Device number.  Will be replaced by a virtual device number.

	;; stty, instead.
	(tramp-send-command-internal vec "stty -onlcr"))))
  (tramp-send-command-internal vec "set +o vi +o emacs")
  (tramp-message vec 5 "Setting shell prompt")
  ;; Douglas Gray Stephens <[e-mail]> says that we must
  ;; use "\n" here, not tramp-rsh-end-of-line.
  (tramp-send-command
   vec
   (format "PROMPT_COMMAND=''; PS1='%s%s%s'; PS2=''; PS3=''"
	   tramp-rsh-end-of-line
           tramp-end-of-output

    ;; using ssh, it can sometimes happen that the remote end has hung
    ;; up but the local ssh client doesn't recognize this until it
    ;; tries to send some data to the remote end.  So that's why we
    ;; try to send a command from time to time, then look again
    ;; whether the process is really alive.
    (condition-case nil
	(when (and (> (tramp-time-diff
		       (current-time)
		       (tramp-get-connection-property
			p "last-cmd-time" '(0 0 0)))
		      60)
		   p (processp p) (memq (process-status p) '(run open)))
	  (tramp-send-command vec "echo are you awake" t t)
	  (unless (and (memq (process-status p) '(run open))
		       (tramp-wait-for-output p 10))
	    ;; The error will be catched locally.
	    (tramp-error vec 'file-error "Awake did fail")))
      (file-error
       (tramp-flush-connection-property vec nil)
       (tramp-flush-connection-property p nil)
       (delete-process p)
       (setq p nil)))

    ;; New connection must be opened.
    (unless (and p (processp p) (memq (process-status p) '(run open)))

      ;; We call `tramp-get-buffer' in order to get a debug buffer for

    (and (stringp host)
	 (string-match tramp-host-with-port-regexp host)
	 (string-to-number (match-string 2 host)))))

(defun tramp-tramp-file-p (name)
  "Return t if NAME is a tramp file."
  (save-match-data
    (string-match tramp-file-name-regexp name)))

(defun tramp-find-method (method user host)
  "Return the right method string to use.