X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=5466a75f41e19daecad2b79fffe56b935a698492;hp=31750b50e03e0fa53abe52c35961c2c2540f6c16;hb=0f44dc85fc1280372ffab911d701e703d803fb4b;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/rfc1524.c b/rfc1524.c
index 31750b5..5466a75 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -139,7 +139,7 @@ static int get_field_text (char *field, char **entry,
     if (entry) {
       field++;
       field = mutt_skip_whitespace (field);
-      mutt_str_replace (entry, field);
+      str_replace (entry, field);
     }
     return 1;
   }
@@ -193,7 +193,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 */
-                                                                                    mutt_strcmp (buf + btlen, "/*"))))  /* wildsubtype */
+                                                                                    safe_strcmp (buf + btlen, "/*"))))  /* wildsubtype */
         continue;
 
       /* next field is the viewcommand */
@@ -264,7 +264,7 @@ static int rfc1524_mailcap_parse (BODY * a,
 
           if (get_field_text (field + 4, &test_command, type, filename, line)
               && test_command) {
-            len = mutt_strlen (test_command) + STRING;
+            len = safe_strlen (test_command) + STRING;
             safe_realloc (&test_command, len);
             rfc1524_expand_command (a, a->filename, type, test_command, len);
             if (mutt_system (test_command)) {
@@ -472,8 +472,8 @@ int rfc1524_expand_filename (char *nametemplate,
 
       rmatch = 1;
 
-      for (r = 0, j = mutt_strlen (oldfile) - 1, k =
-           mutt_strlen (nametemplate) - 1;
+      for (r = 0, j = safe_strlen (oldfile) - 1, k =
+           safe_strlen (nametemplate) - 1;
            j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) {
         if (nametemplate[k] != oldfile[j]) {
           rmatch = 0;