X-Git-Url: http://git.thejh.net/?p=libjh.git;a=blobdiff_plain;f=io.c;h=dd0d531ed75d97a872962d250ba5ede7bbd781c0;hp=d2b3197027b69cd4fc0e40f1333a123887a38a7f;hb=00099dea61e576c7803198a2656b5e5eed12ab8a;hpb=95317cdba6d5b393db2e68f44487456ea0d99664

diff --git a/io.c b/io.c
index d2b3197..dd0d531 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;
@@ -47,6 +47,7 @@ PUBLIC_FN ssize_t write_nointr(int fd, void *buf, size_t count, int *last_res) {
   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;
@@ -67,6 +68,9 @@ PUBLIC_FN ssize_t write_nointr(int fd, void *buf, size_t count, int *last_res) {
 PUBLIC_CONST JH_SLURP_NO_STAT 1
 PUBLIC_CONST JH_SLURP_REALLOC 2 /* realloc result block if it saves RAM */
 PUBLIC_CONST JH_SLURP_8BYTE_PAD 4 /* pad buffer with eight nullbytes, not one */
+PUBLIC_CONST JH_SLURP_FIXSIZE 8 /* len_out is actually input and specifies
+HEADER                             the expected length. if there is more data,
+HEADER                             that might be ignored silently. */
 PUBLIC_FN void *slurp_fd(int fd, size_t *len_out, int flags) {
   int errno_;
   
@@ -75,6 +79,13 @@ PUBLIC_FN void *slurp_fd(int fd, size_t *len_out, int flags) {
   size_t size_guess = 1023;
   bool trusted_guess = false; /* can we rely on the guess? */
   
+  if (flags&JH_SLURP_FIXSIZE) {
+    size_guess = *len_out;
+    trusted_guess = true;
+    // if we want a fixed size, of course we don't want to stat
+    flags |= JH_SLURP_NO_STAT;
+  }
+  
   int padlen = (flags&JH_SLURP_8BYTE_PAD)?8:1;
   
   // If we can determine the exact size, we don't have to guess. So try
@@ -113,6 +124,12 @@ PUBLIC_FN void *slurp_fd(int fd, size_t *len_out, int flags) {
         char *buf_ = realloc(buf, done+padlen);
         if (buf_) buf = buf_;
       }
+      if (done != size_guess && (flags&JH_SLURP_FIXSIZE)) {
+        free(buf);
+        // not the most correct error message ever, but whatever.
+        errno = EFBIG;
+        return NULL;
+      }
       if (len_out) *len_out = done;
       return buf;
     }