Simplify read_whole_file and rename to read_file.

misc/subr.c

@@ -225,46 +225,38 @@ read_fully(int fd, void *buf, size_t len)
     return 0;
 }
 
-int
+void *
-read_whole_file(void **out, size_t *size, const char *fmt, ...)
+read_file(const char *path, void *buf, size_t *size)
 {
-    int err, fd;
+    int fd, esave;
-    int didmalloc = 0;
+    void *mem = NULL;
     struct stat sb;
-    va_list ap;
 
-    va_start(ap, fmt);
+    if ((fd = open(path, O_RDONLY)) == -1)
-    err = vaopen(&fd, O_RDONLY, fmt, ap);
+        return NULL;
-    va_end(ap);
+    if (fstat(fd, &sb) == -1)
-    if (err != 0)
-        return err;
-    if (fstat(fd, &sb) != 0) {
-        err = errno;
         goto error;
-    }
     if (*size != 0 && *size < sb.st_size) {
-        err = EFBIG;
+        errno = EFBIG;
         goto error;
     }
     *size = sb.st_size;
-    if (*out == NULL) {
+    if (buf == NULL && (mem = malloc(sb.st_size)) == NULL)
-        if ((*out = malloc(*size)) == NULL) {
+        goto error;
-            err = errno;
+    if (buf == NULL)
-            goto error;
+        buf = mem;
-        }
+    if ((errno = read_fully(fd, buf, *size)) != 0)
-        didmalloc = 1;
-    }
-    if ((err = read_fully(fd, *out, *size)) != 0)
         goto error;
-
     close(fd);
-    return 0;
+    return buf;
 
 error:
-    if (didmalloc)
+    esave = errno;
-        free(*out);
+    if (mem != NULL)
+        free(mem);
     close(fd);
-    return err;
+    errno = esave;
+    return NULL;
 }
 
 char *

misc/subr.h

@@ -33,8 +33,7 @@ long rand_between(long min, long max);
 
 int read_fully(int fd, void *buf, size_t len);
 int write_fully(int fd, const void *buf, size_t len);
-__attribute__((format (printf, 3, 4)))
+void *read_file(const char *path, void *buf, size_t *size);
-int read_whole_file(void **out, size_t *size, const char *fmt, ...);
 
 char *find_btpd_dir(void);