revamp lib.[hc] functions into lib-lib/file.[hc].

[apps/madmutt.git] / compress.c

diff --git a/compress.c b/compress.c
index b9e50ed..01be9d3 100644 (file)
--- a/compress.c
+++ b/compress.c
@@ -8,6 +8,9 @@
  */
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 
@@ -17,8 +20,6 @@
 #include "mbox.h"
 #include "mutt_curses.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -131,7 +132,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 +190,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)