# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+
#include "mutt.h"
#include "mapping.h"
#include "url.h"
#include "mime.h"
-#include "lib/mem.h"
-
#include <ctype.h>
static struct mapping_t UrlMap[] = {
{"pop", U_POP},
{"pops", U_POPS},
{"nntp", U_NNTP},
+ {"news", U_NNTP},
{"nntps", U_NNTPS},
{"snews", U_NNTPS},
{"mailto", U_MAILTO},
snprintf (dest, len, "%s:", mutt_getnamebyvalue (ciss->scheme, UrlMap));
if (ciss->host) {
- safe_strcat (dest, len, "//");
- len -= (l = mutt_strlen (dest));
+ str_cat (dest, len, "//");
+ len -= (l = m_strlen(dest));
dest += l;
if (ciss->user) {
else
snprintf (dest, len, "%s@", ciss->user);
- len -= (l = mutt_strlen (dest));
+ len -= (l = m_strlen(dest));
dest += l;
}
}
if (ciss->path)
- safe_strcat (dest, len, ciss->path);
+ str_cat (dest, len, ciss->path);
return 0;
}
if (!(t = strchr (src, ':')))
return -1;
- if ((tmp = safe_strdup (t + 1)) == NULL)
+ if ((tmp = m_strdup(t + 1)) == NULL)
return -1;
if ((headers = strchr (tmp, '?')))
if (!ascii_strcasecmp (tag, "body")) {
if (body)
- mutt_str_replace (body, value);
+ str_replace (body, value);
}
else {
- taglen = mutt_strlen (tag);
+#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+ taglen = m_strlen(tag) + m_strlen(SAFEPFX);
/* mutt_parse_rfc822_line makes some assumptions */
- snprintf (scratch, sizeof (scratch), "%s: %s", tag, value);
+ snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
+#undef SAVEPFX
scratch[taglen] = '\0';
value = &scratch[taglen + 1];
SKIPWS (value);
mutt_parse_rfc822_line (e, NULL, scratch, value, 1, 0, 0, &last);
+ /* if $strict_mailto is set, force editing headers to let
+ * users have a look at what we got */
+ if (!option (OPTSTRICTMAILTO)) {
+ set_option (OPTXMAILTO);
+ set_option (OPTEDITHDRS);
+ }
}
}
- FREE (&tmp);
+ p_delete(&tmp);
return 0;
}