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

diff --git a/lib-mime/rfc3676.c b/lib-mime/rfc3676.c
index b93a766..133fe3c 100644
--- a/lib-mime/rfc3676.c
+++ b/lib-mime/rfc3676.c
@@ -9,29 +9,14 @@
  * 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 <utime.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 +123,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;
   }
@@ -217,6 +202,18 @@ int rfc3676_handler (BODY * a, STATE * s) {
   return (0);
 }
 
+/* sets mtime of 'to' to mtime of 'from' */
+static void mutt_set_mtime (const char* from, const char* to) {
+  struct utimbuf utim;
+  struct stat st;
+
+  if (stat (from, &st) != -1) {
+    utim.actime = st.st_mtime;
+    utim.modtime = st.st_mtime;
+    utime (to, &utim);
+  }
+}
+
 void rfc3676_space_stuff (HEADER* hdr) {
   FILE* in = NULL, *out = NULL;
   char buf[LONG_STRING];
@@ -227,14 +224,15 @@ void rfc3676_space_stuff (HEADER* hdr) {
 
   if ((in = safe_fopen (hdr->content->filename, "r")) == NULL)
     return;
-  mutt_mktemp (tmpf);
-  if ((out = safe_fopen (tmpf, "w+")) == NULL) {
-    fclose (in);
+
+  out = m_tempfile(tmpf, sizeof(tmpf), NONULL(Tempdir), NULL);
+  if (!out) {
+    fclose(in);
     return;
   }
 
-  while (fgets (buf, sizeof (buf), in)) {
-    if (ascii_strncmp ("From ", buf, 4) == 0 || buf[0] == ' ') {
+  while (fgets(buf, sizeof (buf), in)) {
+    if (m_strncmp("From ", buf, 4) == 0 || buf[0] == ' ') {
       fputc (' ', out);
     }
     fputs (buf, out);