X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=930f4d36a2d02abce173598c85874e7325888406;hp=9e7b39bc33535d3f4fdf56145461fc782febee65;hb=8476307969a605bea67f6b702b0c1e7a52038bed;hpb=108f3c7ab59844591f7540347914ea57be5245e2 diff --git a/imap/message.c b/imap/message.c index 9e7b39b..930f4d3 100644 --- a/imap/message.c +++ b/imap/message.c @@ -10,40 +10,20 @@ /* message parsing/updating functions */ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include - -#include -#include -#include -#include -#include +#include #include +#include +#include #include "mutt.h" #include "imap_private.h" #include "message.h" -#include "mx.h" -#include "hcache.h" #ifdef HAVE_PGP #include "pgp.h" #endif -#include -#include - -#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); @@ -54,7 +34,7 @@ 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: @@ -158,8 +138,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) if (uid_validity != NULL && *uid_validity == idata->uid_validity) { ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) 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; @@ -184,7 +162,7 @@ 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); + imap_free_header_data((void *)&h.data); fclose (fp); mutt_hcache_close (hc); return -1; @@ -251,8 +229,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) 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; @@ -315,6 +291,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; @@ -327,7 +347,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; @@ -389,7 +409,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.")); } @@ -449,15 +469,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; @@ -551,8 +571,6 @@ 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 = vskipspaces(idata->cmd.buf + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); @@ -587,7 +605,6 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (!imap_code (idata->cmd.buf)) { char *pc; - debug_print (1, ("command failed: %s\n", idata->cmd.buf)); pc = vskipspaces(idata->cmd.buf + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); @@ -624,18 +641,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; } @@ -652,7 +666,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; } @@ -662,7 +675,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; } } @@ -670,7 +682,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); @@ -685,7 +696,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; } } @@ -704,7 +714,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) imap_error ("imap_copy_messages", idata->cmd.buf); 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 (); @@ -797,7 +806,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; @@ -892,7 +900,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); } @@ -904,7 +912,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 */ @@ -984,7 +992,6 @@ static int msg_parse_fetch (IMAP_HEADER * h, char *s) else if (ascii_strncasecmp ("INTERNALDATE", s, 12) == 0) { s = vskipspaces(s + 12); if (*s != '\"') { - debug_print (1, ("bogus INTERNALDATE entry: %s\n", s)); return -1; } s++; @@ -1029,12 +1036,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 = vskipspaces(s + 5); if (*s != '(') { - debug_print (1, ("bogus FLAGS response: %s\n", s)); return NULL; } s++; @@ -1087,7 +1092,6 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s) s++; } else { - debug_print (1, ("Unterminated FLAGS response: %s\n", s)); return NULL; }