X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=bd78ff737be56f5f1fc8b6cf41c650bde2208e92;hp=d7c2279f46f99914442c3bf5e949aa8c03382477;hb=242242233895b0e113ad8d78d81bfe0170773296;hpb=74a2265af51ce89bca845adc1d68f273c9933c13 diff --git a/compress.c b/compress.c index d7c2279..bd78ff7 100644 --- a/compress.c +++ b/compress.c @@ -7,23 +7,27 @@ * please see the file GPL in the top level source directory. */ -#include "mutt.h" - -#ifdef USE_COMPRESSED - -#include "mx.h" -#include "mailbox.h" -#include "mutt_curses.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" - #include #include #include #include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include "mutt.h" + +#include "mx.h" +#include "mbox.h" + typedef struct { const char *close; /* close-hook command */ const char *open; /* open-hook command */ @@ -112,7 +116,7 @@ static COMPRESS_INFO *set_compress_info (CONTEXT * ctx) COMPRESS_INFO *ci; /* Now lets uncompress this thing */ - ci = safe_malloc (sizeof (COMPRESS_INFO)); + ci = p_new(COMPRESS_INFO, 1); ctx->compressinfo = (void *) ci; ci->append = find_compress_hook (M_APPENDHOOK, ctx->path); ci->open = find_compress_hook (M_OPENHOOK, ctx->path); @@ -129,8 +133,7 @@ static void set_path (CONTEXT * ctx) /* Uncompress to /tmp */ mutt_mktemp (tmppath); - ctx->path = safe_malloc (mutt_strlen (tmppath) + 1); - strcpy (ctx->path, tmppath); + ctx->path = p_dupstr(tmppath, m_strlen(tmppath)); } static int get_size (const char *path) @@ -149,7 +152,7 @@ static void store_size (CONTEXT * ctx) ci->size = get_size (ctx->realpath); } -static const char *compresshook_format_str (char *dest, size_t destlen, +static const char *compresshook_format_str (char *dest, ssize_t destlen, char op, const char *src, const char *fmt, const char *ifstring, @@ -188,7 +191,7 @@ static char *get_compression_cmd (const char *cmd, const CONTEXT * ctx) mutt_FormatString (expanded, sizeof (expanded), cmd, compresshook_format_str, (unsigned long) ctx, 0); - return safe_strdup (expanded); + return m_strdup(expanded); } int mutt_check_mailbox_compressed (CONTEXT * ctx) @@ -196,8 +199,8 @@ int mutt_check_mailbox_compressed (CONTEXT * ctx) COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; if (ci->size != get_size (ctx->realpath)) { - FREE (&ctx->compressinfo); - FREE (&ctx->realpath); + p_delete(&ctx->compressinfo); + p_delete(&ctx->realpath); mutt_error _("Mailbox was corrupted!"); return (-1); @@ -215,7 +218,7 @@ int mutt_open_read_compressed (CONTEXT * ctx) if (!ci->open) { ctx->magic = 0; - FREE (ctx->compressinfo); + p_delete(&ctx->compressinfo); return (-1); } if (!ci->close || access (ctx->path, W_OK) != 0) @@ -230,11 +233,11 @@ int mutt_open_read_compressed (CONTEXT * ctx) cmd = get_compression_cmd (ci->open, ctx); if (cmd == NULL) return (-1); - dprint (2, (debugfile, "DecompressCmd: '%s'\n", cmd)); + debug_print (2, ("DecompressCmd: '%s'\n", cmd)); if ((fp = fopen (ctx->realpath, "r")) == NULL) { mutt_perror (ctx->realpath); - FREE (&cmd); + p_delete(&cmd); return (-1); } mutt_block_signals (); @@ -243,7 +246,7 @@ int mutt_open_read_compressed (CONTEXT * ctx) mutt_unblock_signals (); mutt_error _("Unable to lock mailbox!"); - FREE (&cmd); + p_delete(&cmd); return (-1); } @@ -259,11 +262,11 @@ int mutt_open_read_compressed (CONTEXT * ctx) if (rc) { mutt_any_key_to_continue (NULL); ctx->magic = 0; - FREE (ctx->compressinfo); + p_delete(&ctx->compressinfo); mutt_error (_("Error executing: %s : unable to open the mailbox!\n"), cmd); } - FREE (&cmd); + p_delete(&cmd); if (rc) return (-1); @@ -277,7 +280,7 @@ int mutt_open_read_compressed (CONTEXT * ctx) void restore_path (CONTEXT * ctx) { - FREE (&ctx->path); + p_delete(&ctx->path); ctx->path = ctx->realpath; } @@ -298,7 +301,7 @@ int mutt_open_append_compressed (CONTEXT * ctx) return (mutt_open_read_compressed (ctx)); ctx->magic = 0; - FREE (&ctx->compressinfo); + p_delete(&ctx->compressinfo); return (-1); } @@ -318,8 +321,7 @@ int mutt_open_append_compressed (CONTEXT * ctx) /* close a compressed mailbox */ void mutt_fast_close_compressed (CONTEXT * ctx) { - dprint (2, (debugfile, "mutt_fast_close_compressed called on '%s'\n", - ctx->path)); + debug_print (2, ("called on '%s'\n", ctx->path)); if (ctx->compressinfo) { if (ctx->fp) @@ -332,7 +334,7 @@ void mutt_fast_close_compressed (CONTEXT * ctx) remove_file (ctx); restore_path (ctx); - FREE (&ctx->compressinfo); + p_delete(&ctx->compressinfo); } } @@ -353,7 +355,7 @@ int mutt_sync_compressed (CONTEXT * ctx) if ((fp = fopen (ctx->realpath, "a")) == NULL) { mutt_perror (ctx->realpath); - FREE (&cmd); + p_delete(&cmd); return (-1); } mutt_block_signals (); @@ -364,11 +366,11 @@ int mutt_sync_compressed (CONTEXT * ctx) store_size (ctx); - FREE (&cmd); + p_delete(&cmd); return (-1); } - dprint (2, (debugfile, "CompressCommand: '%s'\n", cmd)); + debug_print (2, ("CompressCommand: '%s'\n", cmd)); endwin (); fflush (stdout); @@ -386,7 +388,7 @@ int mutt_sync_compressed (CONTEXT * ctx) mutt_unblock_signals (); fclose (fp); - FREE (&cmd); + p_delete(&cmd); store_size (ctx); @@ -400,8 +402,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) char *cmd; COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; - dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n", - ctx->path)); + debug_print (2, ("called on '%s'\n", ctx->path)); if (!(ctx->append && ((append = get_append_command (ctx->realpath, ctx)) || (append = ci->close)))) { /* if we can not or should not append, @@ -429,7 +430,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) if ((fp = fopen (ctx->realpath, "a")) == NULL) { mutt_perror (ctx->realpath); - FREE (&cmd); + p_delete(&cmd); return (-1); } mutt_block_signals (); @@ -438,11 +439,11 @@ int mutt_slow_close_compressed (CONTEXT * ctx) mutt_unblock_signals (); mutt_error _("Unable to lock mailbox!"); - FREE (&cmd); + p_delete(&cmd); return (-1); } - dprint (2, (debugfile, "CompressCmd: '%s'\n", cmd)); + debug_print (2, ("CompressCmd: '%s'\n", cmd)); endwin (); fflush (stdout); @@ -459,7 +460,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) mutt_error (_ (" %s: Error compressing mailbox! Uncompressed one kept!\n"), ctx->path); - FREE (&cmd); + p_delete(&cmd); mbox_unlock_compressed (ctx, fp); mutt_unblock_signals (); fclose (fp); @@ -471,10 +472,19 @@ int mutt_slow_close_compressed (CONTEXT * ctx) fclose (fp); remove_file (ctx); restore_path (ctx); - FREE (&cmd); - FREE (&ctx->compressinfo); + p_delete(&cmd); + p_delete(&ctx->compressinfo); return (0); } -#endif /* USE_COMPRESSED */ +mx_t* compress_reg_mx (void) { + mx_t* fmt = p_new(mx_t, 1); + fmt->type = M_COMPRESSED; + fmt->local = 1; + fmt->mx_is_magic = mbox_is_magic; + fmt->mx_check_empty = mbox_check_empty; + fmt->mx_access = access; + fmt->mx_open_mailbox = mutt_open_read_compressed; + return (fmt); +}