X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=df604d72225ac9554edc8ba3d2126b55204a6606;hp=3980496fed618e71c1b91231a34d70be4bbd791e;hb=9120e2c008281fb4acb9048545aa67873197b1d1;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded diff --git a/imap/message.c b/imap/message.c index 3980496..df604d7 100644 --- a/imap/message.c +++ b/imap/message.c @@ -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); @@ -57,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 */ @@ -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; @@ -132,11 +128,10 @@ 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; /* messages which have not been expunged are ACTIVE (borrowed from mh * folders) */ @@ -164,7 +159,7 @@ 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); m_fclose(&fp); - mutt_hcache_close (hc); + mutt_hcache_close (&hc); return -1; } } @@ -217,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; @@ -264,7 +259,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) imap_free_header_data ((void *)&h.data); m_fclose(&fp); #ifdef USE_HCACHE - mutt_hcache_close (hc); + mutt_hcache_close (&hc); #endif /* USE_HCACHE */ return -1; } @@ -280,7 +275,7 @@ 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 */ m_fclose(&fp); @@ -396,7 +391,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) 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); @@ -427,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; } @@ -456,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 @@ -570,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); @@ -601,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); @@ -709,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); @@ -725,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; } @@ -748,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; } @@ -885,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; }