aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/unix
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2017-09-11 15:15:57 +0200
committerLukas Larsson <[email protected]>2017-09-11 15:15:57 +0200
commit3b916092c488ef9d1fe93ab9c0afda88d589d97e (patch)
tree07ef98d2993f4c7da9df355371628528248584f5 /erts/emulator/drivers/unix
parentc15bb1698267ae64aac08b3b48040c44174700e5 (diff)
parent69721d73cb00e31e6b27ccdd363991cb1965b869 (diff)
downloadotp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.gz
otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.bz2
otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.zip
Merge branch 'lukas/erts/non-smp-removal-cleanup/OTP-14518'
* lukas/erts/non-smp-removal-cleanup/OTP-14518: Make estone work with older releases erts: Allow read in ttsl driver to return EAGAIN syntax_tools: Fix makefile dep erts: non-smp removal cleanup in erlexec
Diffstat (limited to 'erts/emulator/drivers/unix')
-rw-r--r--erts/emulator/drivers/unix/ttsl_drv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/drivers/unix/ttsl_drv.c b/erts/emulator/drivers/unix/ttsl_drv.c
index f3c1aa1c4a..8efe35e321 100644
--- a/erts/emulator/drivers/unix/ttsl_drv.c
+++ b/erts/emulator/drivers/unix/ttsl_drv.c
@@ -892,8 +892,8 @@ static void ttysl_from_tty(ErlDrvData ttysl_data, ErlDrvEvent fd)
tpos = 0;
}
}
- } else {
- DEBUGLOG(("ttysl_from_tty: driver failure in read(%d,..) = %d\n", (int)(SWord)fd, i));
+ } else if (errno != EAGAIN && errno != EWOULDBLOCK) {
+ DEBUGLOG(("ttysl_from_tty: driver failure in read(%d,..) = %d (errno = %d)\n", (int)(SWord)fd, i, errno));
driver_failure(ttysl_port, -1);
}
}