X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=url.c;h=5fb6d461e2efe4701bd9a578ae1c81b8950859e6;hp=35cb0c1829903ae30b8e91b46b2f4faf833619c8;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=96d53ff49c308769efbf708e1e65819077cb7af6

diff --git a/url.c b/url.c
index 35cb0c1..5fb6d46 100644
--- a/url.c
+++ b/url.c
@@ -15,14 +15,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #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[] = {
@@ -32,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},
@@ -171,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 = mutt_strlen (dest));
+    str_cat (dest, len, "//");
+    len -= (l = m_strlen(dest));
     dest += l;
 
     if (ciss->user) {
@@ -181,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 = mutt_strlen (dest));
+      len -= (l = m_strlen(dest));
       dest += l;
     }
 
@@ -192,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);
+    str_cat (dest, len, ciss->path);
 
   return 0;
 }
@@ -212,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, '?')))
@@ -238,7 +240,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
     }
     else {
 #define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
-      taglen = mutt_strlen (tag) + mutt_strlen (SAFEPFX);
+      taglen = m_strlen(tag) + m_strlen(SAFEPFX);
       /* mutt_parse_rfc822_line makes some assumptions */
       snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
 #undef SAVEPFX
@@ -248,11 +250,13 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
       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))
+      if (!option (OPTSTRICTMAILTO)) {
+        set_option (OPTXMAILTO);
         set_option (OPTEDITHDRS);
+      }
     }
   }
 
-  FREE (&tmp);
+  p_delete(&tmp);
   return 0;
 }