#if USE_HCACHE
void *hc = NULL;
- uint64_t *uid_validity = NULL;
+ unsigned long *uid_validity = NULL;
char uid_buf[64];
#endif /* USE_HCACHE */
sprintf (uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
uid_validity =
- (uint64_t *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
+ (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
if (uid_validity != NULL && *uid_validity == idata->uid_validity) {
ctx->hdrs[msgno] =
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;
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 ");
"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);
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 */
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;
}
#if USE_HCACHE
static size_t imap_hcache_keylen (const char *fn)
{
- return mutt_strlen (fn);
+ return safe_strlen (fn);
}
/* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
flag_list = flag_list->next;
while (flag_list) {
- if (!ascii_strncasecmp (flag_list->data, flag, mutt_strlen (flag_list->data)))
+ if (!ascii_strncasecmp (flag_list->data, flag, safe_strlen (flag_list->data)))
return 1;
flag_list = flag_list->next;