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

diff --git a/url.c b/url.c
index 5fb6d46..81b47c7 100644
--- a/url.c
+++ b/url.c
@@ -16,13 +16,14 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
 
 #include "mutt.h"
-#include "ascii.h"
-#include "mapping.h"
 #include "url.h"
 
-#include "mime.h"
 
 #include <ctype.h>
 
@@ -49,10 +50,7 @@ static void url_pct_decode (char *s)
     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;
     }
@@ -73,7 +71,7 @@ url_scheme_t url_check_scheme (const char *s)
   if ((t - s) + 1 >= sizeof (sbuf))
     return U_UNKNOWN;
 
-  strfcpy (sbuf, s, t - s + 1);
+  m_strcpy(sbuf, t - s + 1, s);
   for (t = sbuf; *t; t++)
     *t = ascii_tolower (*t);
 
@@ -90,7 +88,7 @@ int url_parse_file (char *d, const char *src, size_t dl)
   else if (!ascii_strncasecmp (src, "file://", 7))      /* we don't support remote files */
     return -1;
   else
-    strfcpy (d, src + 5, dl);
+    m_strcpy(d, dl, src + 5);
 
   url_pct_decode (d);
   return 0;
@@ -173,7 +171,7 @@ 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) {
-    str_cat (dest, len, "//");
+    m_strcat(dest, len, "//");
     len -= (l = m_strlen(dest));
     dest += l;
 
@@ -194,7 +192,7 @@ int url_ciss_tostring (ciss_url_t * ciss, char *dest, size_t len, int flags)
   }
 
   if (ciss->path)
-    str_cat (dest, len, ciss->path);
+    m_strcat(dest, len, ciss->path);
 
   return 0;
 }
@@ -236,7 +234,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
 
     if (!ascii_strcasecmp (tag, "body")) {
       if (body)
-        str_replace (body, value);
+        m_strreplace(body, value);
     }
     else {
 #define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
@@ -245,8 +243,7 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
       snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
 #undef SAVEPFX
       scratch[taglen] = '\0';
-      value = &scratch[taglen + 1];
-      SKIPWS (value);
+      value = vskipspaces(&scratch[taglen + 1]);
       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 */