X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=949ca2cece0891d86bb109214cb54ea47b6ac253;hp=264e65be0a3182d73f9aee57d912bdea0b481c0d;hb=a0aa3d4bba449529dfed997214b34e309ce451dd;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/imap/message.c b/imap/message.c
index 264e65b..949ca2c 100644
--- a/imap/message.c
+++ b/imap/message.c
@@ -18,10 +18,13 @@
 #include <ctype.h>
 
 #include "mutt.h"
+#include "ascii.h"
+#include "buffer.h"
 #include "mutt_curses.h"
 #include "imap_private.h"
 #include "message.h"
 #include "mx.h"
+#include "hcache.h"
 
 #ifdef HAVE_PGP
 #include "pgp.h"
@@ -78,10 +81,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
   ctx = idata->ctx;
 
-#if USE_HCACHE
-  hc = mutt_hcache_open (HeaderCache, ctx->path);
-#endif /* USE_HCACHE */
-
   if (mutt_bit_isset (idata->capabilities, IMAP4REV1)) {
     snprintf (hdrreq, sizeof (hdrreq), "BODY.PEEK[HEADER.FIELDS (%s%s%s)]",
               want_headers, ImapHeaders ? " " : "",
@@ -96,9 +95,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
     mutt_error _("Unable to fetch headers from this IMAP server version.");
 
     mutt_sleep (2);             /* pause a moment to let the user see the error */
-#if USE_HCACHE
-    mutt_hcache_close (hc);
-#endif /* USE_HCACHE */
     return -1;
   }
 
@@ -108,9 +104,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   if (!(fp = safe_fopen (tempfile, "w+"))) {
     mutt_error (_("Could not create temporary file %s"), tempfile);
     mutt_sleep (2);
-#if USE_HCACHE
-    mutt_hcache_close (hc);
-#endif /* USE_HCACHE */
     return -1;
   }
   unlink (tempfile);
@@ -124,6 +117,8 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   idata->newMailCount = 0;
 
 #if USE_HCACHE
+  hc = mutt_hcache_open (HeaderCache, ctx->path);
+
   snprintf (buf, sizeof (buf),
             "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
   fetchlast = msgend + 1;
@@ -136,7 +131,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
     rewind (fp);
     memset (&h, 0, sizeof (h));
-    h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+    h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
     do {
       mfhrc = 0;
 
@@ -158,11 +153,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
         (unsigned long *) 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((unsigned char *) uid_validity, 0);
         ctx->hdrs[msgno]->index = h.sid - 1;
         if (h.sid != ctx->msgcount + 1)
-          debug_print (1, ("msgcount and sequence ID are inconsistent!\n"));
+          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;
@@ -177,9 +171,10 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
 
         ctx->msgcount++;
       }
+
       rewind (fp);
 
-      FREE (&uid_validity);
+      mem_free (&uid_validity);
 
     }
     while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
@@ -226,7 +221,7 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
     /* freshen fp, h */
     rewind (fp);
     memset (&h, 0, sizeof (h));
-    h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+    h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
 
     /* this DO loop does two things:
      * 1. handles untagged messages, so we can try again on the same msg
@@ -320,6 +315,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 {
   IMAP_DATA *idata;
   HEADER *h;
+  ENVELOPE* newenv;
   char buf[LONG_STRING];
   char path[_POSIX_PATH_MAX];
   char *pc;
@@ -329,6 +325,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   IMAP_CACHE *cache;
   int read;
   int rc;
+  progress_t bar;
 
   /* Sam's weird courier server returns an OK response even when FETCH
    * fails. Thanks Sam. */
@@ -342,18 +339,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   cache = &idata->cache[cacheno];
 
   if (cache->path) {
-    if (cache->uid == HEADER_DATA (h)->uid) {
-      /* yes, so just return a pointer to the message */
-      if (!(msg->fp = fopen (cache->path, "r"))) {
-        mutt_perror (cache->path);
-        return (-1);
-      }
+    /* don't treat cache errors as fatal, just fall back. */
+    if (cache->uid == HEADER_DATA(h)->uid && (msg->fp = fopen (cache->path, "r")))
       return 0;
-    }
     else {
-      /* clear the previous entry */
       unlink (cache->path);
-      FREE (&cache->path);
+      mem_free (&cache->path);
     }
   }
 
@@ -362,9 +353,9 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 
   cache->uid = HEADER_DATA (h)->uid;
   mutt_mktemp (path);
-  cache->path = safe_strdup (path);
+  cache->path = str_dup (path);
   if (!(msg->fp = safe_fopen (path, "w+"))) {
-    FREE (&cache->path);
+    mem_free (&cache->path);
     return -1;
   }
 
@@ -405,7 +396,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
             imap_error ("imap_fetch_message()", buf);
             goto bail;
           }
-          if (imap_read_literal (msg->fp, idata, bytes) < 0)
+          bar.size = bytes;
+          bar.msg = _("Fetching message...");
+#ifdef USE_SOCKET
+          mutt_progress_bar (&bar, 0);
+#endif
+          if (imap_read_literal (msg->fp, idata, bytes, &bar) < 0)
             goto bail;
           /* pick up trailing line */
           if ((rc = imap_cmd_step (idata)) != IMAP_CMD_CONTINUE)
@@ -430,6 +426,12 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
   /* see comment before command start. */
   h->active = 1;
 
+  fflush (msg->fp);
+  if (ferror (msg->fp)) {
+    mutt_perror (cache->path);
+    goto bail;
+  }
+
   if (rc != IMAP_CMD_OK)
     goto bail;
 
@@ -446,21 +448,8 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
    * picked up in mutt_read_rfc822_header, we mark the message (and context
    * changed). Another possiblity: ignore Status on IMAP?*/
   read = h->read;
-  /* I hate do this here, since it's so low-level, but I'm not sure where
-   * I can abstract it. Problem: the id and subj hashes lose their keys when
-   * mutt_free_envelope gets called, but keep their spots in the hash. This
-   * confuses threading. Alternatively we could try to merge the new
-   * envelope into the old one. Also messy and lowlevel. */
-  if (ctx->id_hash && h->env->message_id)
-    hash_delete (ctx->id_hash, h->env->message_id, h, NULL);
-  if (ctx->subj_hash && h->env->real_subj)
-    hash_delete (ctx->subj_hash, h->env->real_subj, h, NULL);
-  mutt_free_envelope (&h->env);
-  h->env = mutt_read_rfc822_header (msg->fp, h, 0, 0);
-  if (ctx->id_hash && h->env->message_id)
-    hash_insert (ctx->id_hash, h->env->message_id, h, 0);
-  if (ctx->subj_hash && h->env->real_subj)
-    hash_insert (ctx->subj_hash, h->env->real_subj, h, 1);
+  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. */
@@ -492,7 +481,7 @@ bail:
   safe_fclose (&msg->fp);
   if (cache->path) {
     unlink (cache->path);
-    FREE (&cache->path);
+    mem_free (&cache->path);
   }
 
   return -1;
@@ -509,6 +498,8 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
   int c, last;
   IMAP_MBOX mx;
   int rc;
+  progress_t bar;
+  size_t sent;
 
   idata = (IMAP_DATA *) ctx->data;
 
@@ -536,6 +527,12 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
   }
   rewind (fp);
 
+  bar.msg = _("Uploading message...");
+  bar.size = len;
+#ifdef USE_SOCKET
+  mutt_progress_bar (&bar, 0);
+#endif
+
   imap_munge_mbox_name (mbox, sizeof (mbox), mailbox);
   snprintf (buf, sizeof (buf), "APPEND %s (%s%s%s%s%s) {%lu}", mbox,
             msg->flags.read ? "\\Seen" : "",
@@ -565,16 +562,19 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
     goto fail;
   }
 
-  mutt_message _("Uploading message ...");
-
-  for (last = EOF, len = 0; (c = fgetc (fp)) != EOF; last = c) {
+  for (last = EOF, sent = len = 0; (c = fgetc (fp)) != EOF; last = c) {
     if (c == '\n' && last != '\r')
       buf[len++] = '\r';
 
     buf[len++] = c;
 
-    if (len > sizeof (buf) - 3)
+    if (len > sizeof (buf) - 3) {
+      sent += len;
       flush_buffer (buf, &len, idata->conn);
+#ifdef USE_SOCKET
+    mutt_progress_bar (&bar, sent);
+#endif
+    }
   }
 
   if (len)
@@ -599,11 +599,11 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
     goto fail;
   }
 
-  FREE (&mx.mbox);
+  mem_free (&mx.mbox);
   return 0;
 
 fail:
-  FREE (&mx.mbox);
+  mem_free (&mx.mbox);
   return -1;
 }
 
@@ -745,18 +745,18 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
   }
 
   if (cmd.data)
-    FREE (&cmd.data);
+    mem_free (&cmd.data);
   if (sync_cmd.data)
-    FREE (&sync_cmd.data);
-  FREE (&mx.mbox);
+    mem_free (&sync_cmd.data);
+  mem_free (&mx.mbox);
   return 0;
 
 fail:
   if (cmd.data)
-    FREE (&cmd.data);
+    mem_free (&cmd.data);
   if (sync_cmd.data)
-    FREE (&sync_cmd.data);
-  FREE (&mx.mbox);
+    mem_free (&sync_cmd.data);
+  mem_free (&mx.mbox);
   return -1;
 }
 
@@ -774,8 +774,8 @@ void imap_add_keywords (char *s, HEADER * h, LIST * mailbox_flags,
 
   while (keywords) {
     if (msg_has_flag (mailbox_flags, keywords->data)) {
-      safe_strcat (s, slen, keywords->data);
-      safe_strcat (s, slen, " ");
+      str_cat (s, slen, keywords->data);
+      str_cat (s, slen, " ");
     }
     keywords = keywords->next;
   }
@@ -787,7 +787,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));
 
-  FREE (data);
+  mem_free (data);
 }
 
 /* imap_set_flags: fill out the message header according to the flags from
@@ -799,11 +799,11 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s)
   unsigned char readonly;
 
   memset (&newh, 0, sizeof (newh));
-  newh.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+  newh.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
 
   debug_print (2, ("parsing FLAGS\n"));
   if ((s = msg_parse_flags (&newh, s)) == NULL) {
-    FREE (&newh.data);
+    mem_free (&newh.data);
     return NULL;
   }
 
@@ -829,7 +829,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;
-  FREE (&newh.data);
+  mem_free (&newh.data);
 
   return s;
 }
@@ -873,7 +873,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
     return rc;
 
   if (imap_get_literal_count (buf, &bytes) == 0) {
-    imap_read_literal (fp, idata, bytes);
+    imap_read_literal (fp, idata, bytes, NULL);
 
     /* we may have other fields of the FETCH _after_ the literal
      * (eg Domino puts FLAGS here). Nothing wrong with that, either.
@@ -898,7 +898,7 @@ static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
 #if USE_HCACHE
 static size_t imap_hcache_keylen (const char *fn)
 {
-  return safe_strlen (fn);
+  return str_len (fn);
 }
 
 /* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
@@ -954,7 +954,7 @@ static int msg_has_flag (LIST * flag_list, const char *flag)
 
   flag_list = flag_list->next;
   while (flag_list) {
-    if (!ascii_strncasecmp (flag_list->data, flag, safe_strlen (flag_list->data)))
+    if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data)))
       return 1;
 
     flag_list = flag_list->next;