X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=79ead4ef170de16eabad7f52c6d051a89dc3ebe1;hp=e49fdcddad57a165fb0ed2e4b85e7c81ca205f8b;hb=2743a22ef30aff197b866b9e3547ac429920f6d9;hpb=c3e57678c8be193fc137854020f3a90887be97c9

diff --git a/compress.c b/compress.c
index e49fdcd..79ead4e 100644
--- a/compress.c
+++ b/compress.c
@@ -12,9 +12,14 @@
 #ifdef USE_COMPRESSED
 
 #include "mx.h"
-#include "mailbox.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 <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -125,7 +130,7 @@ static void set_path (CONTEXT * ctx)
 
   /* Uncompress to /tmp */
   mutt_mktemp (tmppath);
-  ctx->path = safe_malloc (strlen (tmppath) + 1);
+  ctx->path = safe_malloc (safe_strlen (tmppath) + 1);
   strcpy (ctx->path, tmppath);
 }
 
@@ -226,7 +231,7 @@ 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);
@@ -314,8 +319,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)
@@ -364,7 +368,7 @@ int mutt_sync_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  dprint (2, (debugfile, "CompressCommand: '%s'\n", cmd));
+  debug_print (2, ("CompressCommand: '%s'\n", cmd));
 
   endwin ();
   fflush (stdout);
@@ -396,8 +400,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,
@@ -438,7 +441,7 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
     return (-1);
   }
 
-  dprint (2, (debugfile, "CompressCmd: '%s'\n", cmd));
+  debug_print (2, ("CompressCmd: '%s'\n", cmd));
 
   endwin ();
   fflush (stdout);
@@ -473,4 +476,15 @@ int mutt_slow_close_compressed (CONTEXT * ctx)
   return (0);
 }
 
+mx_t* compress_reg_mx (void) {
+  mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+  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);
+}
+
 #endif /* USE_COMPRESSED */