X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-lib%2Fbuffer.c;h=f27dc5102d381aec71aa2a6c24da49afd6294bb4;hp=2abfa391b0d14648fc91276bcbf682b78752195e;hb=a72bbb26973d73ce98c1dde62f3a114e2bb6589c;hpb=21595f98b7c8132f99abb9fee60ecdce31fc980f diff --git a/lib-lib/buffer.c b/lib-lib/buffer.c index 2abfa39..f27dc51 100644 --- a/lib-lib/buffer.c +++ b/lib-lib/buffer.c @@ -26,18 +26,51 @@ * please see the file GPL in the top level source directory. */ -#include -#include -#include +#include "lib-lib.h" -#include -#include -#include -#include +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); + 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); +} + +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'; -#include "mutt.h" + return len; +} -#include "lib/debug.h" +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*, @@ -87,7 +120,7 @@ void mutt_buffer_free(BUFFER **p) /* dynamically grows a BUFFER to accomodate s, in increments of 128 bytes. * Always one byte bigger than necessary for the null terminator, and * the buffer is always null-terminated */ -void mutt_buffer_add(BUFFER *buf, const char *s, size_t len) +void mutt_buffer_add(BUFFER *buf, const char *s, ssize_t len) { size_t offset; @@ -102,186 +135,3 @@ void mutt_buffer_add(BUFFER *buf, const char *s, size_t len) *buf->dptr = '\0'; } -int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags) -{ - char ch; - char qc = 0; /* quote char */ - char *pc; - - /* reset the destination pointer to the beginning of the buffer */ - dest->dptr = dest->data; - - SKIPWS(tok->dptr); - while ((ch = *tok->dptr)) { - if (!qc) { - if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE)) - || (ch == '#' && !(flags & M_TOKEN_COMMENT)) - || (ch == '=' && (flags & M_TOKEN_EQUAL)) - || (ch == ';' && !(flags & M_TOKEN_SEMICOLON)) - || ((flags & M_TOKEN_PATTERN) && strchr("~=!|", ch))) - { - break; - } - } - - tok->dptr++; - - if (ch == qc) { - qc = 0; /* end of quote */ - } else - if (!qc && (ch == '\'' || ch == '"') && !(flags & M_TOKEN_QUOTE)) { - qc = ch; - } else - if (ch == '\\' && qc != '\'') { - if (!*tok->dptr) - return -1; /* premature end of token */ - - switch (ch = *tok->dptr++) { - case 'c': - case 'C': - if (!*tok->dptr) - return -1; /* premature end of token */ - mutt_buffer_addch(dest, - (ascii_toupper(*tok->dptr) - 'A' + 1) & 0x7f); - tok->dptr++; - break; - case 'r': - mutt_buffer_addch(dest, '\r'); - break; - case 'n': - mutt_buffer_addch(dest, '\n'); - break; - case 't': - mutt_buffer_addch(dest, '\t'); - break; - case 'f': - mutt_buffer_addch(dest, '\f'); - break; - case 'e': - mutt_buffer_addch(dest, '\033'); - break; - default: - if (isdigit((unsigned char)ch) - && isdigit((unsigned char)*tok->dptr) - && isdigit((unsigned char)*(tok->dptr + 1))) - { - mutt_buffer_addch(dest, (ch << 6) + (*tok->dptr << 3) + - *(tok->dptr + 1) - 3504); - tok->dptr += 2; - } else { - mutt_buffer_addch(dest, ch); - } - } - } else - if (ch == '^' && (flags & M_TOKEN_CONDENSE)) { - if (!*tok->dptr) - return -1; /* premature end of token */ - ch = *tok->dptr++; - if (ch == '^') { - mutt_buffer_addch(dest, ch); - } else - if (ch == '[') { - mutt_buffer_addch(dest, '\033'); - } else - if (isalpha((unsigned char)ch)) { - mutt_buffer_addch(dest, ascii_toupper(ch) - 'A' + 1); - } else { - mutt_buffer_addch(dest, '^'); - mutt_buffer_addch(dest, ch); - } - } else - if (ch == '`' && (!qc || qc == '"')) { - FILE *fp; - pid_t pid; - char *cmd, *ptr; - size_t expnlen; - BUFFER expn; - int line = 0; - - pc = tok->dptr; - do { - if ((pc = strpbrk(pc, "\\`"))) { - /* skip any quoted chars */ - if (*pc == '\\') - pc += 2; - } - } while (pc && *pc != '`'); - if (!pc) { - debug_print (1, ("mismatched backtics\n")); - return (-1); - } - - cmd = p_dupstr(tok->dptr, pc - tok->dptr); - if ((pid = mutt_create_filter(cmd, NULL, &fp, NULL)) < 0) { - debug_print(1, ("unable to fork command: %s\n", cmd)); - p_delete(&cmd); - return -1; - } - p_delete(&cmd); - - tok->dptr = pc + 1; - - /* read line */ - p_clear(&expn, 1); - expn.data = mutt_read_line(NULL, &expn.dsize, fp, &line); - fclose(fp); - mutt_wait_filter(pid); - - /* if we got output, make a new string consiting of the shell ouptput - plus whatever else was left on the original line */ - /* BUT: If this is inside a quoted string, directly add output to - * the token */ - if (expn.data && qc) { - mutt_buffer_addstr(dest, expn.data); - p_delete(&expn.data); - } else - if (expn.data) { - expnlen = m_strlen(expn.data); - tok->dsize = expnlen + m_strlen(tok->dptr) + 1; - ptr = xmalloc(tok->dsize); - memcpy(ptr, expn.data, expnlen); - strcpy(ptr + expnlen, tok->dptr); /* __STRCPY_CHECKED__ */ - if (tok->destroy) - p_delete(&tok->data); - tok->data = ptr; - tok->dptr = ptr; - tok->destroy = 1; /* mark that the caller should destroy this data */ - ptr = NULL; - p_delete(&expn.data); - } - } else - if (ch == '$' && (!qc || qc == '"') - && (*tok->dptr == '{' || isalpha((unsigned char)*tok->dptr))) - { - char *env = NULL, *var = NULL; - - if (*tok->dptr == '{') { - tok->dptr++; - if ((pc = strchr (tok->dptr, '}'))) { - var = str_substrdup (tok->dptr, pc); - tok->dptr = pc + 1; - } - } else { - for (pc = tok->dptr; isalnum((unsigned char)*pc) || *pc == '_'; - pc++); - var = p_dupstr(tok->dptr, pc - tok->dptr); - tok->dptr = pc; - } - if (var) { - char tmp[STRING]; - if ((env = getenv (var)) - || (mutt_option_value (var, tmp, sizeof (tmp)) && (env = tmp))) - { - mutt_buffer_addstr (dest, env); - } - } - p_delete(&var); - } else { - mutt_buffer_addch(dest, ch); - } - } - mutt_buffer_addch(dest, 0); /* terminate the string */ - SKIPWS(tok->dptr); - return 0; -} -