X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=456719af9bc67de44cb85dde0adbb7b787a27966;hp=18972548195566840360d601dfdbcd10e025c726;hb=dbacadf0ce81052365d7a43373ac7d4ac67ff91e;hpb=ee1d4d931ca3ebec494694b74a1868a7a2e631e3 diff --git a/compress.c b/compress.c index 1897254..456719a 100644 --- a/compress.c +++ b/compress.c @@ -7,22 +7,26 @@ * please see the file GPL in the top level source directory. */ -#include "mutt.h" - -#ifdef USE_COMPRESSED - -#include "mx.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 "mutt.h" + +#include "mx.h" +#include "mbox.h" + typedef struct { const char *close; /* close-hook command */ const char *open; /* open-hook command */ @@ -111,7 +115,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); @@ -128,8 +132,7 @@ static void set_path (CONTEXT * ctx) /* Uncompress to /tmp */ mutt_mktemp (tmppath); - ctx->path = safe_malloc (safe_strlen (tmppath) + 1); - strcpy (ctx->path, tmppath); + ctx->path = p_dupstr(tmppath, m_strlen(tmppath)); } static int get_size (const char *path) @@ -187,7 +190,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) @@ -195,8 +198,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); @@ -214,7 +217,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) @@ -229,11 +232,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 (); @@ -242,7 +245,7 @@ int mutt_open_read_compressed (CONTEXT * ctx) mutt_unblock_signals (); mutt_error _("Unable to lock mailbox!"); - FREE (&cmd); + p_delete(&cmd); return (-1); } @@ -258,11 +261,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); @@ -276,7 +279,7 @@ int mutt_open_read_compressed (CONTEXT * ctx) void restore_path (CONTEXT * ctx) { - FREE (&ctx->path); + p_delete(&ctx->path); ctx->path = ctx->realpath; } @@ -297,7 +300,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); } @@ -317,8 +320,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) @@ -331,7 +333,7 @@ void mutt_fast_close_compressed (CONTEXT * ctx) remove_file (ctx); restore_path (ctx); - FREE (&ctx->compressinfo); + p_delete(&ctx->compressinfo); } } @@ -352,7 +354,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 (); @@ -363,11 +365,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); @@ -385,7 +387,7 @@ int mutt_sync_compressed (CONTEXT * ctx) mutt_unblock_signals (); fclose (fp); - FREE (&cmd); + p_delete(&cmd); store_size (ctx); @@ -399,8 +401,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, @@ -428,7 +429,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 (); @@ -437,11 +438,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); @@ -458,7 +459,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); @@ -470,10 +471,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); +}