From fd72eff6580bef192319cee7e983d5e2a6a16dde Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sun, 3 Apr 2005 00:14:51 +0000 Subject: [PATCH] Synchronise message flags before moving messages. --- imap/imap.c | 137 ++++++++++++++++++++++++-------------------- imap/imap_private.h | 2 + imap/message.c | 30 +++++++++- 3 files changed, 105 insertions(+), 64 deletions(-) diff --git a/imap/imap.c b/imap/imap.c index 38409514e..59560c214 100644 --- a/imap/imap.c +++ b/imap/imap.c @@ -1,7 +1,7 @@ /* * Copyright (C) 1996-8 Michael R. Elkins * Copyright (C) 1996-9 Brandon Long - * Copyright (C) 1999-2003 Brendan Cully + * Copyright (C) 1999-2005 Brendan Cully * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -921,6 +921,76 @@ int imap_make_msg_set (IMAP_DATA* idata, BUFFER* buf, int flag, int changed) return count; } +/* Update the IMAP server to reflect the flags a single message. */ + +int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, + int *err_continue) +{ + char flags[LONG_STRING]; + char uid[11]; + + hdr->changed = 0; + + snprintf (uid, sizeof (uid), "%u", HEADER_DATA(hdr)->uid); + cmd->dptr = cmd->data; + mutt_buffer_addstr (cmd, "UID STORE "); + mutt_buffer_addstr (cmd, uid); + + flags[0] = '\0'; + + imap_set_flag (idata, IMAP_ACL_SEEN, hdr->read, "\\Seen ", + flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_WRITE, hdr->flagged, + "\\Flagged ", flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_WRITE, hdr->replied, + "\\Answered ", flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_DELETE, hdr->deleted, + "\\Deleted ", flags, sizeof (flags)); + + /* now make sure we don't lose custom tags */ + if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) + imap_add_keywords (flags, hdr, idata->flags, sizeof (flags)); + + mutt_remove_trailing_ws (flags); + + /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to + * explicitly revoke all system flags (if we have permission) */ + if (!*flags) + { + imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); + imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); + + mutt_remove_trailing_ws (flags); + + mutt_buffer_addstr (cmd, " -FLAGS.SILENT ("); + } else + mutt_buffer_addstr (cmd, " FLAGS.SILENT ("); + + mutt_buffer_addstr (cmd, flags); + mutt_buffer_addstr (cmd, ")"); + + /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ + hdr->active = 0; + + /* after all this it's still possible to have no flags, if you + * have no ACL rights */ + if (*flags && (imap_exec (idata, cmd->data, 0) != 0) && + err_continue && (*err_continue != M_YES)) + { + *err_continue = imap_continue ("imap_sync_message: STORE failed", + idata->cmd.buf); + if (*err_continue != M_YES) + return -1; + } + + hdr->active = 1; + idata->ctx->changed--; + + return 0; +} + /* update the IMAP server to reflect message changes done within mutt. * Arguments * ctx: the current context @@ -932,12 +1002,10 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint) IMAP_DATA* idata; CONTEXT* appendctx = NULL; BUFFER cmd; - char flags[LONG_STRING]; - char uid[11]; int deleted; int n; - int err_continue = M_NO; /* continue on error? */ int rc; + int err_continue = M_NO; /* continue on error? */ idata = (IMAP_DATA*) ctx->data; @@ -994,16 +1062,9 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint) { if (ctx->hdrs[n]->active && ctx->hdrs[n]->changed) { - ctx->hdrs[n]->changed = 0; - mutt_message (_("Saving message status flags... [%d/%d]"), n+1, ctx->msgcount); - snprintf (uid, sizeof (uid), "%u", HEADER_DATA(ctx->hdrs[n])->uid); - cmd.dptr = cmd.data; - mutt_buffer_addstr (&cmd, "UID STORE "); - mutt_buffer_addstr (&cmd, uid); - /* if attachments have been deleted we delete the message and reupload * it. This works better if we're expunging, of course. */ if (ctx->hdrs[n]->attach_del) @@ -1018,60 +1079,12 @@ int imap_sync_mailbox (CONTEXT* ctx, int expunge, int* index_hint) else _mutt_save_message (ctx->hdrs[n], appendctx, 1, 0, 0); } - flags[0] = '\0'; - - imap_set_flag (idata, IMAP_ACL_SEEN, ctx->hdrs[n]->read, "\\Seen ", - flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->flagged, - "\\Flagged ", flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_WRITE, ctx->hdrs[n]->replied, - "\\Answered ", flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_DELETE, ctx->hdrs[n]->deleted, - "\\Deleted ", flags, sizeof (flags)); - - /* now make sure we don't lose custom tags */ - if (mutt_bit_isset (idata->rights, IMAP_ACL_WRITE)) - imap_add_keywords (flags, ctx->hdrs[n], idata->flags, sizeof (flags)); - - mutt_remove_trailing_ws (flags); - - /* UW-IMAP is OK with null flags, Cyrus isn't. The only solution is to - * explicitly revoke all system flags (if we have permission) */ - if (!*flags) - { - imap_set_flag (idata, IMAP_ACL_SEEN, 1, "\\Seen ", flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Flagged ", flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_WRITE, 1, "\\Answered ", flags, sizeof (flags)); - imap_set_flag (idata, IMAP_ACL_DELETE, 1, "\\Deleted ", flags, sizeof (flags)); - - mutt_remove_trailing_ws (flags); - mutt_buffer_addstr (&cmd, " -FLAGS.SILENT ("); - } - else - mutt_buffer_addstr (&cmd, " FLAGS.SILENT ("); - - mutt_buffer_addstr (&cmd, flags); - mutt_buffer_addstr (&cmd, ")"); - - /* dumb hack for bad UW-IMAP 4.7 servers spurious FLAGS updates */ - ctx->hdrs[n]->active = 0; - - /* after all this it's still possible to have no flags, if you - * have no ACL rights */ - if (*flags && (imap_exec (idata, cmd.data, 0) != 0) && - (err_continue != M_YES)) + if (imap_sync_message (idata, ctx->hdrs[n], &cmd, &err_continue) < 0) { - err_continue = imap_continue ("imap_sync_mailbox: STORE failed", - idata->cmd.buf); - if (err_continue != M_YES) - { - rc = -1; - goto out; - } + rc = -1; + goto out; } - - ctx->hdrs[n]->active = 1; } } ctx->changed = 0; diff --git a/imap/imap_private.h b/imap/imap_private.h index a9bf6c98e..144f7eebf 100644 --- a/imap/imap_private.h +++ b/imap/imap_private.h @@ -203,6 +203,8 @@ int imap_parse_list_response(IMAP_DATA* idata, char** name, int* noselect, int imap_read_literal (FILE* fp, IMAP_DATA* idata, long bytes); void imap_expunge_mailbox (IMAP_DATA* idata); void imap_logout (IMAP_DATA* idata); +int imap_sync_message (IMAP_DATA *idata, HEADER *hdr, BUFFER *cmd, + int *err_continue); /* auth.c */ int imap_authenticate (IMAP_DATA* idata); diff --git a/imap/message.c b/imap/message.c index cc43c1935..1cc1181a3 100644 --- a/imap/message.c +++ b/imap/message.c @@ -640,13 +640,14 @@ int imap_append_message (CONTEXT *ctx, MESSAGE *msg) int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) { IMAP_DATA* idata; - BUFFER cmd; + BUFFER cmd, sync_cmd; char uid[11]; char mbox[LONG_STRING]; char mmbox[LONG_STRING]; int rc; int n; IMAP_MBOX mx; + int err_continue = M_NO; idata = (IMAP_DATA*) ctx->data; @@ -672,6 +673,7 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox)); + memset (&sync_cmd, 0, sizeof (sync_cmd)); memset (&cmd, 0, sizeof (cmd)); mutt_buffer_addstr (&cmd, "UID COPY "); @@ -688,6 +690,17 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) dprint (3, (debugfile, "imap_copy_messages: Message contains attachments to be deleted\n")); return 1; } + + if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->active && + ctx->hdrs[n]->changed) + { + rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue); + if (rc < 0) + { + dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); + goto fail; + } + } } rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); @@ -703,6 +716,16 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) mutt_message (_("Copying message %d to %s..."), h->index+1, mbox); snprintf (uid, sizeof (uid), "%u", HEADER_DATA (h)->uid); mutt_buffer_addstr (&cmd, uid); + + if (h->active && h->changed) + { + rc = imap_sync_message (idata, h, &sync_cmd, &err_continue); + if (rc < 0) + { + dprint (1, (debugfile, "imap_copy_messages: could not sync\n")); + goto fail; + } + } } /* let's get it on */ @@ -761,12 +784,16 @@ int imap_copy_messages (CONTEXT* ctx, HEADER* h, char* dest, int delete) if (cmd.data) FREE (&cmd.data); + if (sync_cmd.data) + FREE (&sync_cmd.data); FREE (&mx.mbox); return 0; fail: if (cmd.data) FREE (&cmd.data); + if (sync_cmd.data) + FREE (&sync_cmd.data); FREE (&mx.mbox); return -1; } @@ -923,7 +950,6 @@ static size_t imap_hcache_keylen (const char *fn) static int msg_fetch_header_fetch (CONTEXT* ctx, IMAP_HEADER* h, char* buf, FILE* fp) { IMAP_DATA* idata; - long bytes; int rc = -1; /* default now is that string isn't FETCH response*/ idata = (IMAP_DATA*) ctx->data; -- 2.40.0