Changeset 5020:034ad0e55397 for imap

Timestamp:

2007-03-29 10:30:15 (20 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

default

Message:

Make message cache write to temporary location until file is complete.
Previously mutt trusted the cache file even when it was incomplete,
causing permanently incorrect message display if the fetch was
interrupted for some reason.

Files:

• imap/message.c (modified) (3 diffs)

imap/message.c

@@ -46 +46 @@
 static FILE* msg_cache_get (IMAP_DATA* idata, HEADER* h);
 static FILE* msg_cache_put (IMAP_DATA* idata, HEADER* h);
+static int msg_cache_commit (IMAP_DATA* idata, HEADER* h);
 
 static void flush_buffer(char* buf, size_t* len, CONNECTION* conn);
@@ -501 +502 @@
     goto bail;
 
-parsemsg:
+  msg_cache_commit (idata, h);
+
+  parsemsg:
   /* Update the header information.  Previously, we only downloaded a
    * portion of the headers, those required for the main display.
@@ -901 +904 @@
 
   idata->bcache = msg_cache_open (idata);
-  snprintf (id, sizeof (id), "%u-%u", idata->uid_validity, HEADER_DATA(h)->uid);
+  snprintf (id, sizeof (id), "%u-%u.tmp", idata->uid_validity, HEADER_DATA(h)->uid);
   return mutt_bcache_put (idata->bcache, id);
+}
+
+static int msg_cache_commit (IMAP_DATA* idata, HEADER* h)
+{
+  char id[_POSIX_PATH_MAX];
+  char newid[_POSIX_PATH_MAX];
+
+  if (!idata || !h)
+    return -1;
+
+  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);
 }