From 4ae8a1cc8774304f68448e76bfbc75af82e3c1df Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kevin@8t8.us>
Date: Sun, 13 Nov 2016 20:02:34 -0800
Subject: [PATCH] Compress: add delegate calls to open_append and close mx_ops
functions.
The open_append and close were partially duplicating mbox open_append
and close operations internally. Change it to call the actual
delegate functions instead.
Inline the open_read() function inside open_mailbox(). Having it
split improved nothing and just complicated the code (i.e. added
error-handling checks in open_mailbox() that in reality could not
fail).
---
compress.c | 88 +++++++++++++-----------------------------------------
1 file changed, 20 insertions(+), 68 deletions(-)
diff --git a/compress.c b/compress.c
index 8c22539d3..0e647cbf0 100644
--- a/compress.c
+++ b/compress.c
@@ -402,29 +402,23 @@ cleanup:
}
/**
- * open_read - Open a compressed mailbox for reading
+ * open_mailbox - Open a compressed mailbox
* @ctx: Mailbox to open
*
+ * Set up a compressed mailbox to be read.
* Decompress the mailbox and set up the paths and hooks needed.
- *
- * Note: The message handling will be delegated to the mbox code.
- *
- * Returns:
- * 1: Success
- * 0: Failure
+ * Then determine the type of the mailbox so we can delegate the handling of
+ * messages.
*/
static int
-open_read (CONTEXT *ctx)
+open_mailbox (CONTEXT *ctx)
{
- if (!ctx)
- return 0;
+ if (!ctx || (ctx->magic != MUTT_COMPRESSED))
+ return -1;
COMPRESS_INFO *ci = set_compress_info (ctx);
if (!ci)
- {
- ctx->magic = 0;
- return 0;
- }
+ return -1;
/* If there's no close-hook, or the file isn't writable */
if (!ci->close || (access (ctx->path, W_OK) != 0))
@@ -435,9 +429,7 @@ open_read (CONTEXT *ctx)
int rc = execute_command (ctx, ci->open, 0, _("Decompressing %s"));
if (rc == 0)
- {
goto or_fail;
- }
ctx->magic = mx_get_magic (ctx->path);
if (ctx->magic == 0)
@@ -453,44 +445,13 @@ open_read (CONTEXT *ctx)
goto or_fail;
}
- return 1;
+ return ci->child_ops->open (ctx);
or_fail:
/* remove the partial uncompressed file */
remove (ctx->path);
mutt_free_compress_info (ctx);
- return 0;
-}
-
-
-/**
- * open_mailbox - Open a compressed mailbox
- * @ctx: Mailbox to open
- *
- * Set up a compressed mailbox to be read.
- * First call open_read() to decompress the file.
- * Then determine the type of the mailbox so we can delegate the handling of
- * messages.
- */
-static int
-open_mailbox (CONTEXT *ctx)
-{
- if (!ctx || (ctx->magic != MUTT_COMPRESSED))
- return 1;
-
- if (!open_read (ctx))
- return 1;
-
- COMPRESS_INFO *ci = ctx->compress_info;
- if (!ci)
- return 1;
-
- struct mx_ops *ops = ci->child_ops;
- if (!ops)
- return 1;
-
- /* Delegate */
- return ops->open (ctx);
+ return -1;
}
/**
@@ -538,33 +499,20 @@ open_append_mailbox (CONTEXT *ctx, int flags)
goto oa_fail2;
}
- if (ci->append || (access (ctx->realpath, F_OK) != 0))
- {
- /* Create an empty temporary file */
- ctx->fp = safe_fopen (ctx->path, "w");
- if (!ctx->fp)
- {
- mutt_perror (ctx->path);
- goto oa_fail2;
- }
- }
- else
+ /* Open the existing mailbox, unless we are appending */
+ if (!ci->append && (access (ctx->realpath, F_OK) == 0))
{
- /* Open the existing mailbox */
int rc = execute_command (ctx, ci->open, 0, _("Decompressing %s"));
if (rc == 0)
{
mutt_error (_("Compress command failed: %s"), ci->open);
goto oa_fail2;
}
- ctx->fp = safe_fopen (ctx->path, "a");
- if (!ctx->fp)
- {
- mutt_perror (ctx->path);
- goto oa_fail2;
- }
}
+ if (ci->child_ops->open_append (ctx, flags) != 0)
+ goto oa_fail2;
+
return 0;
oa_fail2:
@@ -598,7 +546,11 @@ close_mailbox (CONTEXT *ctx)
if (!ci)
return -1;
- safe_fclose (&ctx->fp);
+ struct mx_ops *ops = ci->child_ops;
+ if (!ops)
+ return -1;
+
+ ops->close (ctx);
/* sync has already been called, so we only need to delete some files */
if (!ctx->append)
--
2.40.0