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

diff --git a/rfc1524.c b/rfc1524.c
index 75a986b..220beeb 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -128,18 +128,18 @@ static char *get_field (char *s)
       break;
     }
   }
-  mutt_remove_trailing_ws (s);
+  str_skip_trailws (s);
   return ch;
 }
 
 static int get_field_text (char *field, char **entry,
                            char *type, char *filename, int line)
 {
-  field = mutt_skip_whitespace (field);
+  field = str_skip_initws (field);
   if (*field == '=') {
     if (entry) {
       field++;
-      field = mutt_skip_whitespace (field);
+      field = str_skip_initws (field);
       str_replace (entry, field);
     }
     return 1;
@@ -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;