aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2017-11-20 12:10:18 +0100
committerHans Nilsson <[email protected]>2017-11-20 12:10:18 +0100
commitfbc24513ab2d241d912225d067b72e517742e698 (patch)
tree9681f34f10af325198018e2db74ab6a77ce977cb /erts/emulator
parent8aeb2efdb04aefd03a22ee7a9bdb9cc0af333db4 (diff)
parentbab7b1aba04209c90d15be7147cc3524ae6964f5 (diff)
downloadotp-fbc24513ab2d241d912225d067b72e517742e698.tar.gz
otp-fbc24513ab2d241d912225d067b72e517742e698.tar.bz2
otp-fbc24513ab2d241d912225d067b72e517742e698.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release ssh: testcases for space trailing Hello msg ssh: Don't remove trailing WS in Hello msg ssh: dialyzer fixes ssh: Fix broken error handling during session setup Remove invalid EINTR loop around close(2) Conflicts: OTP_VERSION
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/drivers/unix/unix_efile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index f8341f788a..33e4d75ef7 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -466,7 +466,7 @@ efile_may_openfile(Efile_error* errInfo, char *name) {
void
efile_closefile(int fd)
{
- while((close(fd) < 0) && (errno == EINTR));
+ close(fd);
}
int