summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-adb.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-01-15 10:18:45 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2019-01-15 10:21:09 -0800
commit9fc02ff5ea95c31a8d81eabb5634aa135fcd8786 (patch)
treec6a8b2db65efc5b51a184658a0672f89b625015e /lisp/net/tramp-adb.el
parent223e7b87872d4a010ae1c9a6f09a9c15aee46692 (diff)
downloademacs-9fc02ff5ea95c31a8d81eabb5634aa135fcd8786.tar.gz
Fix accept-process-output/process-live-p confusion
* doc/lispref/processes.texi (Accepting Output): Document the issue. * lisp/net/tramp-adb.el (tramp-adb-parse-device-names): * lisp/net/tramp-rclone.el (tramp-rclone-parse-device-names): * lisp/net/tramp-smb.el (tramp-smb-wait-for-output): * lisp/net/tramp.el (tramp-interrupt-process): * test/src/process-tests.el (make-process/mix-stderr): Fix code that uses accept-process-output and process-live-p. Add FIXME comments as necessary. * lisp/net/tramp-sudoedit.el (tramp-sudoedit-action-sudo): * lisp/net/tramp.el (tramp-action-out-of-band): Add FIXME comments as necessary.
Diffstat (limited to 'lisp/net/tramp-adb.el')
-rw-r--r--lisp/net/tramp-adb.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index e2275bee2a4..ca47601e4bd 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -206,9 +206,9 @@ pass to the OPERATION."
(tramp-message v 6 "%s" (mapconcat 'identity (process-command p) " "))
(process-put p 'adjust-window-size-function 'ignore)
(set-process-query-on-exit-flag p nil)
- (while (process-live-p p)
- (accept-process-output p 0.1))
- (accept-process-output p 0.1)
+ ;; FIXME: Either remove " 0.1", or comment why it's needed.
+ (while (or (accept-process-output p 0.1)
+ (process-live-p p)))
(tramp-message v 6 "\n%s" (buffer-string))
(goto-char (point-min))
(while (search-forward-regexp "^\\(\\S-+\\)[[:space:]]+device$" nil t)