projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move debug.c
[apps/madmutt.git]
/
compress.c
diff --git
a/compress.c
b/compress.c
index
b9e50ed
..
fd8b97d
100644
(file)
--- a/
compress.c
+++ b/
compress.c
@@
-7,24
+7,23
@@
* please see the file GPL in the top level source directory.
*/
* 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/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-ui/curses.h>
-#i
fdef USE_COMPRESSED
+#i
nclude "mutt.h"
#include "mx.h"
#include "mbox.h"
#include "mx.h"
#include "mbox.h"
-#include "mutt_curses.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 */
typedef struct {
const char *close; /* close-hook command */
@@
-131,7
+130,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)
@@
-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);
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)
@@
-486,5
+485,3
@@
mx_t* compress_reg_mx (void) {
fmt->mx_open_mailbox = mutt_open_read_compressed;
return (fmt);
}
fmt->mx_open_mailbox = mutt_open_read_compressed;
return (fmt);
}
-
-#endif /* USE_COMPRESSED */