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);
static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
const char *subdir, const char *fname,
- int *count, int is_old, ino_t inode)
+ int *count, int is_old, ino_t inode __attribute__ ((unused)))
{
struct maildir *entry;
HEADER *h = NULL;
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);
* Open a new (temporary) message in an MH folder.
*/
-static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int mh_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr __attribute__ ((unused)))
{
return mh_mkstemp (dest, &msg->fp, &msg->path);
}
return (0);
}
-static int mh_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
+static int mh_sync_mailbox (CONTEXT * ctx, int unused __attribute__ ((unused)), int *index_hint)
{
char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
int i, j;
* either subdirectory differently, as mail could be copied directly into
* the cur directory from another agent.
*/
-static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused)))
{
struct stat st_new; /* status of the "new" subdirectory */
struct stat st_cur; /* status of the "cur" subdirectory */
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
*
*/
-static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
+static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused __attribute__ ((unused)))
{
char buf[_POSIX_PATH_MAX];
struct stat st, st_cur;
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;
DIR *dp;
struct dirent *de;
int r = 1; /* assume empty until we find a message */
- char realpath[_POSIX_PATH_MAX];
+ char frealpath[_POSIX_PATH_MAX];
int iter = 0;
/* Strategy here is to look for any file not beginning with a period */
/* we do "cur" on the first iteration since its more likely that we'll
* find old messages without having to scan both subdirs
*/
- snprintf (realpath, sizeof (realpath), "%s/%s", path,
+ snprintf (frealpath, sizeof (frealpath), "%s/%s", path,
iter == 0 ? "cur" : "new");
- if ((dp = opendir (realpath)) == NULL)
+ if ((dp = opendir (frealpath)) == NULL)
return -1;
while ((de = readdir (dp))) {
if (*de->d_name != '.') {
projects / apps / madmutt.git / blobdiff