X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=rfc1524.c;h=9b745b402fa239402c535ebe6c8376cdfa5ec727;hp=5a843f866cc15956941a291e983bda152a93083a;hb=096b7d36c872305692c0916be4d39699265959ee;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1

diff --git a/rfc1524.c b/rfc1524.c
index 5a843f8..9b745b4 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -127,24 +127,23 @@ static char *get_field (char *s)
         s++;
     }
     else {
-      *ch++ = 0;
-      SKIPWS (ch);
+      *ch++ = '\0';
+      ch = vskipspaces(ch);
       break;
     }
   }
-  str_skip_trailws (s);
+  m_strrtrim(s);
   return ch;
 }
 
 static int get_field_text (char *field, char **entry,
                            char *type, char *filename, int line)
 {
-  field = str_skip_initws (field);
+  field = vskipspaces(field);
   if (*field == '=') {
     if (entry) {
-      field++;
-      field = str_skip_initws (field);
-      str_replace (entry, field);
+      field = vskipspaces(field + 1);
+      m_strreplace(entry, field);
     }
     return 1;
   }