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

diff --git a/rfc1524.c b/rfc1524.c
index 5a843f8..6c6d317 100644
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -21,27 +21,28 @@
 # include "config.h"
 #endif
 
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <unistd.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/unix.h>
 
 #include "mutt.h"
 #include "rfc1524.h"
 #include "attach.h"
 
-#include "lib/debug.h"
-
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <errno.h>
-#include <unistd.h>
-
 /* The command semantics include the following:
  * %s is the filename that contains the mail body data
  * %t is the content type, like text/plain
@@ -127,24 +128,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;
   }