X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fbuffer.h;h=a4d191218119a5f4b7d692bd3694d6b87337dc39;hp=da476ac7f6675c2bfa9f426d4402da472f1a072c;hb=6b771604433435b4280a5fbae2612134fe4129dd;hpb=21595f98b7c8132f99abb9fee60ecdce31fc980f

diff --git a/lib-lib/buffer.h b/lib-lib/buffer.h
index da476ac..a4d1912 100644
--- a/lib-lib/buffer.h
+++ b/lib-lib/buffer.h
@@ -29,12 +29,70 @@
 #ifndef MUTT_LIB_LIB_BUFFER_H
 #define MUTT_LIB_LIB_BUFFER_H
 
-#include <lib-lib/str.h>
+typedef struct buffer_t {
+    char *data;
+    ssize_t len;
+    ssize_t size;
+} buffer_t;
+
+DO_INIT(buffer_t, buffer);
+static inline void buffer_wipe(buffer_t *buf) {
+    p_delete(&buf->data);
+}
+DO_NEW(buffer_t, buffer);
+DO_DELETE(buffer_t, buffer);
+
+static inline char *buffer_unwrap(buffer_t **buf) {
+    char *res = (*buf)->data;
+    (*buf)->data = NULL;
+    buffer_delete(buf);
+    return res;
+}
+
+
+void buffer_resize(buffer_t *, ssize_t newsize);
+static inline void buffer_ensure(buffer_t *buf, ssize_t extra) {
+    assert (extra >= 0);
+    if (buf->len + extra >= buf->size) {
+        buffer_resize(buf, buf->len + extra);
+    }
+}
+static inline void buffer_extend(buffer_t *buf, ssize_t extra) {
+    buffer_ensure(buf, extra);
+    buf->len += extra;
+    buf->data[buf->len] = '\0';
+}
+static inline void buffer_extendch(buffer_t *buf, ssize_t extra, int c) {
+    buffer_ensure(buf, extra);
+    memset(buf->data + buf->len, c, extra);
+    buf->len += extra;
+    buf->data[buf->len] = '\0';
+}
+
+
+static inline void buffer_add(buffer_t *buf, const void *data, ssize_t len) {
+    buffer_ensure(buf, len);
+    memcpy(buf->data + buf->len, data, len);
+    buf->len += len;
+    buf->data[buf->len] = '\0';
+}
+static inline void buffer_addstr(buffer_t *buf, const char *s) {
+    buffer_add(buf, s, m_strlen(s));
+}
+static inline void buffer_addbuf(buffer_t *buf, buffer_t *buf2) {
+    buffer_add(buf, buf2->data, buf2->len);
+}
+static inline void buffer_addch(buffer_t *buf, int c) {
+    buffer_extendch(buf, 1, c);
+}
+
+
+/****** LEGACY BUFFERS *******/
 
 typedef struct {
     char *data;          /* pointer to data */
     char *dptr;          /* current read/write position */
-    size_t dsize;        /* length of data */
+    ssize_t dsize;       /* length of data */
     int destroy;         /* destroy `data' when done? */
 } BUFFER;
 
@@ -42,9 +100,7 @@ BUFFER *mutt_buffer_init(BUFFER *);
 void mutt_buffer_free(BUFFER **);
 
 BUFFER *mutt_buffer_from(BUFFER *, const char *);
-int mutt_extract_token(BUFFER *, BUFFER *, int);
-
-void mutt_buffer_add(BUFFER *, const char *, size_t);
+void mutt_buffer_add(BUFFER *, const char *, ssize_t);
 static inline void mutt_buffer_addstr(BUFFER *b, const char *s) {
     mutt_buffer_add(b, s, m_strlen(s));
 }
@@ -53,4 +109,8 @@ static inline void mutt_buffer_addch(BUFFER *b, char c) {
     mutt_buffer_add(b, &c, 1);
 }
 
+static inline void mutt_buffer_reset(BUFFER *b) {
+    *(b->dptr = b->data) = '\0';
+}
+
 #endif /* MUTT_LIB_LIB_BUFFER_H */