X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmessage.c;h=bc75ed543cec8e6614260ed8aaa39189558ed493;hp=6e6314d2ff1aa82d57d2f4bb45372d8d25c6ac4a;hb=ea912b20ba2b3b9dfdbbae758ad56263c9aa41b3;hpb=bad8211c28d4b229878e0264012009493db48da5

diff --git a/imap/message.c b/imap/message.c
index 6e6314d..bc75ed5 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"
@@ -114,78 +117,79 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
   idata->newMailCount = 0;
 
 #if USE_HCACHE
-  hc = mutt_hcache_open (HeaderCache, ctx->path);
+  if ((hc = mutt_hcache_open (HeaderCache, ctx->path))) {
 
-  snprintf (buf, sizeof (buf),
-            "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
-  fetchlast = msgend + 1;
+    snprintf (buf, sizeof (buf),
+              "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
+    fetchlast = msgend + 1;
 
-  imap_cmd_start (idata, buf);
+    imap_cmd_start (idata, buf);
 
-  for (msgno = msgbegin; msgno <= msgend; msgno++) {
-    if (ReadInc && (!msgno || ((msgno + 1) % ReadInc == 0)))
-      mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
+    for (msgno = msgbegin; msgno <= msgend; msgno++) {
+      if (ReadInc && (!msgno || ((msgno + 1) % ReadInc == 0)))
+        mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1, msgend + 1);
 
-    rewind (fp);
-    memset (&h, 0, sizeof (h));
-    h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
-    do {
-      mfhrc = 0;
-
-      rc = imap_cmd_step (idata);
-      if (rc != IMAP_CMD_CONTINUE)
-        break;
+      rewind (fp);
+      memset (&h, 0, sizeof (h));
+      h.data = mem_calloc (1, sizeof (IMAP_HEADER_DATA));
+      do {
+        mfhrc = 0;
+
+        rc = imap_cmd_step (idata);
+        if (rc != IMAP_CMD_CONTINUE)
+          break;
+
+        if ((mfhrc =
+            msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
+          continue;
+        else if (mfhrc < 0)
+          break;
+
+        /* make sure we don't get remnants from older larger message headers */
+        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);
+
+        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;
+          ctx->hdrs[msgno]->read = h.read;
+          ctx->hdrs[msgno]->old = h.old;
+          ctx->hdrs[msgno]->deleted = h.deleted;
+          ctx->hdrs[msgno]->flagged = h.flagged;
+          ctx->hdrs[msgno]->replied = h.replied;
+          ctx->hdrs[msgno]->changed = h.changed;
+          /*  ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
+          ctx->hdrs[msgno]->data = (void *) (h.data);
+
+          ctx->msgcount++;
+        }
 
-      if ((mfhrc =
-           msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
-        continue;
-      else if (mfhrc < 0)
-        break;
+        rewind (fp);
 
-      /* make sure we don't get remnants from older larger message headers */
-      fputs ("\n\n", fp);
+        mem_free (&uid_validity);
 
-      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);
-
-      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;
-        ctx->hdrs[msgno]->read = h.read;
-        ctx->hdrs[msgno]->old = h.old;
-        ctx->hdrs[msgno]->deleted = h.deleted;
-        ctx->hdrs[msgno]->flagged = h.flagged;
-        ctx->hdrs[msgno]->replied = h.replied;
-        ctx->hdrs[msgno]->changed = h.changed;
-        /*  ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
-        ctx->hdrs[msgno]->data = (void *) (h.data);
-
-        ctx->msgcount++;
       }
+      while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
+                                    ((msgno + 1) >= fetchlast)));
 
-      rewind (fp);
-
-      FREE (&uid_validity);
-
+      if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
+        imap_free_header_data ((void **) &h.data);
+        fclose (fp);
+        mutt_hcache_close (hc);
+        return -1;
+      }
     }
-    while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
-                                   ((msgno + 1) >= fetchlast)));
 
-    if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK))) {
-      imap_free_header_data ((void **) &h.data);
-      fclose (fp);
-      mutt_hcache_close (hc);
-      return -1;
-    }
+    fetchlast = msgbegin;
   }
-
-  fetchlast = msgbegin;
 #endif /* USE_HCACHE */
 
   for (msgno = msgbegin; msgno <= msgend; msgno++) {
@@ -218,7 +222,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
@@ -278,7 +282,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);
 #if USE_HCACHE
       mutt_hcache_close (hc);
@@ -322,6 +326,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. */
@@ -340,7 +345,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
       return 0;
     else {
       unlink (cache->path);
-      FREE (&cache->path);
+      mem_free (&cache->path);
     }
   }
 
@@ -349,9 +354,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;
   }
 
@@ -392,7 +397,10 @@ 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...");
+          mutt_progress_bar (&bar, 0);
+          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)
@@ -456,7 +464,7 @@ int imap_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     fgets (buf, sizeof (buf), msg->fp);
   }
 
-  h->content->length = ftell (msg->fp) - h->content->offset;
+  h->content->length = ftello (msg->fp) - h->content->offset;
 
   /* This needs to be done in case this is a multipart message */
 #if defined(HAVE_PGP) || defined(HAVE_SMIME)
@@ -472,7 +480,7 @@ bail:
   safe_fclose (&msg->fp);
   if (cache->path) {
     unlink (cache->path);
-    FREE (&cache->path);
+    mem_free (&cache->path);
   }
 
   return -1;
@@ -489,6 +497,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;
 
@@ -516,6 +526,10 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
   }
   rewind (fp);
 
+  bar.msg = _("Uploading message...");
+  bar.size = len;
+  mutt_progress_bar (&bar, 0);
+
   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" : "",
@@ -545,16 +559,17 @@ 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);
+      mutt_progress_bar (&bar, sent);
+    }
   }
 
   if (len)
@@ -579,11 +594,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;
 }
 
@@ -725,18 +740,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;
 }
 
@@ -754,8 +769,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;
   }
@@ -767,7 +782,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
@@ -779,11 +794,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;
   }
 
@@ -809,7 +824,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;
 }
@@ -853,7 +868,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.
@@ -878,7 +893,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 mutt_strlen (fn);
+  return str_len (fn);
 }
 
 /* msg_fetch_header: import IMAP FETCH response into an IMAP_HEADER.
@@ -934,7 +949,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, mutt_strlen (flag_list->data)))
+    if (!ascii_strncasecmp (flag_list->data, flag, str_len (flag_list->data)))
       return 1;
 
     flag_list = flag_list->next;