* please see the file GPL in the top level source directory.
*/
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
-#include "mutt.h"
+#include <lib-sys/mutt_signal.h>
+#include <lib-sys/unix.h>
+
+#include <lib-ui/curses.h>
-#ifdef USE_COMPRESSED
+#include "mutt.h"
#include "mx.h"
#include "mbox.h"
-#include "mutt_curses.h"
-
-#include "lib/str.h"
-#include "lib/debug.h"
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
+#include "compress.h"
typedef struct {
const char *close; /* close-hook command */
* excl - exclusive lock?
* retry - should retry if unable to lock?
*/
-int mbox_lock_compressed (CONTEXT * ctx, FILE * fp, int excl, int retry)
+static int mbox_lock_compressed (CONTEXT * ctx, FILE * fp, int excl, int retry)
{
int r;
return (r);
}
-void mbox_unlock_compressed (CONTEXT * ctx, FILE * fp)
+static void mbox_unlock_compressed (CONTEXT * ctx, FILE * fp)
{
if (ctx->locked) {
fflush (fp);
/* 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,
- const char *elsestring,
+ const char *ifstring __attribute__ ((unused)),
+ const char *elsestring __attribute__ ((unused)),
unsigned long data,
- format_flag flags)
+ format_flag flags __attribute__ ((unused)))
{
char tmp[SHORT_STRING];
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)
cmd = get_compression_cmd (ci->open, ctx);
if (cmd == NULL)
return (-1);
- debug_print (2, ("DecompressCmd: '%s'\n", cmd));
if ((fp = fopen (ctx->realpath, "r")) == NULL) {
mutt_perror (ctx->realpath);
return (0);
}
-void restore_path (CONTEXT * ctx)
+static void restore_path (CONTEXT * ctx)
{
p_delete(&ctx->path);
ctx->path = ctx->realpath;
}
/* remove the temporary mailbox */
-void remove_file (CONTEXT * ctx)
+static void remove_file (CONTEXT * ctx)
{
if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
remove (ctx->path);
/* close a compressed mailbox */
void mutt_fast_close_compressed (CONTEXT * ctx)
{
- debug_print (2, ("called on '%s'\n", ctx->path));
-
if (ctx->compressinfo) {
if (ctx->fp)
fclose (ctx->fp);
return (-1);
}
- debug_print (2, ("CompressCommand: '%s'\n", cmd));
-
endwin ();
fflush (stdout);
sprintf (echo_cmd, _("echo Compressing %s..."), ctx->realpath);
char *cmd;
COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo;
- debug_print (2, ("called on '%s'\n", ctx->path));
-
if (!(ctx->append && ((append = get_append_command (ctx->realpath, ctx))
|| (append = ci->close)))) { /* if we can not or should not append,
* we only have to remove the compressed info, because sync was already
return (-1);
}
- debug_print (2, ("CompressCmd: '%s'\n", cmd));
-
endwin ();
fflush (stdout);
fmt->mx_open_mailbox = mutt_open_read_compressed;
return (fmt);
}
-
-#endif /* USE_COMPRESSED */