X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=5764beb855a976a1fd67d8fcf955fb51ad5e5dd8;hp=d4f5ec5849c0032473bcfbdd66bf24aadf3dabfa;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=308c7080ccca40d4865d8810f5528331d9ed61ff

diff --git a/rfc1524.c b/rfc1524.c
index d4f5ec5..5764beb 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
@@ -29,7 +30,6 @@
 #include "rfc1524.h"
 #include "attach.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <string.h>
@@ -204,7 +204,7 @@ static int rfc1524_mailcap_parse (BODY * a,
       field = ch;
       ch = get_field (ch);
       if (entry)
-        entry->command = str_dup (field);
+        entry->command = m_strdup(field);
 
       /* parse the optional fields */
       found = TRUE;
@@ -268,7 +268,7 @@ static int rfc1524_mailcap_parse (BODY * a,
 
           if (get_field_text (field + 4, &test_command, type, filename, line)
               && test_command) {
-            len = str_len (test_command) + STRING;
+            len = m_strlen(test_command) + STRING;
             p_realloc(&test_command, len);
             rfc1524_expand_command (a, a->filename, type, test_command, len);
             if (mutt_system (test_command)) {
@@ -476,8 +476,8 @@ int rfc1524_expand_filename (char *nametemplate,
 
       rmatch = 1;
 
-      for (r = 0, j = str_len (oldfile) - 1, k =
-           str_len (nametemplate) - 1;
+      for (r = 0, j = m_strlen(oldfile) - 1, k =
+           m_strlen(nametemplate) - 1;
            j >= (lmatch ? i : 0) && k >= i + 2; j--, k--) {
         if (nametemplate[k] != oldfile[j]) {
           rmatch = 0;