#include <sys/stat.h>
#include <fcntl.h>
#include <string.h>
+#include <assert.h>
+#include <sys/mman.h>
// Wrapper for `read` that retries on partial reads.
// If last_res is non-NULL, it will be filled with the
// this and can specify len_out as NULL.
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) {
int errno_;
size_t size_guess = 1023;
bool trusted_guess = false; /* can we rely on the guess? */
+ int padlen = (flags&JH_SLURP_8BYTE_PAD)?8:1;
+
// If we can determine the exact size, we don't have to guess. So try
// to determine the exact size.
if (!(flags&JH_SLURP_NO_STAT)) {
int done = 0;
while (1) {
- buf = realloc(buf, size_guess+1);
+ buf = realloc(buf, size_guess+padlen);
if (buf == NULL) return NULL;
int last_res;
ssize_t read_res = read_nointr(fd, buf+done, size_guess-done, &last_res);
done += read_res;
if (last_res == 0 || trusted_guess) {
// out
- buf[done] = '\0';
+ if (padlen == 1) {
+ buf[done] = '\0';
+ } else {
+ *(uint64_t*)(buf+done) = 0;
+ }
if (done != size_guess && (flags&JH_SLURP_REALLOC)) {
// Well, it'd be weird if shrinking could fail... but meh, I can't find
// an explicit statement about this being disallowed, so try staying on
// the safe side.
- char *buf_ = realloc(buf, done+1);
+ char *buf_ = realloc(buf, done+padlen);
if (buf_) buf = buf_;
}
if (len_out) *len_out = done;
}
PUBLIC_FN char *slurp_file(char *path, size_t *len_out, int flags) {
- int fd = open(path, O_RDONLY);
+ int fd = open(path, O_RDONLY|O_CLOEXEC);
if (fd == -1) return NULL;
char *res = slurp_fd(fd, len_out, flags);
int errno_ = errno;
PUBLIC_FN int write_file(char *path, char *buf, ssize_t len, int open_flags) {
if (len == -1) len = strlen(buf);
- int fd = open(path, open_flags, 0777);
+ int fd = open(path, open_flags|O_CLOEXEC|O_WRONLY, 0777);
if (fd == -1) return 1;
ssize_t write_res = write_nointr(fd, buf, len, NULL);
int write_errno = errno;
if (close_res) return 1;
return 0;
}
+
+PUBLIC_FN void *mmap_file(void *addr, size_t length, int prot, int flags, char *path, off_t offset) {
+ assert((flags&MAP_ANONYMOUS) == 0);
+ assert(prot&(PROT_EXEC|PROT_READ|PROT_WRITE));
+ int open_flags = O_CLOEXEC;
+ if ((prot & (PROT_READ|PROT_EXEC)) && !(prot&PROT_WRITE)) open_flags |= O_RDONLY;
+ else if ((prot & (PROT_READ|PROT_EXEC))) open_flags |= O_RDWR;
+ else open_flags |= O_WRONLY;
+ int fd = open(path, open_flags);
+ if (fd == -1) return NULL;
+ void *r = mmap(addr, length, prot, flags, fd, offset);
+ int errno_ = errno;
+ close(fd);
+ errno = errno_;
+ return (r==MAP_FAILED) ? NULL : r;
+}