Move mbox close-append logic inside mbox_close_mailbox().

The mx_fastclose_mailbox() calls mx_ops->close(), which invokes
mbox_close_mailbox().

Also, close the ctx->fp inside mbox_close_mailbox().  This way, the
(to be added) compress logic can call the mx_ops->close() instead of
"knowing" to close the fp before recompressing.

mx_fastclose_mailbox() will safe_fclose() the fp again, but I'm
leaving it there just in case I missed a usage of the fp in some other
part of the code.

Thanks to Damien Riegel for the original patch.

diff --git a/mbox.c b/mbox.c
index d3c2ec46a7d8f8b55b85e3ee30cf2d7e60787ad7..13fc3d626df4e99d95999d78761b2b4b27cd3fda 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -465,6 +465,14 @@ static int mbox_open_mailbox_append (CONTEXT *ctx, int flags)
 
 static int mbox_close_mailbox (CONTEXT *ctx)
 {
+  if (ctx->append)
+  {
+    mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
+    mutt_unblock_signals ();
+  }
+
+  safe_fclose (&ctx->fp);
+
   return 0;
 }
 

diff --git a/mx.c b/mx.c
index 12d70d870e64ec2093b6654b5164e90d187f7bc2..2067d76c96c100c59dc76be605e7214cf874b6d5 100644 (file)
--- a/mx.c
+++ b/mx.c
@@ -593,15 +593,6 @@ static int mx_open_mailbox_append (CONTEXT *ctx, int flags)
   return ctx->mx_ops->open_append (ctx, flags);
 }
 
-/* close a mailbox opened in write-mode */
-static int mx_close_mailbox_append (CONTEXT *ctx)
-{
-  mx_unlock_file (ctx->path, fileno (ctx->fp), 1);
-  mutt_unblock_signals ();
-  mx_fastclose_mailbox (ctx);
-  return 0;
-}
-
 /*
  * open a mailbox and parse it
  *
@@ -896,23 +887,12 @@ int mx_close_mailbox (CONTEXT *ctx, int *index_hint)
 
   ctx->closing = 1;
 
-  if (ctx->readonly || ctx->dontwrite)
+  if (ctx->readonly || ctx->dontwrite || ctx->append)
   {
-    /* mailbox is readonly or we don't want to write */
     mx_fastclose_mailbox (ctx);
     return 0;
   }
 
-  if (ctx->append)
-  {
-    /* mailbox was opened in write-mode */
-    if (ctx->magic == MUTT_MBOX || ctx->magic == MUTT_MMDF)
-      mx_close_mailbox_append (ctx);
-    else
-      mx_fastclose_mailbox (ctx);
-    return 0;
-  }
-
 #ifdef USE_NNTP
   if (ctx->unread && ctx->magic == MUTT_NNTP)
   {