X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-mime%2Frfc3676.c;h=e9ae0a7054fec78d3f057f77c2b2af3bb3a2a04a;hb=5fc6c3e42b91af11aa1323f6cfde4d27bbea9ec8;hp=51b64508c5f0265ef3341afa4050b633087d1b00;hpb=35f4e8cefa22d98782a720e4df428a1ce3be2237;p=apps%2Fmadmutt.git

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index 51b6450..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;
   }
@@ -220,28 +203,28 @@ int rfc3676_handler (BODY * a, STATE * s) {
 void rfc3676_space_stuff (HEADER* hdr) {
   FILE* in = NULL, *out = NULL;
   char buf[LONG_STRING];
-  char tmpfile[_POSIX_PATH_MAX];
+  char tmpf[_POSIX_PATH_MAX];
 
   if (!hdr || !hdr->content || !hdr->content->filename)
     return;
 
   if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
     return;
-  mutt_mktemp (tmpfile);
-  if ((out = safe_fopen (tmpfile, "w+")) == NULL) {
+  mutt_mktemp (tmpf);
+  if ((out = safe_fopen (tmpf, "w+")) == NULL) {
     fclose (in);
     return;
   }
 
   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);
   }
   fclose (in);
   fclose (out);
-  mutt_set_mtime (hdr->content->filename, tmpfile);
+  mutt_set_mtime (hdr->content->filename, tmpf);
   unlink (hdr->content->filename);
-  m_strreplace(&hdr->content->filename, tmpfile);
+  m_strreplace(&hdr->content->filename, tmpf);
 }