MOVE_ELEM(supersedes);
MOVE_ELEM(date);
MOVE_ELEM(x_label);
- MOVE_ELEM(references);
- MOVE_ELEM(in_reply_to);
+ if (!base->refs_changed) {
+ MOVE_ELEM(references);
+ }
+ if (!base->irt_changed) {
+ MOVE_ELEM(in_reply_to);
+ }
/* real_subj is subordinate to subject */
if (!base->subject) {
base->subject = (*extra)->subject;
}
#endif
- if (stat (s, st) != -1) {
- if (magic == -1) {
- mutt_error (_("%s is not a mailbox!"), s);
- return 1;
- }
-
+ if (magic > 0 && !mx_access (s, W_OK)) {
if (option (OPTCONFIRMAPPEND) &&
- (!TrashPath || (mutt_strcmp (s, TrashPath) != 0)))
+ (!TrashPath || (mutt_strcmp (s, TrashPath) != 0))) {
/* if we're appending to the trash, there's no point in asking */
- {
snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
ret = 1;
ret = -1;
}
}
+
+ if (stat (s, st) != -1) {
+ if (magic == -1) {
+ mutt_error (_("%s is not a mailbox!"), s);
+ return 1;
+ }
+ }
else {
#ifdef USE_IMAP
if (magic != M_IMAP)
return 0;
}
+
+int mutt_cmp_header (const HEADER * h1, const HEADER * h2) {
+ if (h1 && h2) {
+ if (h1->received != h2->received ||
+ h1->date_sent != h2->date_sent ||
+ h1->content->length != h2->content->length ||
+ h1->lines != h2->lines ||
+ h1->zhours != h2->zhours ||
+ h1->zminutes != h2->zminutes ||
+ h1->zoccident != h2->zoccident ||
+ h1->mime != h2->mime ||
+ !mutt_cmp_env (h1->env, h2->env) ||
+ !mutt_cmp_body (h1->content, h2->content))
+ return (0);
+ else
+ return (1);
+ }
+ else {
+ if (h1 == NULL && h2 == NULL)
+ return (1);
+ else
+ return (0);
+ }
+}
+
+/* return 1 if address lists are strictly identical */
+int mutt_cmp_addr (const ADDRESS * a, const ADDRESS * b)
+{
+ while (a && b) {
+ if (mutt_strcmp (a->mailbox, b->mailbox) ||
+ mutt_strcmp (a->personal, b->personal))
+ return (0);
+
+ a = a->next;
+ b = b->next;
+ }
+ if (a || b)
+ return (0);
+
+ return (1);
+}
+
+int mutt_cmp_list (const LIST * a, const LIST * b)
+{
+ while (a && b) {
+ if (mutt_strcmp (a->data, b->data))
+ return (0);
+
+ a = a->next;
+ b = b->next;
+ }
+ if (a || b)
+ return (0);
+
+ return (1);
+}
+
+int mutt_cmp_env (const ENVELOPE * e1, const ENVELOPE * e2)
+{
+ if (e1 && e2) {
+ if (mutt_strcmp (e1->message_id, e2->message_id) ||
+ mutt_strcmp (e1->subject, e2->subject) ||
+ !mutt_cmp_list (e1->references, e2->references) ||
+ !mutt_cmp_addr (e1->from, e2->from) ||
+ !mutt_cmp_addr (e1->sender, e2->sender) ||
+ !mutt_cmp_addr (e1->reply_to, e2->reply_to) ||
+ !mutt_cmp_addr (e1->to, e2->to) ||
+ !mutt_cmp_addr (e1->cc, e2->cc) ||
+ !mutt_cmp_addr (e1->return_path, e2->return_path))
+ return (0);
+ else
+ return (1);
+ }
+ else {
+ if (e1 == NULL && e2 == NULL)
+ return (1);
+ else
+ return (0);
+ }
+}
+
+int mutt_cmp_param (const PARAMETER * p1, const PARAMETER * p2)
+{
+ while (p1 && p2) {
+ if (mutt_strcmp (p1->attribute, p2->attribute) ||
+ mutt_strcmp (p1->value, p2->value))
+ return (0);
+
+ p1 = p1->next;
+ p2 = p2->next;
+ }
+ if (p1 || p2)
+ return (0);
+
+ return (1);
+}
+
+int mutt_cmp_body (const BODY * b1, const BODY * b2)
+{
+ if (b1->type != b2->type ||
+ b1->encoding != b2->encoding ||
+ mutt_strcmp (b1->subtype, b2->subtype) ||
+ mutt_strcmp (b1->description, b2->description) ||
+ !mutt_cmp_param (b1->parameter, b2->parameter) ||
+ b1->length != b2->length)
+ return (0);
+ return (1);
+}