#endif
#include "mutt.h"
-#include "mailbox.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
#include "lib/mem.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <string.h>
#include <stdlib.h>
*/
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 *));
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);
}
/* 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))) {
- dprint (2, (debugfile, "Reorder: %s matches %s\n", t->data, buf));
+ if (!ascii_strncasecmp (buf, t->data, mutt_strlen (t->data))) {
+ debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
break;
}
}
} /* 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 {
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__ */
}
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);
}
{
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)
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);
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);
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,
_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);
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);
int l, linelen, buflen, count;
- linelen = safe_strlen (*h);
+ linelen = mutt_strlen (*h);
buflen = linelen + 3;
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;
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__ */