X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=949ca2cece0891d86bb109214cb54ea47b6ac253;hp=1d0db54a8154249c95306077831c861f45c53973;hb=a0aa3d4bba449529dfed997214b34e309ce451dd;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281 diff --git a/imap/message.c b/imap/message.c index 1d0db54..949ca2c 100644 --- a/imap/message.c +++ b/imap/message.c @@ -1,20 +1,11 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1996-9 Brandon Long * Copyright (C) 1999-2002 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. */ /* message parsing/updating functions */ @@ -27,15 +18,23 @@ #include #include "mutt.h" +#include "ascii.h" +#include "buffer.h" #include "mutt_curses.h" #include "imap_private.h" #include "message.h" #include "mx.h" +#include "hcache.h" #ifdef HAVE_PGP #include "pgp.h" #endif +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" +#include "lib/debug.h" + #if HAVE_STDINT_H #include #elif HAVE_INTTYPES_H @@ -76,16 +75,12 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) #if USE_HCACHE void *hc = NULL; - uint64_t *uid_validity = NULL; + unsigned long *uid_validity = NULL; char uid_buf[64]; #endif /* USE_HCACHE */ ctx = idata->ctx; -#if USE_HCACHE - hc = mutt_hcache_open (HeaderCache, ctx->path); -#endif /* USE_HCACHE */ - if (mutt_bit_isset (idata->capabilities, IMAP4REV1)) { snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s%s%s)]", want_headers, ImapHeaders ? " " : "", @@ -100,9 +95,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) mutt_error _("Unable to fetch headers from this IMAP server version."); mutt_sleep (2); /* pause a moment to let the user see the error */ -#if USE_HCACHE - mutt_hcache_close (hc); -#endif /* USE_HCACHE */ return -1; } @@ -112,9 +104,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) if (!(fp = safe_fopen (tempfile, "w+"))) { mutt_error (_("Could not create temporary file %s"), tempfile); mutt_sleep (2); -#if USE_HCACHE - mutt_hcache_close (hc); -#endif /* USE_HCACHE */ return -1; } unlink (tempfile); @@ -128,6 +117,8 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) idata->newMailCount = 0; #if USE_HCACHE + hc = mutt_hcache_open (HeaderCache, ctx->path); + snprintf (buf, sizeof (buf), "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1); fetchlast = msgend + 1; @@ -140,7 +131,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) rewind (fp); memset (&h, 0, sizeof (h)); - h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA)); + h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); do { mfhrc = 0; @@ -159,16 +150,13 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) 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] = - mutt_hcache_restore ((unsigned char *) uid_validity, 0); + ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0); ctx->hdrs[msgno]->index = h.sid - 1; if (h.sid != ctx->msgcount + 1) - dprint (1, - (debugfile, - "imap_read_headers: msgcount and sequence ID are inconsistent!")); + debug_print (1, ("imap_read_headers: msgcount and sequence ID are inconsistent!")); /* messages which have not been expunged are ACTIVE (borrowed from mh * folders) */ ctx->hdrs[msgno]->active = 1; @@ -183,9 +171,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) ctx->msgcount++; } + rewind (fp); - FREE (&uid_validity); + mem_free (&uid_validity); } while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) || @@ -232,7 +221,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) /* freshen fp, h */ rewind (fp); memset (&h, 0, sizeof (h)); - h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA)); + h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); /* this DO loop does two things: * 1. handles untagged messages, so we can try again on the same msg @@ -259,9 +248,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) ctx->hdrs[msgno]->index = h.sid - 1; if (h.sid != ctx->msgcount + 1) - dprint (1, - (debugfile, - "imap_read_headers: msgcount and sequence ID are inconsistent!")); + debug_print (1, ("msgcount and sequence ID are inconsistent!\n")); /* messages which have not been expunged are ACTIVE (borrowed from mh * folders) */ ctx->hdrs[msgno]->active = 1; @@ -328,6 +315,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) { IMAP_DATA *idata; HEADER *h; + ENVELOPE* newenv; char buf[LONG_STRING]; char path[_POSIX_PATH_MAX]; char *pc; @@ -337,6 +325,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) IMAP_CACHE *cache; int read; int rc; + progress_t bar; /* Sam's weird courier server returns an OK response even when FETCH * fails. Thanks Sam. */ @@ -350,18 +339,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) cache = &idata->cache[cacheno]; if (cache->path) { - if (cache->uid == HEADER_DATA (h)->uid) { - /* yes, so just return a pointer to the message */ - if (!(msg->fp = fopen (cache->path, "r"))) { - mutt_perror (cache->path); - return (-1); - } + /* don't treat cache errors as fatal, just fall back. */ + if (cache->uid == HEADER_DATA(h)->uid && (msg->fp = fopen (cache->path, "r"))) return 0; - } else { - /* clear the previous entry */ unlink (cache->path); - FREE (&cache->path); + mem_free (&cache->path); } } @@ -370,9 +353,9 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) cache->uid = HEADER_DATA (h)->uid; mutt_mktemp (path); - cache->path = safe_strdup (path); + cache->path = str_dup (path); if (!(msg->fp = safe_fopen (path, "w+"))) { - FREE (&cache->path); + mem_free (&cache->path); return -1; } @@ -413,7 +396,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) imap_error ("imap_fetch_message()", buf); goto bail; } - if (imap_read_literal (msg->fp, idata, bytes) < 0) + bar.size = bytes; + bar.msg = _("Fetching message..."); +#ifdef USE_SOCKET + mutt_progress_bar (&bar, 0); +#endif + if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0) goto bail; /* pick up trailing line */ if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE) @@ -438,6 +426,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) /* see comment before command start. */ h->active = 1; + fflush (msg->fp); + if (ferror (msg->fp)) { + mutt_perror (cache->path); + goto bail; + } + if (rc != IMAP_CMD_OK) goto bail; @@ -454,21 +448,8 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) * picked up in mutt_read_rfc822_header, we mark the message (and context * changed). Another possiblity: ignore Status on IMAP?*/ read = h->read; - /* I hate do this here, since it's so low-level, but I'm not sure where - * I can abstract it. Problem: the id and subj hashes lose their keys when - * mutt_free_envelope gets called, but keep their spots in the hash. This - * confuses threading. Alternatively we could try to merge the new - * envelope into the old one. Also messy and lowlevel. */ - if (ctx->id_hash && h->env->message_id) - hash_delete (ctx->id_hash, h->env->message_id, h, NULL); - if (ctx->subj_hash && h->env->real_subj) - hash_delete (ctx->subj_hash, h->env->real_subj, h, NULL); - mutt_free_envelope (&h->env); - h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0); - if (ctx->id_hash && h->env->message_id) - hash_insert (ctx->id_hash, h->env->message_id, h, 0); - if (ctx->subj_hash && h->env->real_subj) - hash_insert (ctx->subj_hash, h->env->real_subj, h, 1); + newenv = mutt_read_rfc822_header (msg->fp, h, 0, 0); + mutt_merge_envelopes(h->env, &newenv); /* see above. We want the new status in h->read, so we unset it manually * and let mutt_set_flag set it correctly, updating context. */ @@ -500,7 +481,7 @@ bail: safe_fclose (&msg->fp); if (cache->path) { unlink (cache->path); - FREE (&cache->path); + mem_free (&cache->path); } return -1; @@ -517,6 +498,8 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) int c, last; IMAP_MBOX mx; int rc; + progress_t bar; + size_t sent; idata = (IMAP_DATA *) ctx->data; @@ -544,6 +527,12 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) } rewind (fp); + bar.msg = _("Uploading message..."); + bar.size = len; +#ifdef USE_SOCKET + mutt_progress_bar (&bar, 0); +#endif + imap_munge_mbox_name (mbox, sizeof (mbox), mailbox); snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox, msg->flags.read ? "\\Seen" : "", @@ -562,8 +551,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (rc != IMAP_CMD_RESPOND) { char *pc; - dprint (1, (debugfile, "imap_append_message(): command failed: %s\n", - idata->cmd.buf)); + debug_print (1, ("command failed: %s\n", idata->cmd.buf)); pc = idata->cmd.buf + SEQLEN; SKIPWS (pc); @@ -574,16 +562,19 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) goto fail; } - mutt_message _("Uploading message ..."); - - for (last = EOF, len = 0; (c = fgetc (fp)) != EOF; last = c) { + for (last = EOF, sent = len = 0; (c = fgetc (fp)) != EOF; last = c) { if (c == '\n' && last != '\r') buf[len++] = '\r'; buf[len++] = c; - if (len > sizeof (buf) - 3) + if (len > sizeof (buf) - 3) { + sent += len; flush_buffer (buf, &len, idata->conn); +#ifdef USE_SOCKET + mutt_progress_bar (&bar, sent); +#endif + } } if (len) @@ -599,8 +590,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (!imap_code (idata->cmd.buf)) { char *pc; - dprint (1, (debugfile, "imap_append_message(): command failed: %s\n", - idata->cmd.buf)); + debug_print (1, ("command failed: %s\n", idata->cmd.buf)); pc = idata->cmd.buf + SEQLEN; SKIPWS (pc); pc = imap_next_word (pc); @@ -609,11 +599,11 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) goto fail; } - FREE (&mx.mbox); + mem_free (&mx.mbox); return 0; fail: - FREE (&mx.mbox); + mem_free (&mx.mbox); return -1; } @@ -626,37 +616,36 @@ fail: 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; if (imap_parse_path (dest, &mx)) { - dprint (1, (debugfile, "imap_copy_messages: bad destination %s\n", dest)); + debug_print (1, ("bad destination %s\n", dest)); return -1; } /* check that the save-to folder is in the same account */ if (!mutt_account_match (&(CTX_DATA->conn->account), &(mx.account))) { - dprint (3, (debugfile, "imap_copy_messages: %s not same server as %s\n", - dest, ctx->path)); + debug_print (3, ("%s not same server as %s\n", dest, ctx->path)); return 1; } if (h && h->attach_del) { - dprint (3, - (debugfile, - "imap_copy_messages: Message contains attachments to be deleted\n")); + debug_print (3, ("Message contains attachments to be deleted\n")); return 1; } 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 "); @@ -667,16 +656,25 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) * remainder. */ for (n = 0; n < ctx->msgcount; n++) { if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->attach_del) { - dprint (3, - (debugfile, - "imap_copy_messages: Message contains attachments to be deleted\n")); + debug_print (3, ("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) + { + debug_print (1, ("could not sync\n")); + goto fail; + } + } } rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); if (!rc) { - dprint (1, (debugfile, "imap_copy_messages: No messages tagged\n")); + debug_print (1, ("No messages tagged\n")); goto fail; } mutt_message (_("Copying %d messages to %s..."), rc, mbox); @@ -685,6 +683,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) + { + debug_print (1, ("could not sync\n")); + goto fail; + } + } } /* let's get it on */ @@ -700,8 +708,7 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) imap_error ("imap_copy_messages", idata->cmd.buf); goto fail; } - dprint (2, - (debugfile, "imap_copy_messages: server suggests TRYCREATE\n")); + debug_print (2, ("server suggests TRYCREATE\n")); snprintf (mmbox, sizeof (mmbox), _("Create %s?"), mbox); if (option (OPTCONFIRMCREATE) && mutt_yesorno (mmbox, 1) < 1) { mutt_clear_error (); @@ -738,14 +745,18 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) } if (cmd.data) - FREE (&cmd.data); - FREE (&mx.mbox); + mem_free (&cmd.data); + if (sync_cmd.data) + mem_free (&sync_cmd.data); + mem_free (&mx.mbox); return 0; fail: if (cmd.data) - FREE (&cmd.data); - FREE (&mx.mbox); + mem_free (&cmd.data); + if (sync_cmd.data) + mem_free (&sync_cmd.data); + mem_free (&mx.mbox); return -1; } @@ -763,8 +774,8 @@ void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags, while (keywords) { if (msg_has_flag (mailbox_flags, keywords->data)) { - safe_strcat (s, slen, keywords->data); - safe_strcat (s, slen, " "); + str_cat (s, slen, keywords->data); + str_cat (s, slen, " "); } keywords = keywords->next; } @@ -776,7 +787,7 @@ void imap_free_header_data (void **data) /* this should be safe even if the list wasn't used */ mutt_free_list (&(((IMAP_HEADER_DATA *) * data)->keywords)); - FREE (data); + mem_free (data); } /* imap_set_flags: fill out the message header according to the flags from @@ -788,11 +799,11 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) unsigned char readonly; memset (&newh, 0, sizeof (newh)); - newh.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA)); + newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); - dprint (2, (debugfile, "imap_fetch_message: parsing FLAGS\n")); + debug_print (2, ("parsing FLAGS\n")); if ((s = msg_parse_flags (&newh, s)) == NULL) { - FREE (&newh.data); + mem_free (&newh.data); return NULL; } @@ -818,7 +829,7 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) mutt_free_list (&(HEADER_DATA (h)->keywords)); HEADER_DATA (h)->keywords = newh.data->keywords; - FREE (&newh.data); + mem_free (&newh.data); return s; } @@ -862,7 +873,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, return rc; if (imap_get_literal_count (buf, &bytes) == 0) { - imap_read_literal (fp, idata, bytes); + imap_read_literal (fp, idata, bytes, NULL); /* we may have other fields of the FETCH _after_ the literal * (eg Domino puts FLAGS here). Nothing wrong with that, either. @@ -887,7 +898,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, #if USE_HCACHE static size_t imap_hcache_keylen (const char *fn) { - return mutt_strlen (fn); + return str_len (fn); } /* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER. @@ -943,7 +954,7 @@ static int msg_has_flag (LIST * flag_list, const char *flag) flag_list = flag_list->next; while (flag_list) { - if (!ascii_strncasecmp (flag_list->data, flag, strlen (flag_list->data))) + if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data))) return 1; flag_list = flag_list->next; @@ -979,9 +990,7 @@ static int msg_parse_fetch (IMAP_HEADER * h, char *s) s += 12; SKIPWS (s); if (*s != '\"') { - dprint (1, - (debugfile, - "msg_parse_fetch(): bogus INTERNALDATE entry: %s\n", s)); + debug_print (1, ("bogus INTERNALDATE entry: %s\n", s)); return -1; } s++; @@ -1027,13 +1036,13 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) /* sanity-check string */ if (ascii_strncasecmp ("FLAGS", s, 5) != 0) { - dprint (1, (debugfile, "msg_parse_flags: not a FLAGS response: %s\n", s)); + debug_print (1, ("not a FLAGS response: %s\n", s)); return NULL; } s += 5; SKIPWS (s); if (*s != '(') { - dprint (1, (debugfile, "msg_parse_flags: bogus FLAGS response: %s\n", s)); + debug_print (1, ("bogus FLAGS response: %s\n", s)); return NULL; } s++; @@ -1086,8 +1095,7 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) s++; } else { - dprint (1, (debugfile, - "msg_parse_flags: Unterminated FLAGS response: %s\n", s)); + debug_print (1, ("Unterminated FLAGS response: %s\n", s)); return NULL; }