HEADER *h;
char *canon_fname;
unsigned header_parsed:1;
-#ifdef USE_INODESORT
- ino_t inode;
-#endif /* USE_INODESORT */
struct maildir *next;
};
p_delete(&(*md)->canon_fname);
if ((*md)->h)
- mutt_free_header (&(*md)->h);
+ header_delete(&(*md)->h);
p_delete(md);
}
if ((f = fopen (fname, "r")) != NULL) {
if (!h)
- h = mutt_new_header ();
+ h = header_new();
h->env = mutt_read_rfc822_header (f, h, 0, 0);
fstat (fileno (f), &st);
if (ctx->magic == M_MH)
h = maildir_parse_message (ctx->magic, buf, is_old, NULL);
else {
- h = mutt_new_header ();
+ h = header_new();
h->old = is_old;
maildir_parse_flags (h, buf);
}
entry = p_new(struct maildir, 1);
entry->h = h;
entry->header_parsed = (ctx->magic == M_MH);
-#ifdef USE_INODESORT
- entry->inode = inode;
-#endif /* USE_INODESORT */
**last = entry;
*last = &entry->next;
return r;
}
-#ifdef USE_INODESORT
-/*
- * Merge two maildir lists according to the inode numbers.
- */
-static struct maildir *maildir_merge_inode (struct maildir *left,
- struct maildir *right)
-{
- struct maildir *head;
- struct maildir *tail;
-
- if (left && right) {
- if (left->inode < right->inode) {
- head = left;
- left = left->next;
- }
- else {
- head = right;
- right = right->next;
- }
- }
- else {
- if (left)
- return left;
- else
- return right;
- }
-
- tail = head;
-
- while (left && right) {
- if (left->inode < right->inode) {
- tail->next = left;
- left = left->next;
- }
- else {
- tail->next = right;
- right = right->next;
- }
- tail = tail->next;
- }
-
- if (left) {
- tail->next = left;
- }
- else {
- tail->next = right;
- }
-
- return head;
-}
-
-/*
- * Sort maildir list according to inode.
- */
-static struct maildir *maildir_sort_inode (struct maildir *list)
-{
- struct maildir *left = list;
- struct maildir *right = list;
-
- if (!list || !list->next) {
- return list;
- }
-
- list = list->next;
- while (list && list->next) {
- right = right->next;
- list = list->next->next;
- }
-
- list = right;
- right = right->next;
- list->next = 0;
-
- left = maildir_sort_inode (left);
- right = maildir_sort_inode (right);
- return maildir_merge_inode (left, right);
-}
-#endif /* USE_INODESORT */
-
#ifdef USE_HCACHE
static size_t maildir_hcache_keylen (const char *fn)
{
#endif
}
else
- mutt_free_header (&p->h);
+ header_delete(&p->h);
#ifdef USE_HCACHE
p_delete(&data);
#endif
mhs_free_sequences (&mhs);
}
-#ifdef USE_INODESORT
- md = maildir_sort_inode (md);
-#endif /* USE_INODESORT */
-
if (ctx->magic == M_MAILDIR)
maildir_delayed_parsing (ctx, md);
ctx->hdrs[i]->trash = p->h->trash;
/* this is a duplicate of an existing header, so remove it */
- mutt_free_header (&p->h);
+ header_delete(&p->h);
}
/* This message was not in the list of messages we just scanned.
* Check to see if we have enough information to know if the
if (!ctx->hdrs[i]->changed)
maildir_update_flags (ctx, ctx->hdrs[i], p->h);
- mutt_free_header (&p->h);
+ header_delete(&p->h);
}
else /* message has disappeared */
occult = 1;