X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-mime%2Frfc3676.c;h=e9ae0a7054fec78d3f057f77c2b2af3bb3a2a04a;hp=b93a7664c4f0652e29f1e7769fb39543a199d9c2;hb=a0aa4a45870f1607e8b41760866071692675c84d;hpb=2c56b665394c80195b976537e608b690947fcb14

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index b93a766..e9ae0a7 100644
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -9,29 +9,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include <sys/wait.h>
-#include <sys/stat.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/lib-lib.h>
 
 #include <lib-ui/curses.h>
 
-#include "mutt.h"
-#include "handler.h"
 #include "state.h"
-#include "lib.h"
+#include "rfc3676.h"
 
 #define FLOWED_MAX 77
 
@@ -138,7 +121,7 @@ int rfc3676_handler (BODY * a, STATE * s) {
   *curline='\0';
 
   /* respect DelSP of RfC3676 only with f=f parts */
-  if ((t = (char*) mutt_get_parameter ("delsp", a->parameter))) {
+  if ((t = parameter_getval(a->parameter, "delsp"))) {
     delsp = m_strlen(t) == 3 && ascii_strncasecmp (t, "yes", 3) == 0;
     t = NULL;
   }
@@ -234,7 +217,7 @@ void rfc3676_space_stuff (HEADER* hdr) {
   }
 
   while (fgets (buf, sizeof (buf), in)) {
-    if (ascii_strncmp ("From ", buf, 4) == 0 || buf[0] == ' ') {
+    if (m_strncmp("From ", buf, 4) == 0 || buf[0] == ' ') {
       fputc (' ', out);
     }
     fputs (buf, out);