diff --git a/quark.c b/quark.c index 660a405..234f6e2 100644 --- a/quark.c +++ b/quark.c @@ -2,24 +2,24 @@ #include #include #include -#include -#include -#include #include +#include +#include #include #include #include #include #include -#include +#include +#include +#include #include #include #include -#include -#include #define LENGTH(x) (sizeof x / sizeof x[0]) #define MAXBUFLEN 1024 +#define MIN(x,y) ((x) < (y) ? (x) : (y)) enum { GET = 4, @@ -202,13 +202,14 @@ responsecontenttype(const char *mimetype) { void responsefiledata(int fd, off_t size) { - off_t offset = 0; + char buf[BUFSIZ]; + size_t n; - while(offset < size) - if(sendfile(req.fd, fd, &offset, size - offset) == -1) { - logerrmsg("sendfile failed on client %s: %s\n", host, strerror(errno)); - return; - } + for(; (n = read(fd, buf, MIN(size, sizeof buf))) > 0; size -= n) + if(write(req.fd, buf, n) != n) + logerrmsg("error writing to client %s: %s\n", host, strerror(errno)); + if(n == -1) + logerrmsg("error reading from file: %s\n", strerror(errno)); } void