X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-lib%2Fbuffer.c;h=4cc4dc5730f474dc0d5f0f1d163bbd7d93165a67;hb=370334f0cfae3a5a9fe49b40df22e6753a87ac80;hp=e1327c8e04463e58b34ae232a4a17ed84bdb9435;hpb=230399f9632c37b66c1c117a17e8327eae6b3235;p=apps%2Fmadmutt.git

diff --git a/lib-lib/buffer.c b/lib-lib/buffer.c
index e1327c8..4cc4dc5 100644
--- a/lib-lib/buffer.c
+++ b/lib-lib/buffer.c
@@ -26,15 +26,59 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "mem.h"
-#include "str.h"
-#include "ascii.h"
-#include "buffer.h"
-#include "file.h"
+#include "lib-lib.h"
+
+void buffer_splice(buffer_t *buf, ssize_t pos, ssize_t len,
+                   const void *data, ssize_t dlen)
+{
+    if (dlen >= len)
+        buffer_extend(buf, dlen - len);
+    if (len >= buf->len)
+        len = buf->len;
+    memmove(buf->data + pos + dlen,
+            buf->data + pos + len,
+            buf->len - pos - len);
+    memcpy(buf->data + pos, data, dlen);
+    buffer_setlen(buf, buf->len + dlen - len);
+}
+
+void buffer_consume_upto(buffer_t *buf, const char *s)
+{
+    assert (buf->data <= s && s <= buf->data + buf->len);
+    buffer_splice(buf, 0, s - buf->data, NULL, 0);
+}
+
+ssize_t buffer_addvf(buffer_t *buf, const char *fmt, va_list args)
+{
+    ssize_t len;
+    va_list ap;
+
+    va_copy(ap, args);
+    buffer_ensure(buf, BUFSIZ);
+
+    len = vsnprintf(buf->data + buf->len, buf->size - buf->len, fmt, args);
+    if (len < 0)
+        return len;
+    if (len >= buf->size - buf->len) {
+        buffer_ensure(buf, len);
+        vsnprintf(buf->data + buf->len, buf->size - buf->len, fmt, ap);
+    }
+    buf->len += len;
+    buf->data[buf->len] = '\0';
+
+    return len;
+}
+
+ssize_t buffer_addf(buffer_t *buf, const char *fmt, ...)
+{
+    ssize_t res;
+    va_list args;
+    va_start(args, fmt);
+    res = buffer_addvf(buf, fmt, args);
+    va_end(args);
+    return res;
+}
+/****** LEGACY BUFFERS *******/
 
 /*
  * Creates and initializes a BUFFER*. If passed an existing BUFFER*,