#include "ascii.h"
#include "buffer.h"
#include "file.h"
-
-#include "lib/debug.h"
+#include "debug.h"
#include "mutt.h"
/* 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;
FILE *fp;
pid_t pid;
char *cmd, *ptr;
- size_t expnlen;
+ ssize_t expnlen;
BUFFER expn;
int line = 0;
if (*tok->dptr == '{') {
tok->dptr++;
if ((pc = strchr (tok->dptr, '}'))) {
- var = str_substrdup (tok->dptr, pc);
+ var = p_dupstr(tok->dptr, pc - tok->dptr);
tok->dptr = pc + 1;
}
} else {