X-Git-Url: http://git.thejh.net/?p=libjh.git;a=blobdiff_plain;f=io.c;h=17ea4d675b04fc709e18738a3e2ec0faf5a47130;hp=3c0a8eba449f005d2795a1ab4206fe95ca663813;hb=ae33d7fe92d8dd8593e7a2b938d1f42d2aa60896;hpb=bec2b86cf36b320ebbc6f30b5f803f1681726049

diff --git a/io.c b/io.c
index 3c0a8eb..17ea4d6 100644
--- a/io.c
+++ b/io.c
@@ -1,5 +1,4 @@
 // Copyright (2013) Jann Horn <jann@thejh.net>
-// This code is licensed under the AGPLv3.
 
 HEADER #include <sys/types.h>
 #include <unistd.h>
@@ -24,6 +23,7 @@ PUBLIC_FN ssize_t read_nointr(int fd, void *buf, size_t count, int *last_res) {
   size_t done = 0;
   while (done < count) {
     ssize_t part_res = read(fd, buf+done, count-done);
+    if (part_res == -1 && errno == EINTR) continue;
     if (part_res <= 0) {
       if (last_res) *last_res = part_res;
       if (done) return done;
@@ -42,11 +42,13 @@ PUBLIC_FN ssize_t read_nointr(int fd, void *buf, size_t count, int *last_res) {
 //  - -1: error
 //  - 0: stream ended
 //  - 1: no problems occured
-PUBLIC_FN ssize_t write_nointr(int fd, void *buf, size_t count, int *last_res) {
+PUBLIC_FN ssize_t write_nointr(int fd, void *buf, ssize_t count, int *last_res) {
+  if (count == -1) count = strlen(buf);
   errno = 0;
   size_t done = 0;
   while (done < count) {
     ssize_t part_res = write(fd, buf+done, count-done);
+    if (part_res == -1 && errno == EINTR) continue;
     if (part_res <= 0) {
       if (last_res) *last_res = part_res;
       if (done) return done;