Changeset 5034:f467353f5657

Timestamp:

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

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Add tmp flag to bcache_put, create bcache_commit.

Files:

• ChangeLog (modified) (1 diff)
• bcache.c (modified) (3 diffs)
• bcache.h (modified) (1 diff)
• imap/message.c (modified) (3 diffs)
• pop.c (modified) (5 diffs)
• pop.h (modified) (1 diff)

ChangeLog

@@ +1 @@
+2007-03-31 16:07 -0700  Brendan Cully  <brendan@kublai.com>  (bf208df92829)
+
+        * imap/command.c, imap/imap.c: Allow IMAP FCC to reconnect if
+        append fails (closes: #890)
+
+        * mh.c: Always set up data pointer in mh_read_dir, not just when
+        allocating context
+
 2007-03-30 21:26 -0700  Daniel Burrows  <dburrows@debian.org>  (d5ab883ef90a)
 

bcache.c

@@ -132 +132 @@
 }
 
-FILE* mutt_bcache_put(body_cache_t *bcache, const char *id)
+FILE* mutt_bcache_put(body_cache_t *bcache, const char *id, int tmp)
 {
   char path[_POSIX_PATH_MAX];
@@ -142 +142 @@
     return NULL;
 
-  path[0] = '\0';
-  safe_strncat (path, sizeof (path), bcache->path, bcache->pathlen);
-  safe_strncat (path, sizeof (path), id, mutt_strlen (id));
+  snprintf (path, sizeof (path), "%s%s%s", bcache->path, id,
+            tmp ? ".tmp" : "");
 
   s = strchr (path + 1, '/');
@@ -162 +161 @@
 }
 
+int mutt_bcache_commit(body_cache_t* bcache, const char* id)
+{
+  char tmpid[_POSIX_PATH_MAX];
+
+  snprintf (tmpid, sizeof (tmpid), "%s.tmp", id);
+
+  return mutt_bcache_move (bcache, tmpid, id);
+}
+
 int mutt_bcache_move(body_cache_t* bcache, const char* id, const char* newid)
 {

bcache.h

@@ -49 +49 @@
 
 FILE* mutt_bcache_get(body_cache_t *bcache, const char *id);
-FILE* mutt_bcache_put(body_cache_t *bcache, const char *id);
+/* tmp: the returned FILE* is in a temporary location.
+ *      if set, use mutt_bcache_commit to put it into place */
+FILE* mutt_bcache_put(body_cache_t *bcache, const char *id, int tmp);
+int mutt_bcache_commit(body_cache_t *bcache, const char *id);
 int mutt_bcache_move(body_cache_t *bcache, const char *id, const char *newid);
 int mutt_bcache_del(body_cache_t *bcache, const char *id);

imap/message.c

@@ -904 +904 @@
 
   idata->bcache = msg_cache_open (idata);
-  snprintf (id, sizeof (id), "%u-%u.tmp", idata->uid_validity, HEADER_DATA(h)->uid);
-  return mutt_bcache_put (idata->bcache, id);
+  snprintf (id, sizeof (id), "%u-%u", idata->uid_validity, HEADER_DATA(h)->uid);
+  return mutt_bcache_put (idata->bcache, id, 1);
 }
 
@@ -911 +911 @@
 {
   char id[_POSIX_PATH_MAX];
-  char newid[_POSIX_PATH_MAX];
 
   if (!idata || !h)
@@ -917 +916 @@
 
   idata->bcache = msg_cache_open (idata);
-  snprintf (id, sizeof (id), "%u-%u.tmp", idata->uid_validity, HEADER_DATA(h)->uid);
-  snprintf (newid, sizeof (newid), "%u-%u", idata->uid_validity, HEADER_DATA(h)->uid);
-
-  return mutt_bcache_move (idata->bcache, id, newid);
+  snprintf (id, sizeof (id), "%u-%u", idata->uid_validity, HEADER_DATA(h)->uid);
+
+  return mutt_bcache_commit (idata->bcache, id);
 }
 

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;

pop.h

@@ -110 +110 @@
 int pop_sync_mailbox (CONTEXT *, int *);
 int pop_fetch_message (MESSAGE *, CONTEXT *, int);
-void pop_close_mailbox (CONTEXT *);
+int pop_close_mailbox (CONTEXT *);
 void pop_fetch_mail (void);