Changeset 5034:f467353f5657 for pop.c

Timestamp:

2007-03-31 18:50:39 (22 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Add tmp flag to bcache_put, create bcache_commit.

Files:

• pop.c (modified) (5 diffs)

pop.c

@@ -429 +429 @@
 
 /* close POP mailbox */
-void pop_close_mailbox (CONTEXT *ctx)
+int pop_close_mailbox (CONTEXT *ctx)
 {
   POP_DATA *pop_data = (POP_DATA *)ctx->data;
 
   if (!pop_data)
-    return;
+    return 0;
 
   pop_logout (ctx);
@@ -451 +451 @@
   mutt_bcache_close (&pop_data->bcache);
 
-  return;
+  return 0;
 }
 
@@ -515 +515 @@
 
     /* see if we can put in body cache; use our cache as fallback */
-    if (!(msg->fp = mutt_bcache_put (pop_data->bcache, h->data)))
+    if (!(msg->fp = mutt_bcache_put (pop_data->bcache, h->data, 1)))
     {
       /* no */
@@ -539 +539 @@
      * the file in bcache or from POP's own cache since the next iteration
      * of the loop will re-attempt to put() the message */
-    if (bcache)
-      mutt_bcache_del (pop_data->bcache, h->data);
-    else
+    if (!bcache)
       unlink (path);
 
@@ -562 +560 @@
    * portion of the headers, those required for the main display.
    */
-  if (!bcache)
+  if (bcache)
+    mutt_bcache_commit (pop_data->bcache, h->data);
+  else
   {
     cache->index = h->index;