#include <lib-lib/ascii.h>
#include <lib-lib/mapping.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "url.h"
-#include "mime.h"
#include <ctype.h>
return;
for (d = s; *s; s++) {
- if (*s == '%' && s[1] && s[2] &&
- isxdigit ((unsigned char) s[1]) &&
- isxdigit ((unsigned char) s[2]) &&
- hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
+ if (*s == '%' && hexval (s[1]) >= 0 && hexval (s[2]) >= 0) {
*d++ = (hexval (s[1]) << 4) | (hexval (s[2]));
s += 2;
}
int taglen;
- LIST *last = NULL;
+ LIST **last = &e->userhdrs;
if (!(t = strchr (src, ':')))
return -1;
if (!ascii_strcasecmp (tag, "body")) {
if (body)
- str_replace (body, value);
+ m_strreplace(body, value);
}
else {
#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
#undef SAVEPFX
scratch[taglen] = '\0';
value = vskipspaces(&scratch[taglen + 1]);
- mutt_parse_rfc822_line (e, NULL, scratch, value, 1, 0, 0, &last);
+ last = mutt_parse_rfc822_line (e, NULL, scratch, value, 0, 0, last);
/* if $strict_mailto is set, force editing headers to let
* users have a look at what we got */
if (!option (OPTSTRICTMAILTO)) {