Rocco Rutte:

[apps/madmutt.git] / copy.c

diff --git a/copy.c b/copy.c
index 87f41c6..d9a6fb9 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -146,8 +146,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         if (!headers[x])
           headers[x] = this_one;
         else {
-          safe_realloc (&headers[x], safe_strlen (headers[x]) +
-                        safe_strlen (this_one) + sizeof (char));
+          safe_realloc (&headers[x], mutt_strlen (headers[x]) +
+                        mutt_strlen (this_one) + sizeof (char));
           strcat (headers[x], this_one);        /* __STRCAT_CHECKED__ */
           FREE (&this_one);
         }
@@ -198,7 +198,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
       /* Find x -- the array entry where this header is to be saved */
       if (flags & CH_REORDER) {
         for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
-          if (!ascii_strncasecmp (buf, t->data, safe_strlen (t->data))) {
+          if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) {
             debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
             break;
           }
@@ -214,7 +214,7 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
         this_one = safe_strdup (buf);
       else {
         safe_realloc (&this_one,
-                      safe_strlen (this_one) + safe_strlen (buf) +
+                      mutt_strlen (this_one) + mutt_strlen (buf) +
                       sizeof (char));
         strcat (this_one, buf); /* __STRCAT_CHECKED__ */
       }
@@ -231,8 +231,8 @@ mutt_copy_hdr (FILE * in, FILE * out, long off_start, long off_end, int flags,
     if (!headers[x])
       headers[x] = this_one;
     else {
-      safe_realloc (&headers[x], safe_strlen (headers[x]) +
-                    safe_strlen (this_one) + sizeof (char));
+      safe_realloc (&headers[x], mutt_strlen (headers[x]) +
+                    mutt_strlen (this_one) + sizeof (char));
       strcat (headers[x], this_one);    /* __STRCAT_CHECKED__ */
       FREE (&this_one);
     }
@@ -324,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)
@@ -350,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);
@@ -364,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);
@@ -520,12 +521,12 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       char date[SHORT_STRING];
 
       mutt_make_date (date, sizeof (date));
-      date[5] = date[safe_strlen (date) - 1] = '\"';
+      date[5] = date[mutt_strlen (date) - 1] = '\"';
 
       /* Count the number of lines and bytes to be deleted */
       fseek (fpin, body->offset, SEEK_SET);
       new_lines = hdr->lines -
-        count_delete_lines (fpin, body, &new_length, safe_strlen (date));
+        count_delete_lines (fpin, body, &new_length, mutt_strlen (date));
 
       /* Copy the headers */
       if (mutt_copy_header (fpin, hdr, fpout,
@@ -702,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);
@@ -804,7 +804,7 @@ static void format_address_header (char **h, ADDRESS * a)
 
   int l, linelen, buflen, count;
 
-  linelen = safe_strlen (*h);
+  linelen = mutt_strlen (*h);
   buflen = linelen + 3;
 
 
@@ -817,7 +817,7 @@ static void format_address_header (char **h, ADDRESS * a)
     rfc822_write_address (buf, sizeof (buf), a, 0);
     a->next = tmp;
 
-    l = safe_strlen (buf);
+    l = mutt_strlen (buf);
     if (count && linelen + l > 74) {
       strcpy (cbuf, "\n\t");    /* __STRCPY_CHECKED__ */
       linelen = l + 8;
@@ -835,7 +835,7 @@ static void format_address_header (char **h, ADDRESS * a)
       strcpy (c2buf, ",");      /* __STRCPY_CHECKED__ */
     }
 
-    buflen += l + safe_strlen (cbuf) + safe_strlen (c2buf);
+    buflen += l + mutt_strlen (cbuf) + mutt_strlen (c2buf);
     safe_realloc (h, buflen);
     strcat (*h, cbuf);          /* __STRCAT_CHECKED__ */
     strcat (*h, buf);           /* __STRCAT_CHECKED__ */