X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=buffer.c;h=8342162ac0c935937a7f02e085904826144dc22b;hb=b5fcb83a2555a4aac4d298e7ed5487b3416ef6f6;hp=f6091fbaec855a3994b5f9e3e665b2a654819e05;hpb=9a4efa4f0dc893f243ee69d1b20f024666ca943d;p=apps%2Fpfixtools.git

diff --git a/buffer.c b/buffer.c
index f6091fb..8342162 100644
--- a/buffer.c
+++ b/buffer.c
@@ -33,6 +33,9 @@
  * Copyright © 2006 Pierre Habouzit
  */
 
+#include <stdio.h>
+#include <unistd.h>
+
 #include "buffer.h"
 
 #define BUFSIZ_INCREMENT  256
@@ -46,4 +49,34 @@ void buffer_resize(buffer_t *buf, ssize_t newsize)
     }
 }
 
+void buffer_consume(buffer_t *buf, ssize_t len) {
+    if (len <= 0)
+        return;
+
+    if (len >= buf->len) {
+        buffer_reset(buf);
+        return;
+    }
+
+    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;
+}