X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compress.c;h=bd78ff737be56f5f1fc8b6cf41c650bde2208e92;hp=47f50c5b7c489025110098defbb135861880bc41;hb=242242233895b0e113ad8d78d81bfe0170773296;hpb=b3cb6ed8d36c550a2e589910ce51bbc8352ff57c

diff --git a/compress.c b/compress.c
index 47f50c5..bd78ff7 100644
--- a/compress.c
+++ b/compress.c
@@ -7,25 +7,26 @@
  * please see the file GPL in the top level source directory.
  */
 
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/stat.h>
+
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
-#include "mutt.h"
+#include <lib-sys/mutt_signal.h>
+#include <lib-sys/unix.h>
 
-#ifdef USE_COMPRESSED
+#include <lib-ui/curses.h>
+
+#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 <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
 
 typedef struct {
   const char *close;            /* close-hook  command */
@@ -132,7 +133,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,7 +152,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,
@@ -190,7 +191,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)
@@ -487,5 +488,3 @@ mx_t* compress_reg_mx (void) {
   fmt->mx_open_mailbox = mutt_open_read_compressed;
   return (fmt);
 }
-
-#endif /* USE_COMPRESSED */