r1606: make the low level socket read/write routines cope properly with non-blocking...

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 43da8a2f577aedc7e71dc41e9c73413b131f82ff..8c9a140746e679ecbae2bb05ac464bf5c91cd4f3 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -195,10 +195,13 @@ ssize_t read_data(int fd, char *buffer, size_t N)
        while (total < N) {
                ret = sys_read(fd,buffer + total,N - total);
                if (ret == 0) {
-                       return 0;
+                       return total;
                }
                if (ret == -1) {
-                       return -1;
+                       if (total == 0) {
+                               return -1;
+                       }
+                       return total;
                }
                total += ret;
        }
@@ -222,10 +225,14 @@ ssize_t write_data(int fd, const char *buffer, size_t N)
        while (total < N) {
                ret = sys_write(fd, buffer + total, N - total);
                if (ret == -1) {
-                       return -1;
+                       if (total == 0) {
+                               return -1;
+                       }
+                       return total;
                }
-               if (ret == 0)
+               if (ret == 0) {
                        return total;
+               }
 
                total += ret;
        }