continue the include dance

[apps/madmutt.git] / lib-lib / buffer.c

diff --git a/lib-lib/buffer.c b/lib-lib/buffer.c
index 2abfa39..dccca24 100644 (file)
--- a/lib-lib/buffer.c
+++ b/lib-lib/buffer.c
@@ -30,15 +30,15 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/buffer.h>
+#include "mem.h"
+#include "str.h"
+#include "ascii.h"
+#include "buffer.h"
+#include "file.h"
+#include "debug.h"
 
 #include "mutt.h"
 
-#include "lib/debug.h"
-
 /*
  * Creates and initializes a BUFFER*. If passed an existing BUFFER*,
  * just initializes. Frees anything already in the buffer.
@@ -87,7 +87,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;
 
@@ -111,7 +111,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
     /* reset the destination pointer to the beginning of the buffer */
     dest->dptr = dest->data;
 
-    SKIPWS(tok->dptr);
+    tok->dptr = vskipspaces(tok->dptr);
     while ((ch = *tok->dptr)) {
         if (!qc) {
             if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE))
@@ -194,7 +194,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             FILE *fp;
             pid_t pid;
             char *cmd, *ptr;
-            size_t expnlen;
+            ssize_t expnlen;
             BUFFER expn;
             int line = 0;
 
@@ -258,7 +258,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             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 {
@@ -281,7 +281,7 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
         }
     }
     mutt_buffer_addch(dest, 0);  /* terminate the string */
-    SKIPWS(tok->dptr);
+    tok->dptr = vskipspaces(tok->dptr);
     return 0;
 }