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

diff --git a/rfc1524.c b/rfc1524.c
index 31750b5..75a986b 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -27,6 +27,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -139,7 +140,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;
   }
@@ -188,12 +189,12 @@ static int rfc1524_mailcap_parse (BODY * a,
       /* ignore comments */
       if (*buf == '#')
         continue;
-      dprint (2, (debugfile, "mailcap entry: %s\n", buf));
+      debug_print (2, ("mailcap entry: %s\n", buf));
 
       /* 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 */
@@ -212,7 +213,7 @@ static int rfc1524_mailcap_parse (BODY * a,
       while (ch) {
         field = ch;
         ch = get_field (ch);
-        dprint (2, (debugfile, "field: %s\n", field));
+        debug_print (2, ("field: %s\n", field));
 
         if (!ascii_strcasecmp (field, "needsterminal")) {
           if (entry)
@@ -264,7 +265,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)) {
@@ -376,7 +377,7 @@ int rfc1524_mailcap_lookup (BODY * a, char *type, rfc1524_entry * entry,
     path[x] = '\0';
     mutt_expand_path (path, sizeof (path));
 
-    dprint (2, (debugfile, "Checking mailcap file: %s\n", path));
+    debug_print (2, ("Checking mailcap file: %s\n", path));
     found = rfc1524_mailcap_parse (a, path, type, entry, opt);
   }
 
@@ -472,8 +473,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;