From: Tom Gundersen <teg@jklm.no>
Date: Fri, 15 May 2015 23:07:45 +0000 (+0200)
Subject: util: loop_write - accept 0-length message
X-Git-Tag: v220~109
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c7e28a191709f90736054e6f7844cf35b4ab93d;p=thirdparty%2Fsystemd.git

util: loop_write - accept 0-length message

write() can send empty messages, so make sure loop_write() can do the same.
---

diff --git a/src/shared/util.c b/src/shared/util.c
index dda88bd2ee8..3060adc8a65 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1664,7 +1664,7 @@ int loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
 
         errno = 0;
 
-        while (nbytes > 0) {
+        do {
                 ssize_t k;
 
                 k = write(fd, p, nbytes);
@@ -1684,12 +1684,12 @@ int loop_write(int fd, const void *buf, size_t nbytes, bool do_poll) {
                         return -errno;
                 }
 
-                if (k == 0) /* Can't really happen */
+                if (nbytes > 0 && k == 0) /* Can't really happen */
                         return -EIO;
 
                 p += k;
                 nbytes -= k;
-        }
+        } while (nbytes > 0);
 
         return 0;
 }