X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=220beebda3a2da926dd25e1cbc29416f9de4503b;hp=4247b05d94d4c32ee5e50ca3b14acf1c30ee3343;hb=a9d22903ab440da5d0b4d994d9de49ff2cf663d4;hpb=93f817273e1c70071cd5471594600bc70f12f0ff

diff --git a/rfc1524.c b/rfc1524.c
index 4247b05..220beeb 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -194,7 +194,7 @@ static int rfc1524_mailcap_parse (BODY * a,
       /* check type */
       ch = get_field (buf);
       if (ascii_strcasecmp (buf, type) && (ascii_strncasecmp (buf, type, btlen) || (buf[btlen] != 0 &&  /* implicit wild */
-                                                                                    safe_strcmp (buf + btlen, "/*"))))  /* wildsubtype */
+                                                                                    mutt_strcmp (buf + btlen, "/*"))))  /* wildsubtype */
         continue;
 
       /* next field is the viewcommand */
@@ -265,7 +265,7 @@ static int rfc1524_mailcap_parse (BODY * a,
 
           if (get_field_text (field + 4, &test_command, type, filename, line)
               && test_command) {
-            len = safe_strlen (test_command) + STRING;
+            len = mutt_strlen (test_command) + STRING;
             safe_realloc (&test_command, len);
             rfc1524_expand_command (a, a->filename, type, test_command, len);
             if (mutt_system (test_command)) {
@@ -473,8 +473,8 @@ int rfc1524_expand_filename (char *nametemplate,
 
       rmatch = 1;
 
-      for (r = 0, j = safe_strlen (oldfile) - 1, k =
-           safe_strlen (nametemplate) - 1;
+      for (r = 0, j = mutt_strlen (oldfile) - 1, k =
+           mutt_strlen (nametemplate) - 1;
            j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) {
         if (nametemplate[k] != oldfile[j]) {
           rmatch = 0;