Rocco Rutte:

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 2a39ff7..d9a6fb9 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -12,7 +12,6 @@
 #endif
 
 #include "mutt.h"
-#include "mailbox.h"
 #include "mx.h"
 #include "copy.h"
 #include "rfc2047.h"
@@ -20,6 +19,10 @@
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -69,7 +72,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* Is it the begining of a header? */
       if (nl && buf[0] != ' ' && buf[0] != '\t') {
         ignore = 1;
-        if (!from && mutt_strncmp ("From ", buf, 5) == 0) {
+        if (!from && safe_strncmp ("From ", buf, 5) == 0) {
           if ((flags & CH_FROM) == 0)
             continue;
           from = 1;
@@ -114,12 +117,12 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
    */
   if (flags & CH_REORDER) {
     for (t = HeaderOrderList; t; t = t->next) {
-      dprint (1, (debugfile, "Reorder list: %s\n", t->data));
+      debug_print (1, ("Reorder list: %s\n", t->data));
       hdr_count++;
     }
   }
 
-  dprint (1, (debugfile, "WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
+  debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
 
   headers = safe_calloc (hdr_count, sizeof (char *));
 
@@ -154,7 +157,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
 
       ignore = 1;
       this_is_from = 0;
-      if (!from && mutt_strncmp ("From ", buf, 5) == 0) {
+      if (!from && safe_strncmp ("From ", buf, 5) == 0) {
         if ((flags & CH_FROM) == 0)
           continue;
         this_is_from = from = 1;
@@ -196,7 +199,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       if (flags & CH_REORDER) {
         for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
           if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) {
-            dprint (2, (debugfile, "Reorder: %s matches %s\n", t->data, buf));
+            debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
             break;
           }
         }
@@ -206,8 +209,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     }                           /* If beginning of header */
 
     if (!ignore) {
-      dprint (2,
-              (debugfile, "Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
+      debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
       if (!this_one)
         this_one = safe_strdup (buf);
       else {
@@ -322,8 +324,9 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
 {
   char buffer[SHORT_STRING];
 
-  flags |= (h->irt_changed ? CH_UPDATE_IRT : 0)
-    | (h->refs_changed ? CH_UPDATE_REFS : 0);
+  if (h->env)
+    flags |= (h->env->irt_changed ? CH_UPDATE_IRT : 0) |
+      (h->env->refs_changed ? CH_UPDATE_REFS : 0);
 
   if (mutt_copy_hdr (in, out, h->offset, h->content->offset, flags, prefix) ==
       -1)
@@ -348,8 +351,8 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
 
   if (flags & CH_UPDATE) {
     if ((flags & CH_NOSTATUS) == 0) {
-      if (h->irt_changed && h->new_env->in_reply_to) {
-        LIST *listp = h->new_env->in_reply_to;
+      if (h->env->irt_changed && h->env->in_reply_to) {
+        LIST *listp = h->env->in_reply_to;
 
         if (fputs ("In-Reply-To: ", out) == EOF)
           return (-1);
@@ -362,8 +365,8 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
           return (-1);
       }
 
-      if (h->refs_changed && h->new_env->references) {
-        LIST *listp = h->new_env->references, *refs = NULL, *t;
+      if (h->env->refs_changed && h->env->references) {
+        LIST *listp = h->env->references, *refs = NULL, *t;
 
         if (fputs ("References: ", out) == EOF)
           return (-1);
@@ -680,7 +683,7 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags,
        _mutt_copy_message (fpout, msg->fp, hdr, hdr->content, flags,
                            chflags)) == 0 && (ferror (fpout)
                                               || feof (fpout))) {
-    dprint (1, (debugfile, "_mutt_copy_message failed to detect EOF!\n"));
+    debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
     r = -1;
   }
   mx_close_message (&msg);
@@ -700,17 +703,16 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags,
 
 int
 _mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
-                      HEADER * hdr, BODY * body, int flags, int chflags)
-{
+                      HEADER * hdr, BODY * body, int flags, int chflags) {
+  char buf[STRING];
   MESSAGE *msg;
   int r;
 
-  if ((msg =
-       mx_open_new_message (dest, hdr,
-                            (src->magic == M_MBOX
-                             || src->magic == M_MMDF) ? 0 : M_ADD_FROM)) ==
-      NULL)
-    return -1;
+  fseek(fpin, hdr->offset, 0);
+  if (fgets (buf, sizeof (buf), fpin) == NULL)
+    return (-1);
+  if ((msg = mx_open_new_message (dest, hdr, is_from (buf, NULL, 0, NULL) ? 0 : M_ADD_FROM)) == NULL)
+    return (-1);
   if (dest->magic == M_MBOX || dest->magic == M_MMDF)
     chflags |= CH_FROM | CH_FORCE_FROM;
   chflags |= (dest->magic == M_MAILDIR ? CH_NOSTATUS : CH_UPDATE);