oops, bad formula

[apps/madmutt.git] / rfc1524.c

diff --git a/rfc1524.c b/rfc1524.c
index d45c474..6c6d317 100644 (file)
--- 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
@@ -132,7 +133,7 @@ static char *get_field (char *s)
       break;
     }
   }
-  str_skip_trailws (s);
+  m_strrtrim(s);
   return ch;
 }
 
@@ -143,7 +144,7 @@ static int get_field_text (char *field, char **entry,
   if (*field == '=') {
     if (entry) {
       field = vskipspaces(field + 1);
-      str_replace (entry, field);
+      m_strreplace(entry, field);
     }
     return 1;
   }