[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/05: ssh: Pass an empty "exceptfds" set to 'select'.
From: |
Ludovic Courtès |
Subject: |
04/05: ssh: Pass an empty "exceptfds" set to 'select'. |
Date: |
Wed, 10 Jan 2018 18:01:26 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 55f40fdbcdd98d1d1c0110d508079c068bf7f81d
Author: Ludovic Courtès <address@hidden>
Date: Wed Jan 10 23:06:08 2018 +0100
ssh: Pass an empty "exceptfds" set to 'select'.
Previously the redirect code could end up exiting prematurely because of
an uninteresting "exceptional condition" on the socket (info "(libc)
Waiting for I/O").
* guix/ssh.scm (remote-daemon-channel): Pass the empty list as the third
argument to 'select'. It was a mistake to pass a non-empty list there
in the first place.
---
guix/ssh.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/guix/ssh.scm b/guix/ssh.scm
index 96e4af9..cb560c0 100644
--- a/guix/ssh.scm
+++ b/guix/ssh.scm
@@ -124,8 +124,8 @@ Throw an error on failure."
(connect sock AF_UNIX ,socket-name)
(let loop ()
- (match (select (list stdin sock) '() (list stdin stdout sock))
- ((reads writes ())
+ (match (select (list stdin sock) '() '())
+ ((reads () ())
(when (memq stdin reads)
(match (read! stdin buffer)
((? zero?) ;EOF