comparison lisp/net/tramp.el @ 111926:992f5b43dbfc

* net/tramp.el (tramp-handle-start-file-process): Protect buffer-modified value. (Bug#7557) (tramp-action-password): Delete region, do not narrow. (tramp-process-actions): Do not widen.

111925:b2e1ce1e5b73

;; this, its original contents must be saved, and restored once
;; connection has been setup.
(defun tramp-handle-start-file-process (name buffer program &rest args)
  "Like `start-file-process' for Tramp files."
  (with-parsed-tramp-file-name default-directory nil
    (unwind-protect
	;; When PROGRAM is nil, we just provide a tty.
	(let ((command
	       (when (stringp program)
		 (format "cd %s; exec %s"
			 (tramp-shell-quote-argument localname)
			 (mapconcat 'tramp-shell-quote-argument
				    (cons program args) " "))))
	      (tramp-process-connection-type
	       (or (null program) tramp-process-connection-type))
	      (name1 name)
	      (i 0))
	  (unless buffer
	    ;; BUFFER can be nil.  We use a temporary buffer.
	    (setq buffer (generate-new-buffer tramp-temp-buffer-name)))
	  (while (get-process name1)
	    ;; NAME must be unique as process name.
	    (setq i (1+ i)
		  name1 (format "%s<%d>" name i)))
	  (setq name name1)
	  ;; Set the new process properties.
	  (tramp-set-connection-property v "process-name" name)
	  (tramp-set-connection-property v "process-buffer" buffer)
	  ;; Activate narrowing in order to save BUFFER contents.
	  ;; Clear also the modification time; otherwise we might be
	  ;; interrupted by `verify-visited-file-modtime'.
	  (with-current-buffer (tramp-get-connection-buffer v)
	    (clear-visited-file-modtime)
	    (narrow-to-region (point-max) (point-max)))
	  (if command
	      ;; Send the command.
	      (tramp-send-command v command nil t) ; nooutput
	    ;; Check, whether a pty is associated.
	    (tramp-maybe-open-connection v)
	    (unless (process-get (tramp-get-connection-process v) 'remote-tty)
	      (tramp-error
	       v 'file-error "pty association is not supported for `%s'" name)))
	  (let ((p (tramp-get-connection-process v)))
	    ;; Set sentinel and query flag for this process.
	    (tramp-set-connection-property p "vector" v)
	    (set-process-sentinel p 'tramp-process-sentinel)
	    (tramp-set-process-query-on-exit-flag p t)
	    ;; Return process.
	    p))
      ;; Save exit.
      (with-current-buffer (tramp-get-connection-buffer v)
	(if (string-match tramp-temp-buffer-name (buffer-name))
	    (progn
	      (set-process-buffer (tramp-get-connection-process v) nil)
	      (kill-buffer (current-buffer)))
	  (widen)
	  (goto-char (point-max))))
      (tramp-set-connection-property v "process-name" nil)
      (tramp-set-connection-property v "process-buffer" nil))))

(defun tramp-handle-process-file
  (program &optional infile destination display &rest args)
  "Like `process-file' for Tramp files."
  ;; The implementation is not complete yet.

(defun tramp-action-password (proc vec)
  "Query the user for a password."
  (with-current-buffer (process-buffer proc)
    (tramp-check-for-regexp proc tramp-password-prompt-regexp)
    (tramp-message vec 3 "Sending %s" (match-string 1))
    (tramp-enter-password proc)
    ;; Hide password prompt.
    (narrow-to-region (point-max) (point-max))))

(defun tramp-action-succeed (proc vec)
  "Signal success in finding shell prompt."
  (throw 'tramp-action 'ok))

		(if timeout
		    (with-timeout (timeout)
		      (tramp-process-one-action proc vec actions))
		  (tramp-process-one-action proc vec actions)))))
      (with-current-buffer (tramp-get-connection-buffer vec)
	(widen)
	(tramp-message vec 6 "\n%s" (buffer-string)))
      (unless (eq exit 'ok)
	(tramp-clear-passwd vec)
	(tramp-error-with-buffer
	 nil vec 'file-error

111926:992f5b43dbfc

;; this, its original contents must be saved, and restored once
;; connection has been setup.
(defun tramp-handle-start-file-process (name buffer program &rest args)
  "Like `start-file-process' for Tramp files."
  (with-parsed-tramp-file-name default-directory nil
    ;; When PROGRAM is nil, we just provide a tty.
    (let ((command
	   (when (stringp program)
	     (format "cd %s; exec %s"
		     (tramp-shell-quote-argument localname)
		     (mapconcat 'tramp-shell-quote-argument
				(cons program args) " "))))
	  (tramp-process-connection-type
	   (or (null program) tramp-process-connection-type))
	  (bmp (and (buffer-live-p buffer) (buffer-modified-p buffer)))
	  (name1 name)
	  (i 0))
      (unwind-protect
	  (save-excursion
	    (save-restriction
	      (unless buffer
		;; BUFFER can be nil.  We use a temporary buffer.
		(setq buffer (generate-new-buffer tramp-temp-buffer-name)))
	      (while (get-process name1)
		;; NAME must be unique as process name.
		(setq i (1+ i)
		      name1 (format "%s<%d>" name i)))
	      (setq name name1)
	      ;; Set the new process properties.
	      (tramp-set-connection-property v "process-name" name)
	      (tramp-set-connection-property v "process-buffer" buffer)
	      ;; Activate narrowing in order to save BUFFER contents.
	      ;; Clear also the modification time; otherwise we might
	      ;; be interrupted by `verify-visited-file-modtime'.
	      (with-current-buffer (tramp-get-connection-buffer v)
		(let ((buffer-undo-list t))
		  (clear-visited-file-modtime)
		  (narrow-to-region (point-max) (point-max))
		  (if command
		      ;; Send the command.
		      (tramp-send-command v command nil t) ; nooutput
		    ;; Check, whether a pty is associated.
		    (tramp-maybe-open-connection v)
		    (unless (process-get
			     (tramp-get-connection-process v) 'remote-tty)
		      (tramp-error
		       v 'file-error
		       "pty association is not supported for `%s'" name)))))
	      (let ((p (tramp-get-connection-process v)))
		;; Set sentinel and query flag for this process.
		(tramp-set-connection-property p "vector" v)
		(set-process-sentinel p 'tramp-process-sentinel)
		(tramp-set-process-query-on-exit-flag p t)
		;; Return process.
		p)))
	;; Save exit.
	(with-current-buffer (tramp-get-connection-buffer v)
	  (if (string-match tramp-temp-buffer-name (buffer-name))
	      (progn
		(set-process-buffer (tramp-get-connection-process v) nil)
		(kill-buffer (current-buffer)))
	    (set-buffer-modified-p bmp)))
	(tramp-set-connection-property v "process-name" nil)
	(tramp-set-connection-property v "process-buffer" nil)))))

(defun tramp-handle-process-file
  (program &optional infile destination display &rest args)
  "Like `process-file' for Tramp files."
  ;; The implementation is not complete yet.

(defun tramp-action-password (proc vec)
  "Query the user for a password."
  (with-current-buffer (process-buffer proc)
    (tramp-check-for-regexp proc tramp-password-prompt-regexp)
    (tramp-message vec 3 "Sending %s" (match-string 1))
    (tramp-message vec 6 "\n%s" (buffer-string)))
    (tramp-enter-password proc)
    ;; Remove password prompt, in order not to find it next iteration.
    (delete-region (point-min) (point-max)))

(defun tramp-action-succeed (proc vec)
  "Signal success in finding shell prompt."
  (throw 'tramp-action 'ok))

		(if timeout
		    (with-timeout (timeout)
		      (tramp-process-one-action proc vec actions))
		  (tramp-process-one-action proc vec actions)))))
      (with-current-buffer (tramp-get-connection-buffer vec)
	(tramp-message vec 6 "\n%s" (buffer-string)))
      (unless (eq exit 'ok)
	(tramp-clear-passwd vec)
	(tramp-error-with-buffer
	 nil vec 'file-error