X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc2231.c;h=81ac7351d1924e8f2d4070ca124e2cfd94b487e5;hp=cbdd19f453ea99a30e2f2fa6e058f08c74ab03d9;hb=841934011451205d8295ac955486f06c317fdf15;hpb=01a3f4d932ddfc7f4a58f820d343f4a6f3b0f824

diff --git a/rfc2231.c b/rfc2231.c
index cbdd19f..81ac735 100644
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -266,7 +266,7 @@ static void rfc2231_join_continuations (PARAMETER ** head,
       if (encoded && par->encoded)
         rfc2231_decode_one (par->value, valp);
 
-      vl = strlen (par->value);
+      vl = mutt_strlen (par->value);
 
       safe_realloc (&value, l + vl + 1);
       strcpy (value + l, par->value);   /* __STRCPY_CHECKED__ */
@@ -311,10 +311,10 @@ int rfc2231_encode_string (char **pd)
 
   if (!Charset || !SendCharset ||
       !(charset = mutt_choose_charset (Charset, SendCharset,
-                                       *pd, strlen (*pd), &d, &dlen))) {
+                                       *pd, mutt_strlen (*pd), &d, &dlen))) {
     charset = safe_strdup (Charset ? Charset : "unknown-8bit");
     d = *pd;
-    dlen = strlen (d);
+    dlen = mutt_strlen (d);
   }
 
   if (!mutt_is_us_ascii (charset))
@@ -327,9 +327,9 @@ int rfc2231_encode_string (char **pd)
       ++ext;
 
   if (encode) {
-    e = safe_malloc (dlen + 2 * ext + strlen (charset) + 3);
+    e = safe_malloc (dlen + 2 * ext + mutt_strlen (charset) + 3);
     sprintf (e, "%s''", charset);       /* __SPRINTF_CHECKED__ */
-    t = e + strlen (e);
+    t = e + mutt_strlen (e);
     for (s = d, slen = dlen; slen; s++, slen--)
       if (*s < 0x20 || *s >= 0x7f ||
           strchr (MimeSpecials, *s) || strchr ("*'%", *s)) {