Add rewrite(), writeall(),and xwrite() to match the read versions.

diff --git a/lib/functions.c b/lib/functions.c
index 990c34f..e37887e 100644 (file)
--- a/lib/functions.c
+++ b/lib/functions.c
@@ -165,13 +165,21 @@ FILE *xfopen(char *path, char *mode)
 // Read from file handle, retrying if interrupted.
 ssize_t reread(int fd, void *buf, size_t count)
 {
-       ssize_t len;
        for (;;) {
-               len = read(fd, buf, count);
+               ssize_t len = read(fd, buf, count);
                if (len >= 0  || errno != EINTR) return len;
        }
 }
 
+// Write to file handle, retrying if interrupted.
+ssize_t rewrite(int fd, void *buf, size_t count)
+{
+       for (;;) {
+               ssize_t len = write(fd, buf, count);
+               if (len >= 0 || errno != EINTR) return len;
+       }
+}
+
 // Keep reading until full or EOF
 ssize_t readall(int fd, void *buf, size_t count)
 {
@@ -186,12 +194,31 @@ ssize_t readall(int fd, void *buf, size_t count)
        return count;
 }
 
+// Keep writing until done or EOF
+ssize_t writeall(int fd, void *buf, size_t count)
+{
+       size_t len = 0;
+       while (len<count) {
+               int i = rewrite(fd, buf, count);
+               if (!i) return len;
+               if (i<0) return i;
+               count += i;
+       }
+
+       return count;
+}
+
 // Die if we can't fill a buffer
 void xread(int fd, char *buf, size_t count)
 {
        if (count != readall(fd, buf, count)) perror_exit("xread");
 }      
 
+void xwrite(int fd, char *buf, size_t count)
+{
+       if (count != writeall(fd, buf, count)) perror_exit("xwrite");
+}
+
 char *xgetcwd(void)
 {
        char *buf = getcwd(NULL, 0);

diff --git a/lib/lib.h b/lib/lib.h
index cb14027..0fe2db6 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -42,8 +42,11 @@ int xcreate(char *path, int flags, int mode);
 int xopen(char *path, int flags);
 FILE *xfopen(char *path, char *mode);
 ssize_t reread(int fd, void *buf, size_t count);
+ssize_t rewrite(int fd, void *buf, size_t count);
 ssize_t readall(int fd, void *buf, size_t count);
+ssize_t writeall(int fd, void *buf, size_t count);
 void xread(int fd, char *buf, size_t count);
+void xwrite(int fd, char *buf, size_t count);
 char *xgetcwd(void);
 char *xabspath(char *path);
 struct string_list *find_in_path(char *path, char *filename);