X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=62f4b21dd9f65438130c777e569b8f4310d9ab6b;hp=c6db2268770e69317e7b8febf30d4b00993d49b0;hb=f5a370338d87eba00bc8696636a90f6c50b05d14;hpb=1c16e9623a9fb6a15bb284a6f7322b583ebc06a7 diff --git a/imap/message.c b/imap/message.c index c6db226..62f4b21 100644 --- a/imap/message.c +++ b/imap/message.c @@ -10,50 +10,27 @@ /* message parsing/updating functions */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include +#include -#include -#include -#include -#include +#include +#include +#include #include "mutt.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 -#include -#include "lib/debug.h" - -#if HAVE_STDINT_H -#include -#elif HAVE_INTTYPES_H -#include -#endif static void flush_buffer (char *buf, size_t * len, CONNECTION * conn); static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, FILE * fp); -static int msg_has_flag (LIST * flag_list, const char *flag); +static int msg_has_flag (string_list_t * flag_list, const char *flag); static int msg_parse_fetch (IMAP_HEADER * h, char *s); static char *msg_parse_flags (IMAP_HEADER * h, char *s); #ifdef USE_HCACHE static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf, FILE * fp); -static size_t imap_hcache_keylen (const char *fn); +static ssize_t imap_hcache_keylen (const char *fn); #endif /* USE_HCACHE */ /* imap_read_headers: @@ -76,8 +53,8 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL"; #ifdef USE_HCACHE - void *hc = NULL; - unsigned long *uid_validity = NULL; + hcache_t *hc = NULL; + long *uid_validity = NULL; char uid_buf[64]; #endif /* USE_HCACHE */ @@ -102,13 +79,13 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) /* instead of downloading all headers and then parsing them, we parse them * as they come in. */ - mutt_mktemp (tempfile); - if (!(fp = safe_fopen (tempfile, "w+"))) { - mutt_error (_("Could not create temporary file %s"), tempfile); - mutt_sleep (2); + fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); + if (!fp) { + mutt_error(_("Could not create temporary file")); + mutt_sleep(2); return -1; } - unlink (tempfile); + unlink(tempfile); /* make sure context has room to hold the mailbox */ while ((msgend) >= idata->ctx->hdrmax) @@ -142,7 +119,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) break; if ((mfhrc = - msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1) + msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf.data, fp)) == -1) continue; else if (mfhrc < 0) break; @@ -151,14 +128,11 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) fputs ("\n\n", fp); sprintf (uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */ - uid_validity = - (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen); + uid_validity = 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(uid_validity, 0); ctx->hdrs[msgno]->index = h.sid - 1; - if (h.sid != ctx->msgcount + 1) - 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 +157,9 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) ((msgno + 1) >= fetchlast))); if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) { - imap_free_header_data ((void **) &h.data); - fclose (fp); - mutt_hcache_close (hc); + imap_free_header_data((void *)&h.data); + m_fclose(&fp); + mutt_hcache_close (&hc); return -1; } } @@ -238,7 +212,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) break; if ((mfhrc = - msg_fetch_header (idata->ctx, &h, idata->cmd.buf, fp)) == -1) + msg_fetch_header (idata->ctx, &h, idata->cmd.buf.data, fp)) == -1) continue; else if (mfhrc < 0) break; @@ -247,11 +221,9 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) fputs ("\n\n", fp); /* update context with message header */ - ctx->hdrs[msgno] = mutt_new_header (); + ctx->hdrs[msgno] = header_new(); ctx->hdrs[msgno]->index = h.sid - 1; - if (h.sid != ctx->msgcount + 1) - 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; @@ -285,9 +257,9 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) { imap_free_header_data ((void *)&h.data); - fclose (fp); + m_fclose(&fp); #ifdef USE_HCACHE - mutt_hcache_close (hc); + mutt_hcache_close (&hc); #endif /* USE_HCACHE */ return -1; } @@ -303,10 +275,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) } #ifdef USE_HCACHE - mutt_hcache_close (hc); + mutt_hcache_close (&hc); #endif /* USE_HCACHE */ - fclose (fp); + m_fclose(&fp); if (ctx->msgcount > oldmsgcount) mx_update_context (ctx, ctx->msgcount - oldmsgcount); @@ -314,6 +286,50 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) return msgend; } +/* move all the headers from extra not present in base into base */ +static void mutt_merge_envelopes(ENVELOPE* base, ENVELOPE** extra) +{ + /* copies each existing element if necessary, and sets the element + * to NULL in the source so that envelope_delete doesn't leave us + * with dangling pointers. */ +#define MOVE_ELEM(h) if (!base->h) { base->h = (*extra)->h; (*extra)->h = NULL; } + MOVE_ELEM(return_path); + MOVE_ELEM(from); + MOVE_ELEM(to); + MOVE_ELEM(cc); + MOVE_ELEM(bcc); + MOVE_ELEM(sender); + MOVE_ELEM(reply_to); + MOVE_ELEM(mail_followup_to); + MOVE_ELEM(list_post); + MOVE_ELEM(message_id); + MOVE_ELEM(supersedes); + MOVE_ELEM(date); + MOVE_ELEM(x_label); + if (!base->refs_changed) { + MOVE_ELEM(references); + } + if (!base->irt_changed) { + MOVE_ELEM(in_reply_to); + } + /* real_subj is subordinate to subject */ + if (!base->subject) { + base->subject = (*extra)->subject; + base->real_subj = (*extra)->real_subj; + (*extra)->subject = NULL; + (*extra)->real_subj = NULL; + } + /* spam and user headers should never be hashed, and the new envelope may + * have better values. Use new versions regardless. */ + mutt_buffer_free (&base->spam); + string_list_wipe(&base->userhdrs); + MOVE_ELEM(spam); + MOVE_ELEM(userhdrs); +#undef MOVE_ELEM + + envelope_delete(extra); +} + int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) { IMAP_DATA *idata; @@ -326,7 +342,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) int uid; int cacheno; IMAP_CACHE *cache; - int read; + int isread; int rc; progress_t bar; @@ -355,12 +371,11 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) mutt_message _("Fetching message..."); cache->uid = HEADER_DATA (h)->uid; - mutt_mktemp (path); - cache->path = m_strdup(path); - if (!(msg->fp = safe_fopen (path, "w+"))) { - p_delete(&cache->path); + msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL); + if (!msg->fp) { return -1; } + cache->path = m_strdup(path); /* mark this header as currently inactive so the command handler won't * also try to update it. HACK until all this code can be moved into the @@ -369,14 +384,14 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) snprintf (buf, sizeof (buf), "UID FETCH %u %s", HEADER_DATA (h)->uid, (mutt_bit_isset (idata->capabilities, IMAP4REV1) ? - (option (OPTIMAPPEEK) ? "BODY.PEEK[]" : "BODY[]") : "RFC822")); + "BODY.PEEK[]" : "RFC822")); imap_cmd_start (idata, buf); do { if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE) break; - pc = idata->cmd.buf; + pc = idata->cmd.buf.data; pc = imap_next_word (pc); pc = imap_next_word (pc); @@ -388,7 +403,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) if (ascii_strncasecmp ("UID", pc, 3) == 0) { pc = imap_next_word (pc); uid = atoi (pc); - if (uid != HEADER_DATA (h)->uid) + if (uid != HEADER_DATA(h)->uid) mutt_error (_ ("The message index is incorrect. Try reopening the mailbox.")); } @@ -407,7 +422,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) /* pick up trailing line */ if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE) goto bail; - pc = idata->cmd.buf; + pc = idata->cmd.buf.data; fetched = 1; } @@ -436,7 +451,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) if (rc != IMAP_CMD_OK) goto bail; - if (!fetched || !imap_code (idata->cmd.buf)) + if (!fetched || !imap_code (idata->cmd.buf.data)) goto bail; /* Update the header information. Previously, we only downloaded a @@ -448,15 +463,15 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) * the server's notion of 'read' and if it differs from the message info * picked up in mutt_read_rfc822_header, we mark the message (and context * changed). Another possiblity: ignore Status on IMAP?*/ - read = h->read; + isread = h->read; 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. */ - if (read != h->read) { - h->read = read; - mutt_set_flag (ctx, h, M_NEW, read); + if (isread != h->read) { + h->read = isread; + mutt_set_flag (ctx, h, M_NEW, isread); } h->lines = 0; @@ -479,7 +494,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) return 0; bail: - safe_fclose (&msg->fp); + m_fclose(&msg->fp); if (cache->path) { unlink (cache->path); p_delete(&cache->path); @@ -550,14 +565,11 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (rc != IMAP_CMD_RESPOND) { char *pc; - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); - - pc = idata->cmd.buf + SEQLEN; - SKIPWS (pc); + pc = vskipspaces(idata->cmd.buf.data + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); mutt_sleep (1); - fclose (fp); + m_fclose(&fp); goto fail; } @@ -578,18 +590,16 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) flush_buffer (buf, &len, idata->conn); mutt_socket_write (idata->conn, "\r\n"); - fclose (fp); + m_fclose(&fp); do rc = imap_cmd_step (idata); while (rc == IMAP_CMD_CONTINUE); - if (!imap_code (idata->cmd.buf)) { + if (!imap_code (idata->cmd.buf.data)) { char *pc; - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); - pc = idata->cmd.buf + SEQLEN; - SKIPWS (pc); + pc = vskipspaces(idata->cmd.buf.data + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); mutt_sleep (1); @@ -625,18 +635,15 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) idata = (IMAP_DATA *) ctx->data; if (imap_parse_path (dest, &mx)) { - 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))) { - debug_print (3, ("%s not same server as %s\n", dest, ctx->path)); return 1; } if (h && h->attach_del) { - debug_print (3, ("Message contains attachments to be deleted\n")); return 1; } @@ -653,7 +660,6 @@ 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) { - debug_print (3, ("Message contains attachments to be deleted\n")); return 1; } @@ -663,7 +669,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue); if (rc < 0) { - debug_print (1, ("could not sync\n")); goto fail; } } @@ -671,7 +676,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_make_msg_set (idata, &cmd, M_TAG, 0); if (!rc) { - debug_print (1, ("No messages tagged\n")); goto fail; } mutt_message (_("Copying %d messages to %s..."), rc, mbox); @@ -686,7 +690,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_sync_message (idata, h, &sync_cmd, &err_continue); if (rc < 0) { - debug_print (1, ("could not sync\n")); goto fail; } } @@ -701,11 +704,10 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) if (rc == -2) { /* bail out if command failed for reasons other than nonexistent target */ if (ascii_strncasecmp - (imap_get_qualifier (idata->cmd.buf), "[TRYCREATE]", 11)) { - imap_error ("imap_copy_messages", idata->cmd.buf); + (imap_get_qualifier (idata->cmd.buf.data), "[TRYCREATE]", 11)) { + imap_error ("imap_copy_messages", idata->cmd.buf.data); goto fail; } - 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 (); @@ -718,7 +720,7 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) rc = imap_exec (idata, cmd.data, 0); } if (rc != 0) { - imap_error ("imap_copy_messages", idata->cmd.buf); + imap_error ("imap_copy_messages", idata->cmd.buf.data); goto fail; } @@ -741,28 +743,24 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) } } - if (cmd.data) - p_delete(&cmd.data); - if (sync_cmd.data) - p_delete(&sync_cmd.data); + p_delete(&cmd.data); + p_delete(&sync_cmd.data); p_delete(&mx.mbox); return 0; fail: - if (cmd.data) - p_delete(&cmd.data); - if (sync_cmd.data) - p_delete(&sync_cmd.data); + p_delete(&cmd.data); + p_delete(&sync_cmd.data); p_delete(&mx.mbox); return -1; } /* imap_add_keywords: concatenate custom IMAP tags to list, if they * appear in the folder flags list. Why wouldn't they? */ -void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags, +void imap_add_keywords (char *s, HEADER * h, string_list_t * mailbox_flags, size_t slen) { - LIST *keywords; + string_list_t *keywords; if (!mailbox_flags || !HEADER_DATA (h) || !HEADER_DATA (h)->keywords) return; @@ -782,7 +780,7 @@ void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags, 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)); + string_list_wipe(&(((IMAP_HEADER_DATA *) * data)->keywords)); p_delete(data); } @@ -798,7 +796,6 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) p_clear(&newh, 1); newh.data = p_new(IMAP_HEADER_DATA, 1); - debug_print (2, ("parsing FLAGS\n")); if ((s = msg_parse_flags (&newh, s)) == NULL) { p_delete(&newh.data); return NULL; @@ -824,7 +821,7 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) ctx->changed &= ~readonly; ctx->readonly = readonly; - mutt_free_list (&(HEADER_DATA (h)->keywords)); + string_list_wipe(&(HEADER_DATA (h)->keywords)); HEADER_DATA (h)->keywords = newh.data->keywords; p_delete(&newh.data); @@ -879,7 +876,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE) return rc; - if (msg_parse_fetch (h, idata->cmd.buf) == -1) + if (msg_parse_fetch (h, idata->cmd.buf.data) == -1) return rc; } @@ -893,7 +890,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, } #ifdef USE_HCACHE -static size_t imap_hcache_keylen (const char *fn) +static ssize_t imap_hcache_keylen (const char *fn) { return m_strlen(fn); } @@ -905,7 +902,7 @@ static size_t imap_hcache_keylen (const char *fn) * -1 if the string is not a fetch response * -2 if the string is a corrupt fetch response */ static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf, - FILE * fp) + FILE * fp __attribute__ ((unused))) { IMAP_DATA *idata; int rc = -1; /* default now is that string isn't FETCH response */ @@ -944,7 +941,7 @@ static int msg_fetch_header_fetch (CONTEXT * ctx, IMAP_HEADER * h, char *buf, /* msg_has_flag: do a caseless comparison of the flag against a flag list, * return 1 if found or flag list has '\*', 0 otherwise */ -static int msg_has_flag (LIST * flag_list, const char *flag) +static int msg_has_flag (string_list_t * flag_list, const char *flag) { if (!flag_list) return 0; @@ -963,31 +960,28 @@ static int msg_has_flag (LIST * flag_list, const char *flag) /* msg_parse_fetch: handle headers returned from header fetch */ static int msg_parse_fetch (IMAP_HEADER * h, char *s) { - char tmp[SHORT_STRING]; + char tmp[STRING]; char *ptmp; if (!s) return -1; while (*s) { - SKIPWS (s); + s = vskipspaces(s); if (ascii_strncasecmp ("FLAGS", s, 5) == 0) { if ((s = msg_parse_flags (h, s)) == NULL) return -1; } else if (ascii_strncasecmp ("UID", s, 3) == 0) { - s += 3; - SKIPWS (s); + s = vskipspaces(s + 3); h->data->uid = (unsigned int) atoi (s); s = imap_next_word (s); } else if (ascii_strncasecmp ("INTERNALDATE", s, 12) == 0) { - s += 12; - SKIPWS (s); + s = vskipspaces(s + 12); if (*s != '\"') { - debug_print (1, ("bogus INTERNALDATE entry: %s\n", s)); return -1; } s++; @@ -1001,8 +995,7 @@ static int msg_parse_fetch (IMAP_HEADER * h, char *s) h->received = imap_parse_date (tmp); } else if (ascii_strncasecmp ("RFC822.SIZE", s, 11) == 0) { - s += 11; - SKIPWS (s); + s = vskipspaces(s + 11); ptmp = tmp; while (isdigit ((unsigned char) *s)) *ptmp++ = *s++; @@ -1033,13 +1026,10 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) /* sanity-check string */ if (ascii_strncasecmp ("FLAGS", s, 5) != 0) { - debug_print (1, ("not a FLAGS response: %s\n", s)); return NULL; } - s += 5; - SKIPWS (s); + s = vskipspaces(s + 5); if (*s != '(') { - debug_print (1, ("bogus FLAGS response: %s\n", s)); return NULL; } s++; @@ -1072,7 +1062,7 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) char *flag_word = s; if (!h->data->keywords) - h->data->keywords = mutt_new_list (); + h->data->keywords = string_item_new(); while (*s && !ISSPACE (*s) && *s != ')') s++; @@ -1081,7 +1071,7 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) mutt_add_list (h->data->keywords, flag_word); *s = ctmp; } - SKIPWS (s); + s = vskipspaces(s); } /* wrap up, or note bad flags response */ @@ -1092,7 +1082,6 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) s++; } else { - debug_print (1, ("Unterminated FLAGS response: %s\n", s)); return NULL; }