X-Git-Url: http://git.thejh.net/?p=libjh.git;a=blobdiff_plain;f=io.c;h=ef1f9125f75e3c07782dbcbdac9b391fc328eae2;hp=ac685fbe2ff1307b2876a23a1b39b7a3355ee48f;hb=0acf1aaf8212ac44f4acaa2609a673bce77fbb41;hpb=8ca8922a920669bdaa388a3c8e72a983da91e2e0

diff --git a/io.c b/io.c
index ac685fb..ef1f912 100644
--- a/io.c
+++ b/io.c
@@ -1,11 +1,10 @@
 // Copyright (2013) Jann Horn <jann@thejh.net>
-// This code is licensed under the AGPLv3.
 
 HEADER #include <sys/types.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <stdbool.h>
+HEADER #include <stdbool.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.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;
@@ -67,7 +69,10 @@ 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_FN char *slurp_fd(int fd, size_t *len_out, int flags) {
+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_;
   
   // Let's just guess that the file is 1023 bytes. Will become 1024 with
@@ -75,6 +80,13 @@ PUBLIC_FN char *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 +125,12 @@ PUBLIC_FN char *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;
     }
@@ -120,7 +138,7 @@ PUBLIC_FN char *slurp_fd(int fd, size_t *len_out, int flags) {
   }
 }
 
-PUBLIC_FN char *slurp_file(char *path, size_t *len_out, int flags) {
+PUBLIC_FN void *slurp_file(char *path, size_t *len_out, int flags) {
   int fd = open(path, O_RDONLY|O_CLOEXEC);
   if (fd == -1) return NULL;
   char *res = slurp_fd(fd, len_out, flags);
@@ -132,7 +150,7 @@ PUBLIC_FN char *slurp_file(char *path, size_t *len_out, int flags) {
 
 // Write data into a file. len can be -1; that means that
 // the real length is strlen(buf).
-PUBLIC_FN int write_file(char *path, char *buf, ssize_t len, int open_flags) {
+PUBLIC_FN int write_file(char *path, void *buf, ssize_t len, int open_flags) {
   if (len == -1) len = strlen(buf);
   
   int fd = open(path, open_flags|O_CLOEXEC|O_WRONLY, 0777);
@@ -163,3 +181,37 @@ PUBLIC_FN void *mmap_file(void *addr, size_t length, int prot, int flags, char *
   errno = errno_;
   return (r==MAP_FAILED) ? NULL : r;
 }
+
+// on error, fd remains unchanged, no matter whether you specified "keep" or not
+HEADER #define JH_OBS_KEEPFD 1
+HEADER #define JH_OBS_BUFFER 2
+PUBLIC_FN int fopen_bistream(FILE **in, FILE **out, int fd, int flags) {
+  // check input
+  if (fd < 0) goto err_out;
+  bool keep = flags & JH_OBS_KEEPFD;
+  bool buffer = flags & JH_OBS_BUFFER;
+
+  // create input FILE*
+  int in_fd = dup(fd);
+  if (in_fd < 0) goto err_out;
+  *in = fdopen(in_fd, "r");
+  if (!*in) { close(in_fd); goto err_out; }
+
+  // create output FILE*
+  int out_fd = keep ? dup(fd) : fd;
+  if (out_fd < 0) goto err_dup_out;
+  *out = fdopen(out_fd, "w");
+  if (!*out) { if (keep) close(out_fd); goto err_dup_out; }
+
+  // avoid buffering data unless the caller really wants it
+  if (!buffer) setbuf(*out, NULL);
+
+  // success!
+  return 0;
+
+
+err_dup_out:
+  fclose(*in);
+err_out:
+  return EAI_SYSTEM;
+}
\ No newline at end of file