X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=buffer.c;h=8342162ac0c935937a7f02e085904826144dc22b;hb=b5fcb83a2555a4aac4d298e7ed5487b3416ef6f6;hp=366b7d03bac38001892f6af7146b19c3888df999;hpb=5cbb083b27ec285300c7ea0b2ef1b84ffaf2f65a;p=apps%2Fpfixtools.git diff --git a/buffer.c b/buffer.c index 366b7d0..8342162 100644 --- a/buffer.c +++ b/buffer.c @@ -33,6 +33,9 @@ * Copyright © 2006 Pierre Habouzit */ +#include +#include + #include "buffer.h" #define BUFSIZ_INCREMENT 256 @@ -58,3 +61,22 @@ void buffer_consume(buffer_t *buf, ssize_t len) { memmove(buf->data, buf->data + len, buf->len + 1 - len); buf->len -= len; } + +ssize_t buffer_read(buffer_t *buf, int fd, ssize_t count) +{ + ssize_t res; + + if (count < 0) + count = BUFSIZ; + + buffer_ensure(buf, count); + + res = read(fd, buf->data + buf->len, count); + if (res < 0) { + buf->data[buf->len] = '\0'; + return res; + } + + buffer_extend(buf, res); + return res; +}