* 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 */
/* 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)
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,
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)
}
mx_t* compress_reg_mx (void) {
- mx_t* fmt = mem_calloc (1, sizeof (mx_t));
+ mx_t* fmt = p_new(mx_t, 1);
fmt->type = M_COMPRESSED;
fmt->local = 1;
fmt->mx_is_magic = mbox_is_magic;
fmt->mx_open_mailbox = mutt_open_read_compressed;
return (fmt);
}
-
-#endif /* USE_COMPRESSED */