X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=21b3c14cb05fb30e22200f54e4ada984afd9a664;hp=87d8e4fc0c3325cdd1d510172beb799709987f65;hb=a2a7836df164f0e198ad34dbc2f82baf7847fb94;hpb=3cb53df6efcb6b137bbab53c16da4eddbc5a1b2b diff --git a/compress.c b/compress.c index 87d8e4f..21b3c14 100644 --- a/compress.c +++ b/compress.c @@ -7,23 +7,25 @@ * please see the file GPL in the top level source directory. */ +#include +#include +#include +#include + #include #include #include #include +#include +#include + +#include + #include "mutt.h" #include "mx.h" #include "mbox.h" -#include "mutt_curses.h" - -#include "lib/debug.h" - -#include -#include -#include -#include typedef struct { const char *close; /* close-hook command */ @@ -149,7 +151,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, @@ -230,7 +232,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); @@ -318,8 +319,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); @@ -367,8 +366,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); @@ -399,8 +396,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 @@ -440,8 +435,6 @@ int mutt_slow_close_compressed (CONTEXT * ctx) return (-1); } - debug_print (2, ("CompressCmd: '%s'\n", cmd)); - endwin (); fflush (stdout);