X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=url.c;h=25976468c7482650884dc29993ea3e7998580e2f;hp=405ed2337174d0c11bb1e9c8a3202dcaea726867;hb=68a42bf9a3ce1a00e302112c01df22c3a29d24ac;hpb=841934011451205d8295ac955486f06c317fdf15

diff --git a/url.c b/url.c
index 405ed23..2597646 100644
--- a/url.c
+++ b/url.c
@@ -16,11 +16,14 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
 #include "mapping.h"
 #include "url.h"
 
 #include "mime.h"
 
+#include "lib/mem.h"
+
 #include <ctype.h>
 
 static struct mapping_t UrlMap[] = {
@@ -169,8 +172,8 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
   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 = str_len (dest));
     dest += l;
 
     if (ciss->user) {
@@ -179,7 +182,7 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
       else
         snprintf (dest, len, "%s@", ciss->user);
 
-      len -= (l = mutt_strlen (dest));
+      len -= (l = str_len (dest));
       dest += l;
     }
 
@@ -190,7 +193,7 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
   }
 
   if (ciss->path)
-    safe_strcat (dest, len, ciss->path);
+    str_cat (dest, len, ciss->path);
 
   return 0;
 }
@@ -210,7 +213,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
   if (!(t = strchr (src, ':')))
     return -1;
 
-  if ((tmp = safe_strdup (t + 1)) == NULL)
+  if ((tmp = str_dup (t + 1)) == NULL)
     return -1;
 
   if ((headers = strchr (tmp, '?')))
@@ -232,19 +235,25 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
 
     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 = str_len (tag) + str_len (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 (OPTEDITHDRS);
     }
   }
 
-  FREE (&tmp);
+  mem_free (&tmp);
   return 0;
 }