#endif
#include "mutt.h"
-#include "mailbox.h"
#include "mx.h"
#include "copy.h"
#include "rfc2047.h"
#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>
/* 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;
*/
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 *));
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;
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;
}
}
} /* 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 {
_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);