X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=1871be3b79d1160b02538e53910f4534b74ca168;hp=b8a3ca4ac634122c11c3fe01217114c09c644160;hb=refs%2Fheads%2Ftry-some-d;hpb=388148b48fedd8007192a5f94cf0bad89c65227b diff --git a/imap/message.c b/imap/message.c index b8a3ca4..1871be3 100644 --- a/imap/message.c +++ b/imap/message.c @@ -12,7 +12,7 @@ #include -#include +#include #include #include @@ -20,10 +20,6 @@ #include "imap_private.h" #include "message.h" -#ifdef HAVE_PGP -#include "pgp.h" -#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); @@ -83,7 +79,7 @@ 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. */ - fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(MCore.tmpdir), NULL); + fp = m_tempfile(tempfile, sizeof(tempfile), NONULL(mod_core.tmpdir), NULL); if (!fp) { mutt_error(_("Could not create temporary file")); mutt_sleep(2); @@ -100,7 +96,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) idata->newMailCount = 0; #ifdef USE_HCACHE - if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) { + if ((hc = mutt_hcache_open(ctx->path))) { snprintf (buf, sizeof (buf), "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1); @@ -123,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; @@ -216,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; @@ -375,7 +371,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) mutt_message _("Fetching message..."); cache->uid = HEADER_DATA (h)->uid; - msg->fp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL); + msg->fp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL); if (!msg->fp) { return -1; } @@ -388,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); @@ -426,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; } @@ -455,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 @@ -569,7 +565,7 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) if (rc != IMAP_CMD_RESPOND) { char *pc; - pc = vskipspaces(idata->cmd.buf + SEQLEN); + pc = vskipspaces(idata->cmd.buf.data + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); mutt_sleep (1); @@ -600,10 +596,10 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) 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; - pc = vskipspaces(idata->cmd.buf + SEQLEN); + pc = vskipspaces(idata->cmd.buf.data + SEQLEN); pc = imap_next_word (pc); mutt_error ("%s", pc); mutt_sleep (1); @@ -708,8 +704,8 @@ 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; } snprintf (mmbox, sizeof (mmbox), _("Create %s?"), mbox); @@ -724,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; } @@ -747,18 +743,14 @@ 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; } @@ -884,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; }