X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=87d8e4fc0c3325cdd1d510172beb799709987f65;hp=1dea35420b5526cf3376715c17ca870d2a91a448;hb=b934795055e8c16e6cb7c9687a4dce815cb300e6;hpb=9a1efcc01ddeca4106847f8eb28a704aca2dcf0b

diff --git a/compress.c b/compress.c
index 1dea354..87d8e4f 100644
--- a/compress.c
+++ b/compress.c
@@ -8,17 +8,16 @@
  */
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 
-#ifdef USE_COMPRESSED
-
 #include "mx.h"
 #include "mbox.h"
 #include "mutt_curses.h"
 
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -131,7 +130,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)
@@ -189,7 +188,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)
@@ -486,5 +485,3 @@ mx_t* compress_reg_mx (void) {
   fmt->mx_open_mailbox = mutt_open_read_compressed;
   return (fmt);
 }
-
-#endif /* USE_COMPRESSED */