make some functions a bit shorter.
[apps/madmutt.git] / lib-lib / buffer.c
index 6b46380..6feb958 100644 (file)
@@ -35,8 +35,7 @@
 #include "ascii.h"
 #include "buffer.h"
 #include "file.h"
-
-#include "lib/debug.h"
+#include "debug.h"
 
 #include "mutt.h"
 
@@ -259,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 {