procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* net/tramp-adb.el (tramp-adb-parse-device-names)

Browse source 
(tramp-adb-maybe-open-connection): Add timeouts.  (Bug#13299)
This commit is contained in:
Michael Albinus 2013-02-27 10:20:13 +01:00
parent 6e65b9ccff
commit fa550654db
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2013-02-27 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-adb.el (tramp-adb-parse-device-names)
(tramp-adb-maybe-open-connection): Add timeouts. (Bug#13299)
2013-02-26 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-sh.el (tramp-sh-handle-insert-directory): Add

17
lisp/net/tramp-adb.el
View file

@ -157,13 +157,14 @@ pass to the OPERATION."
;;;###tramp-autoload
(defun tramp-adb-parse-device-names (ignore)
"Return a list of (nil host) tuples allowed to access."
(with-temp-buffer
(when (zerop (call-process (tramp-adb-program) nil t nil "devices"))
(let (result)
(goto-char (point-min))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
(add-to-list 'result (list nil (match-string 1))))
result))))
(with-timeout (10)
(with-temp-buffer
(when (zerop (call-process (tramp-adb-program) nil t nil "devices"))
(let (result)
(goto-char (point-min))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)
(add-to-list 'result (list nil (match-string 1))))
result)))))
(defun tramp-adb-handle-expand-file-name (name &optional dir)
"Like `expand-file-name' for Tramp files."
@ -1106,7 +1107,7 @@ connection if a previous connection has died for some reason."
(tramp-message
vec 6 "%s" (mapconcat 'identity (process-command p) " "))
;; Wait for initial prompt.
(tramp-adb-wait-for-output p)
(tramp-adb-wait-for-output p 30)
(unless (eq 'run (process-status p))
(tramp-error vec 'file-error "Terminated!"))
(tramp-compat-set-process-query-on-exit-flag p nil)