diff options
| author | Denys Vlasenko | 2017-07-14 14:22:09 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-07-14 14:22:09 +0200 |
| commit | a03ac6067764549f4ae25f9a34e1ee9b0d2bb4f2 (patch) | |
| tree | aefa2efa17972508509fea6f24071c9ce1b8db05 | |
| parent | d5b98e2ef4b322c2203d6cd150a3a4080de5e1f4 (diff) | |
| download | busybox-a03ac6067764549f4ae25f9a34e1ee9b0d2bb4f2.zip busybox-a03ac6067764549f4ae25f9a34e1ee9b0d2bb4f2.tar.gz | |
libbb: safe_write should not return EINTR
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | libbb/safe_write.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libbb/safe_write.c b/libbb/safe_write.c index 8f76280..aad50f5 100644 --- a/libbb/safe_write.c +++ b/libbb/safe_write.c @@ -13,9 +13,17 @@ ssize_t FAST_FUNC safe_write(int fd, const void *buf, size_t count) { ssize_t n; - do { + for (;;) { n = write(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 write(), + * the "error" was transient. + */ + errno = 0; + /* repeat the write() */ + } return n; } |