projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
no more SHORT_STRING's. begin some doc.
[apps/madmutt.git]
/
lib-mx
/
compress.c
diff --git
a/lib-mx/compress.c
b/lib-mx/compress.c
index
3770fef
..
e89d438
100644
(file)
--- a/
lib-mx/compress.c
+++ b/
lib-mx/compress.c
@@
-221,7
+221,7
@@
int mutt_open_read_compressed (CONTEXT * ctx)
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 0, 1) == -1) {
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 0, 1) == -1) {
-
fclose (
fp);
+
m_fclose(&
fp);
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
@@
-236,7
+236,7
@@
int mutt_open_read_compressed (CONTEXT * ctx)
rc = mutt_system (cmd);
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
rc = mutt_system (cmd);
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
-
fclose (
fp);
+
m_fclose(&
fp);
if (rc) {
mutt_any_key_to_continue (NULL);
if (rc) {
mutt_any_key_to_continue (NULL);
@@
-290,7
+290,7
@@
int mutt_open_append_compressed (CONTEXT * ctx)
if (!is_new (ctx->realpath))
if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
if ((fh = safe_fopen (ctx->path, "w")))
if (!is_new (ctx->realpath))
if (ctx->magic == M_MBOX || ctx->magic == M_MMDF)
if ((fh = safe_fopen (ctx->path, "w")))
-
fclose (
fh);
+
m_fclose(&
fh);
/* No error checking - the parent function will catch it */
return (0);
/* No error checking - the parent function will catch it */
return (0);
@@
-300,9
+300,8
@@
int mutt_open_append_compressed (CONTEXT * ctx)
void mutt_fast_close_compressed (CONTEXT * ctx)
{
if (ctx->cinfo) {
void mutt_fast_close_compressed (CONTEXT * ctx)
{
if (ctx->cinfo) {
- if (ctx->fp)
- fclose (ctx->fp);
- ctx->fp = NULL;
+ m_fclose(&ctx->fp);
+
/* if the folder was removed, remove the gzipped folder too */
if (access (ctx->path, F_OK) != 0 && !option (OPTSAVEEMPTY))
remove (ctx->realpath);
/* if the folder was removed, remove the gzipped folder too */
if (access (ctx->path, F_OK) != 0 && !option (OPTSAVEEMPTY))
remove (ctx->realpath);
@@
-335,7
+334,7
@@
int mutt_sync_compressed (CONTEXT * ctx)
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) {
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) {
-
fclose (
fp);
+
m_fclose(&
fp);
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
@@
-359,7
+358,7
@@
int mutt_sync_compressed (CONTEXT * ctx)
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
-
fclose (
fp);
+
m_fclose(&
fp);
p_delete(&cmd);
p_delete(&cmd);
@@
-383,9
+382,7
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
return (0);
}
return (0);
}
- if (ctx->fp)
- fclose (ctx->fp);
- ctx->fp = NULL;
+ m_fclose(&ctx->fp);
if (!ctx->quiet) {
if (append == ci->close)
if (!ctx->quiet) {
if (append == ci->close)
@@
-405,7
+402,7
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) {
}
mutt_block_signals ();
if (mbox_lock_compressed (ctx, fp, 1, 1) == -1) {
-
fclose (
fp);
+
m_fclose(&
fp);
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
mutt_unblock_signals ();
mutt_error _("Unable to lock mailbox!");
@@
-430,13
+427,13
@@
int mutt_slow_close_compressed (CONTEXT * ctx)
p_delete(&cmd);
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
p_delete(&cmd);
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
-
fclose (
fp);
+
m_fclose(&
fp);
return (-1);
}
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
return (-1);
}
mbox_unlock_compressed (ctx, fp);
mutt_unblock_signals ();
-
fclose (
fp);
+
m_fclose(&
fp);
remove_file (ctx);
restore_path (ctx);
p_delete(&cmd);
remove_file (ctx);
restore_path (ctx);
p_delete(&cmd);