#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;
-/* flags for mutt_extract_token() */
-#define M_TOKEN_EQUAL 1 /* treat '=' as a special */
-#define M_TOKEN_CONDENSE (1<<1) /* ^(char) to control chars (macros) */
-#define M_TOKEN_SPACE (1<<2) /* don't treat whitespace as a term */
-#define M_TOKEN_QUOTE (1<<3) /* don't interpret quotes */
-#define M_TOKEN_PATTERN (1<<4) /* !)|~ are terms (for patterns) */
-#define M_TOKEN_COMMENT (1<<5) /* don't reap comments */
-#define M_TOKEN_SEMICOLON (1<<6) /* don't treat ; as special */
+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;
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));
}