projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
compress.c
diff --git
a/compress.c
b/compress.c
index
b7439f6
..
a483b9e
100644
(file)
--- a/
compress.c
+++ b/
compress.c
@@
-18,6
+18,7
@@
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
#include "lib/mem.h"
#include "lib/intl.h"
#include "lib/str.h"
+#include "lib/debug.h"
#include <errno.h>
#include <string.h>
#include <errno.h>
#include <string.h>
@@
-129,7
+130,7
@@
static void set_path (CONTEXT * ctx)
/* Uncompress to /tmp */
mutt_mktemp (tmppath);
/* Uncompress to /tmp */
mutt_mktemp (tmppath);
- ctx->path = safe_malloc (s
afe_str
len (tmppath) + 1);
+ ctx->path = safe_malloc (s
tr_
len (tmppath) + 1);
strcpy (ctx->path, tmppath);
}
strcpy (ctx->path, tmppath);
}
@@
-188,7
+189,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 s
afe_str
dup (expanded);
+ return s
tr_
dup (expanded);
}
int mutt_check_mailbox_compressed (CONTEXT * ctx)
}
int mutt_check_mailbox_compressed (CONTEXT * ctx)
@@
-230,7
+231,7
@@
int mutt_open_read_compressed (CONTEXT * ctx)
cmd = get_compression_cmd (ci->open, ctx);
if (cmd == NULL)
return (-1);
cmd = get_compression_cmd (ci->open, ctx);
if (cmd == NULL)
return (-1);
- d
print (2, (debugfile,
"DecompressCmd: '%s'\n", cmd));
+ d
ebug_print (2, (
"DecompressCmd: '%s'\n", cmd));
if ((fp = fopen (ctx->realpath, "r")) == NULL) {
mutt_perror (ctx->realpath);
if ((fp = fopen (ctx->realpath, "r")) == NULL) {
mutt_perror (ctx->realpath);
@@
-318,8
+319,7
@@
int mutt_open_append_compressed (CONTEXT * ctx)
/* close a compressed mailbox */
void mutt_fast_close_compressed (CONTEXT * ctx)
{
/* close a compressed mailbox */
void mutt_fast_close_compressed (CONTEXT * ctx)
{
- dprint (2, (debugfile, "mutt_fast_close_compressed called on '%s'\n",
- ctx->path));
+ debug_print (2, ("called on '%s'\n", ctx->path));
if (ctx->compressinfo) {
if (ctx->fp)
if (ctx->compressinfo) {
if (ctx->fp)
@@
-368,7
+368,7
@@
int mutt_sync_compressed (CONTEXT * ctx)
return (-1);
}
return (-1);
}
- d
print (2, (debugfile,
"CompressCommand: '%s'\n", cmd));
+ d
ebug_print (2, (
"CompressCommand: '%s'\n", cmd));
endwin ();
fflush (stdout);
endwin ();
fflush (stdout);
@@
-400,8
+400,7
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
char *cmd;
COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo;
char *cmd;
COMPRESS_INFO *ci = (COMPRESS_INFO *) ctx->compressinfo;
- dprint (2, (debugfile, "mutt_slow_close_compressed called on '%s'\n",
- ctx->path));
+ 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,
if (!(ctx->append && ((append = get_append_command (ctx->realpath, ctx))
|| (append = ci->close)))) { /* if we can not or should not append,
@@
-442,7
+441,7
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
return (-1);
}
return (-1);
}
- d
print (2, (debugfile,
"CompressCmd: '%s'\n", cmd));
+ d
ebug_print (2, (
"CompressCmd: '%s'\n", cmd));
endwin ();
fflush (stdout);
endwin ();
fflush (stdout);