#define MAXLOCKATTEMPT 5
-
static mx_t const *mxfmts[] = {
&mbox_mx,
&mh_mx,
&imap_mx,
&pop_mx,
&compress_mx,
+
+ /* hack so that it's linked together */
+ &pop_mx_ng,
};
#define MX_IDX(idx) (idx >= 0 && idx < countof(mxfmts))
/* try to use server-side copy first */
i = 1;
- if (ctx->magic == M_IMAP && imap_is_magic (mbox, NULL) == M_IMAP) {
+ if (ctx->magic == M_IMAP && imap_mx.mx_is_magic (mbox, NULL) == M_IMAP) {
/* tag messages for moving, and clear old tags, if any */
for (i = 0; i < ctx->msgcount; i++)
if (ctx->hdrs[i]->read && !ctx->hdrs[i]->deleted
*/
MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
{
+
MESSAGE *msg;
address_t *p = NULL;
/* return a stream pointer for a message */
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
{
- MESSAGE *msg;
-
- msg = p_new(MESSAGE, 1);
- switch (msg->magic = ctx->magic) {
- case M_MBOX:
- msg->fp = ctx->fp;
- break;
+ MESSAGE *msg;
- case M_MH:
- case M_MAILDIR:
- {
- HEADER *cur = ctx->hdrs[msgno];
- char path[_POSIX_PATH_MAX];
-
- snprintf (path, sizeof (path), "%s/%s", ctx->path, cur->path);
-
- if ((msg->fp = fopen (path, "r")) == NULL && errno == ENOENT &&
- ctx->magic == M_MAILDIR)
- msg->fp = maildir_open_find_message (ctx->path, cur->path);
+ if (!MX_IDX(ctx->magic) || !mxfmts[ctx->magic - 1]->mx_open_message)
+ return NULL;
- if (msg->fp == NULL) {
- mutt_perror (path);
+ msg = p_new(MESSAGE, 1);
+ msg->magic = ctx->magic;
+ if (mxfmts[ctx->magic - 1]->mx_open_message(msg, ctx, msgno))
p_delete(&msg);
- }
- }
- break;
-
- case M_IMAP:
- {
- if (imap_fetch_message (msg, ctx, msgno) != 0)
- p_delete(&msg);
- break;
- }
-
- case M_POP:
- {
- if (pop_fetch_message (msg, ctx, msgno) != 0)
- p_delete(&msg);
- break;
- }
-
- default:
- p_delete(&msg);
- break;
- }
- return msg;
+ return msg;
}
/* commit a message to a folder */