#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 "mutt.h"
+#include "mem.h"
+#include "str.h"
+#include "ascii.h"
+#include "buffer.h"
+#include "file.h"
#include "lib/debug.h"
+#include "mutt.h"
+
/*
* Creates and initializes a BUFFER*. If passed an existing BUFFER*,
* just initializes. Frees anything already in the buffer.
/* 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))
}
}
mutt_buffer_addch(dest, 0); /* terminate the string */
- SKIPWS(tok->dptr);
+ tok->dptr = vskipspaces(tok->dptr);
return 0;
}