X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=url.c;h=8a00cddba7a959ba66dd350071679b2041f29d9f;hb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7;hp=3d7a333601022fdf243ba9ee80ba221309f7491e;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git

diff --git a/url.c b/url.c
index 3d7a333..8a00cdd 100644
--- a/url.c
+++ b/url.c
@@ -15,6 +15,9 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+
 #include "mutt.h"
 #include "mapping.h"
 #include "url.h"
@@ -30,6 +33,7 @@ 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},
@@ -169,8 +173,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 = strlen (dest));
+    m_strcat(dest, len, "//");
+    len -= (l = m_strlen(dest));
     dest += l;
 
     if (ciss->user) {
@@ -179,7 +183,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 = strlen (dest));
+      len -= (l = m_strlen(dest));
       dest += l;
     }
 
@@ -190,7 +194,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);
+    m_strcat(dest, len, ciss->path);
 
   return 0;
 }
@@ -210,7 +214,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 = m_strdup(t + 1)) == NULL)
     return -1;
 
   if ((headers = strchr (tmp, '?')))
@@ -232,19 +236,27 @@ 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 = 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;
 }