X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=660f954e66a62389be2fe6bf8ed0617c12e763e9;hp=8423a5c0d6deed39da83f4b5bda4cf0b604e26e3;hb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b;hpb=c8c4a96d55967447a5ebe380270adfb97f83cac5 diff --git a/imap/message.c b/imap/message.c index 8423a5c..660f954 100644 --- a/imap/message.c +++ b/imap/message.c @@ -17,6 +17,8 @@ #include #include +#include + #include "mutt.h" #include "ascii.h" #include "buffer.h" @@ -30,8 +32,7 @@ #include "pgp.h" #endif -#include "lib/mem.h" -#include "lib/intl.h" +#include #include "lib/str.h" #include "lib/debug.h" @@ -48,7 +49,7 @@ static int msg_has_flag (LIST * 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); -#if USE_HCACHE +#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); @@ -73,7 +74,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) const char *want_headers = "DATE FROM SUBJECT TO CC MESSAGE-ID REFERENCES CONTENT-TYPE CONTENT-DESCRIPTION IN-REPLY-TO REPLY-TO LINES LIST-POST X-LABEL"; -#if USE_HCACHE +#ifdef USE_HCACHE void *hc = NULL; unsigned long *uid_validity = NULL; char uid_buf[64]; @@ -116,7 +117,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) idata->reopen &= ~IMAP_NEWMAIL_PENDING; idata->newMailCount = 0; -#if USE_HCACHE +#ifdef USE_HCACHE if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) { snprintf (buf, sizeof (buf), @@ -131,7 +132,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) rewind (fp); memset (&h, 0, sizeof (h)); - h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); + h.data = p_new(IMAP_HEADER_DATA, 1); do { mfhrc = 0; @@ -174,7 +175,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) rewind (fp); - mem_free (&uid_validity); + p_delete(&uid_validity); } while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) || @@ -222,7 +223,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) /* freshen fp, h */ rewind (fp); memset (&h, 0, sizeof (h)); - h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); + h.data = p_new(IMAP_HEADER_DATA, 1); /* this DO loop does two things: * 1. handles untagged messages, so we can try again on the same msg @@ -270,7 +271,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) /* content built as a side-effect of mutt_read_rfc822_header */ ctx->hdrs[msgno]->content->length = h.content_length; -#if USE_HCACHE +#ifdef USE_HCACHE sprintf (uid_buf, "/%u", h.data->uid); mutt_hcache_store (hc, uid_buf, ctx->hdrs[msgno], idata->uid_validity, &imap_hcache_keylen); @@ -282,9 +283,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); + imap_free_header_data ((void *)&h.data); fclose (fp); -#if USE_HCACHE +#ifdef USE_HCACHE mutt_hcache_close (hc); #endif /* USE_HCACHE */ return -1; @@ -300,7 +301,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend) } } -#if USE_HCACHE +#ifdef USE_HCACHE mutt_hcache_close (hc); #endif /* USE_HCACHE */ @@ -345,7 +346,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) return 0; else { unlink (cache->path); - mem_free (&cache->path); + p_delete(&cache->path); } } @@ -356,7 +357,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno) mutt_mktemp (path); cache->path = str_dup (path); if (!(msg->fp = safe_fopen (path, "w+"))) { - mem_free (&cache->path); + p_delete(&cache->path); return -1; } @@ -480,7 +481,7 @@ bail: safe_fclose (&msg->fp); if (cache->path) { unlink (cache->path); - mem_free (&cache->path); + p_delete(&cache->path); } return -1; @@ -594,11 +595,11 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg) goto fail; } - mem_free (&mx.mbox); + p_delete(&mx.mbox); return 0; fail: - mem_free (&mx.mbox); + p_delete(&mx.mbox); return -1; } @@ -740,18 +741,18 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete) } if (cmd.data) - mem_free (&cmd.data); + p_delete(&cmd.data); if (sync_cmd.data) - mem_free (&sync_cmd.data); - mem_free (&mx.mbox); + p_delete(&sync_cmd.data); + p_delete(&mx.mbox); return 0; fail: if (cmd.data) - mem_free (&cmd.data); + p_delete(&cmd.data); if (sync_cmd.data) - mem_free (&sync_cmd.data); - mem_free (&mx.mbox); + p_delete(&sync_cmd.data); + p_delete(&mx.mbox); return -1; } @@ -782,7 +783,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)); - mem_free (data); + p_delete(data); } /* imap_set_flags: fill out the message header according to the flags from @@ -794,11 +795,11 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s) unsigned char readonly; memset (&newh, 0, sizeof (newh)); - newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA)); + newh.data = p_new(IMAP_HEADER_DATA, 1); debug_print (2, ("parsing FLAGS\n")); if ((s = msg_parse_flags (&newh, s)) == NULL) { - mem_free (&newh.data); + p_delete(&newh.data); return NULL; } @@ -824,7 +825,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; - mem_free (&newh.data); + p_delete(&newh.data); return s; } @@ -890,7 +891,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf, return rc; } -#if USE_HCACHE +#ifdef USE_HCACHE static size_t imap_hcache_keylen (const char *fn) { return str_len (fn);