projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small leftovers
[apps/madmutt.git]
/
compress.c
diff --git
a/compress.c
b/compress.c
index
622bbc5
..
01be9d3
100644
(file)
--- a/
compress.c
+++ b/
compress.c
@@
-8,6
+8,9
@@
*/
#include <lib-lib/mem.h>
*/
#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
#include "mutt.h"
@@
-17,9
+20,6
@@
#include "mbox.h"
#include "mutt_curses.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 "lib/debug.h"
#include <errno.h>
@@
-132,7
+132,7
@@
static void set_path (CONTEXT * ctx)
/* Uncompress to /tmp */
mutt_mktemp (tmppath);
/* Uncompress to /tmp */
mutt_mktemp (tmppath);
- ctx->path = p_dupstr(tmppath,
str_
len(tmppath));
+ ctx->path = p_dupstr(tmppath,
m_str
len(tmppath));
}
static int get_size (const char *path)
}
static int get_size (const char *path)
@@
-190,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);
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)
}
int mutt_check_mailbox_compressed (CONTEXT * ctx)
@@
-478,7
+478,7
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
}
mx_t* compress_reg_mx (void) {
}
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->type = M_COMPRESSED;
fmt->local = 1;
fmt->mx_is_magic = mbox_is_magic;