aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Lewis <martin.lewis.x84@gmail.com>2019-09-15 18:13:28 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2019-10-09 14:35:55 +0200
commitdd4686128290b34d61becaaba88c54d5213f7aa5 (patch)
tree9faef97f6325c369246524a31d1e331a38bf7b6b
parentad27d44ebe950335616f37e36863469dc181b455 (diff)
downloadbusybox-dd4686128290b34d61becaaba88c54d5213f7aa5.tar.gz
libbb: Converted safe_read to safe_write format
Changed safe_read to be symmetrical to safe_write, it shall never return EINTR because it calls read multiple times, the error is considered transient. function old new delta safe_read 44 57 +13 Signed-off-by: Martin Lewis <martin.lewis.x84@gmail.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/read.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/libbb/read.c b/libbb/read.c
index 5906bc225..a342506a8 100644
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -12,9 +12,17 @@ ssize_t FAST_FUNC safe_read(int fd, void *buf, size_t count)
{
ssize_t n;
- do {
+ for (;;) {
n = read(fd, buf, count);
- } while (n < 0 && errno == EINTR);
+ if (n >= 0 || errno != EINTR)
+ break;
+ /* Some callers set errno=0, are upset when they see EINTR.
+ * Returning EINTR is wrong since we retry read(),
+ * the "error" was transient.
+ */
+ errno = 0;
+ /* repeat the read() */
+ }
return n;
}