X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=6c801e8a117145c1da4e02ca426747ccfb2c0108;hp=622bbc5aec9265b6d8a11c2077e3b50d570fd89b;hb=5fc6c3e42b91af11aa1323f6cfde4d27bbea9ec8;hpb=8e037c67a88cb4680c4391134c578e3b55a80f8a diff --git a/compress.c b/compress.c index 622bbc5..6c801e8 100644 --- a/compress.c +++ b/compress.c @@ -7,25 +7,17 @@ * please see the file GPL in the top level source directory. */ -#include +#include -#include "mutt.h" +#include +#include + +#include -#ifdef USE_COMPRESSED +#include "mutt.h" #include "mx.h" #include "mbox.h" -#include "mutt_curses.h" - -#include "lib/mem.h" -#include "lib/intl.h" -#include "lib/str.h" -#include "lib/debug.h" - -#include -#include -#include -#include typedef struct { const char *close; /* close-hook command */ @@ -132,7 +124,7 @@ static void set_path (CONTEXT * ctx) /* Uncompress to /tmp */ mutt_mktemp (tmppath); - ctx->path = p_dupstr(tmppath, str_len(tmppath)); + ctx->path = p_dupstr(tmppath, m_strlen(tmppath)); } static int get_size (const char *path) @@ -151,13 +143,13 @@ 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, - const char *elsestring, + const char *ifstring __attribute__ ((unused)), + const char *elsestring __attribute__ ((unused)), unsigned long data, - format_flag flags) + format_flag flags __attribute__ ((unused))) { char tmp[SHORT_STRING]; @@ -190,7 +182,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 str_dup (expanded); + return m_strdup(expanded); } int mutt_check_mailbox_compressed (CONTEXT * ctx) @@ -232,7 +224,6 @@ int mutt_open_read_compressed (CONTEXT * ctx) cmd = get_compression_cmd (ci->open, ctx); if (cmd == NULL) return (-1); - debug_print (2, ("DecompressCmd: '%s'\n", cmd)); if ((fp = fopen (ctx->realpath, "r")) == NULL) { mutt_perror (ctx->realpath); @@ -320,8 +311,6 @@ int mutt_open_append_compressed (CONTEXT * ctx) /* close a compressed mailbox */ void mutt_fast_close_compressed (CONTEXT * ctx) { - debug_print (2, ("called on '%s'\n", ctx->path)); - if (ctx->compressinfo) { if (ctx->fp) fclose (ctx->fp); @@ -369,8 +358,6 @@ int mutt_sync_compressed (CONTEXT * ctx) return (-1); } - debug_print (2, ("CompressCommand: '%s'\n", cmd)); - endwin (); fflush (stdout); sprintf (echo_cmd, _("echo Compressing %s..."), ctx->realpath); @@ -401,8 +388,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx) char *cmd; COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo; - 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, * we only have to remove the compressed info, because sync was already @@ -442,8 +427,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx) return (-1); } - debug_print (2, ("CompressCmd: '%s'\n", cmd)); - endwin (); fflush (stdout); @@ -478,7 +461,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx) } mx_t* compress_reg_mx (void) { - mx_t* fmt = mem_calloc (1, sizeof (mx_t)); + mx_t* fmt = p_new(mx_t, 1); fmt->type = M_COMPRESSED; fmt->local = 1; fmt->mx_is_magic = mbox_is_magic; @@ -487,5 +470,3 @@ mx_t* compress_reg_mx (void) { fmt->mx_open_mailbox = mutt_open_read_compressed; return (fmt); } - -#endif /* USE_COMPRESSED */