projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use safer p_clear when possible.
[apps/madmutt.git]
/
mx.c
diff --git
a/mx.c
b/mx.c
index
de22737
..
cf924ca
100644
(file)
--- a/
mx.c
+++ b/
mx.c
@@
-12,9
+12,13
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "buffy.h"
#include "mutt.h"
#include "buffy.h"
-#include "ascii.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
#include "mx.h"
#include "mbox.h"
#include "mh.h"
@@
-51,9
+55,6
@@
#include "mutt_crypt.h"
#include "mutt_crypt.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/list.h"
#include "lib/debug.h"
#include "lib/list.h"
#include "lib/debug.h"
@@
-192,7
+193,7
@@
int mx_lock_file (const char *path, int fd, int excl, int dot, int timeout)
struct flock lck;
struct flock lck;
-
memset (&lck, 0, sizeof (struct flock)
);
+
p_clear(&lck, 1
);
lck.l_type = excl ? F_WRLCK : F_RDLCK;
lck.l_whence = SEEK_SET;
lck.l_type = excl ? F_WRLCK : F_RDLCK;
lck.l_whence = SEEK_SET;
@@
-291,9
+292,9
@@
int mx_lock_file (const char *path, int fd, int excl, int dot, int timeout)
int mx_unlock_file (const char *path, int fd, int dot)
{
#ifdef USE_FCNTL
int mx_unlock_file (const char *path, int fd, int dot)
{
#ifdef USE_FCNTL
- struct flock unlockit
= { F_UNLCK, 0, 0, 0 }
;
+ struct flock unlockit;
-
memset (&unlockit, 0, sizeof (struct flock)
);
+
p_clear(&unlockit, 1
);
unlockit.l_type = F_UNLCK;
unlockit.l_whence = SEEK_SET;
fcntl (fd, F_SETLK, &unlockit);
unlockit.l_type = F_UNLCK;
unlockit.l_whence = SEEK_SET;
fcntl (fd, F_SETLK, &unlockit);
@@
-342,7
+343,7
@@
void mx_unlink_empty (const char *path)
int mx_get_magic (const char *path) {
int i = 0;
int mx_get_magic (const char *path) {
int i = 0;
- if (
str_len
(path) == 0)
+ if (
m_strlen
(path) == 0)
return (-1);
if ((i = mx_get_idx (path)) >= 0)
return (MX_COMMAND(i,type));
return (-1);
if ((i = mx_get_idx (path)) >= 0)
return (MX_COMMAND(i,type));
@@
-518,9
+519,9
@@
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
int rc;
if (!ctx)
int rc;
if (!ctx)
- ctx =
mem_malloc (sizeof (CONTEXT)
);
-
memset (ctx, 0, sizeof (CONTEXT)
);
- ctx->path =
str_dup
(path);
+ ctx =
p_new(CONTEXT, 1
);
+
p_clear(ctx, 1
);
+ ctx->path =
m_strdup
(path);
ctx->msgnotreadyet = -1;
ctx->collapsed = 0;
ctx->msgnotreadyet = -1;
ctx->collapsed = 0;
@@
-536,7
+537,7
@@
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
if (mx_open_mailbox_append (ctx, flags) != 0) {
mx_fastclose_mailbox (ctx);
if (!pctx)
if (mx_open_mailbox_append (ctx, flags) != 0) {
mx_fastclose_mailbox (ctx);
if (!pctx)
-
mem_free
(&ctx);
+
p_delete
(&ctx);
return NULL;
}
return ctx;
return NULL;
}
return ctx;
@@
-559,7
+560,7
@@
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
if (ctx->magic <= 0) {
mx_fastclose_mailbox (ctx);
if (!pctx)
if (ctx->magic <= 0) {
mx_fastclose_mailbox (ctx);
if (!pctx)
-
mem_free
(&ctx);
+
p_delete
(&ctx);
return (NULL);
}
return (NULL);
}
@@
-589,7
+590,7
@@
CONTEXT *mx_open_mailbox (const char *path, int flags, CONTEXT * pctx)
else {
mx_fastclose_mailbox (ctx);
if (!pctx)
else {
mx_fastclose_mailbox (ctx);
if (!pctx)
-
mem_free
(&ctx);
+
p_delete
(&ctx);
}
unset_option (OPTFORCEREFRESH);
}
unset_option (OPTFORCEREFRESH);
@@
-613,18
+614,18
@@
void mx_fastclose_mailbox (CONTEXT * ctx)
mutt_clear_threads (ctx);
for (i = 0; i < ctx->msgcount; i++)
mutt_free_header (&ctx->hdrs[i]);
mutt_clear_threads (ctx);
for (i = 0; i < ctx->msgcount; i++)
mutt_free_header (&ctx->hdrs[i]);
-
mem_free
(&ctx->hdrs);
-
mem_free
(&ctx->v2r);
+
p_delete
(&ctx->hdrs);
+
p_delete
(&ctx->v2r);
#ifdef USE_COMPRESSED
if (ctx->compressinfo)
mutt_fast_close_compressed (ctx);
#endif
#ifdef USE_COMPRESSED
if (ctx->compressinfo)
mutt_fast_close_compressed (ctx);
#endif
-
mem_free
(&ctx->path);
-
mem_free
(&ctx->pattern);
+
p_delete
(&ctx->path);
+
p_delete
(&ctx->pattern);
if (ctx->limit_pattern)
mutt_pattern_free (&ctx->limit_pattern);
safe_fclose (&ctx->fp);
if (ctx->limit_pattern)
mutt_pattern_free (&ctx->limit_pattern);
safe_fclose (&ctx->fp);
-
memset (ctx, 0, sizeof (CONTEXT)
);
+
p_clear(ctx, 1
);
}
/* save changes to disk */
}
/* save changes to disk */
@@
-1128,7
+1129,7
@@
MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
return (NULL);
}
return (NULL);
}
- msg =
mem_calloc (1, sizeof (MESSAGE)
);
+ msg =
p_new(MESSAGE, 1
);
msg->magic = dest->magic;
msg->write = 1;
msg->magic = dest->magic;
msg->write = 1;
@@
-1161,7
+1162,7
@@
MESSAGE *mx_open_new_message (CONTEXT * dest, HEADER * hdr, int flags)
}
}
else
}
}
else
-
mem_free
(&msg);
+
p_delete
(&msg);
return msg;
}
return msg;
}
@@
-1190,7
+1191,7
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
{
MESSAGE *msg;
{
MESSAGE *msg;
- msg =
mem_calloc (1, sizeof (MESSAGE)
);
+ msg =
p_new(MESSAGE, 1
);
switch (msg->magic = ctx->magic) {
case M_MBOX:
case M_MMDF:
switch (msg->magic = ctx->magic) {
case M_MBOX:
case M_MMDF:
@@
-1212,7
+1213,7
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
if (msg->fp == NULL) {
mutt_perror (path);
debug_print (1, ("fopen: %s: %s (errno %d).\n", path, strerror (errno), errno));
if (msg->fp == NULL) {
mutt_perror (path);
debug_print (1, ("fopen: %s: %s (errno %d).\n", path, strerror (errno), errno));
-
mem_free
(&msg);
+
p_delete
(&msg);
}
}
break;
}
}
break;
@@
-1221,7
+1222,7
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
case M_IMAP:
{
if (imap_fetch_message (msg, ctx, msgno) != 0)
case M_IMAP:
{
if (imap_fetch_message (msg, ctx, msgno) != 0)
-
mem_free
(&msg);
+
p_delete
(&msg);
break;
}
#endif /* USE_IMAP */
break;
}
#endif /* USE_IMAP */
@@
-1230,7
+1231,7
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
case M_POP:
{
if (pop_fetch_message (msg, ctx, msgno) != 0)
case M_POP:
{
if (pop_fetch_message (msg, ctx, msgno) != 0)
-
mem_free
(&msg);
+
p_delete
(&msg);
break;
}
#endif /* USE_POP */
break;
}
#endif /* USE_POP */
@@
-1239,14
+1240,14
@@
MESSAGE *mx_open_message (CONTEXT * ctx, int msgno)
case M_NNTP:
{
if (nntp_fetch_message (msg, ctx, msgno) != 0)
case M_NNTP:
{
if (nntp_fetch_message (msg, ctx, msgno) != 0)
-
mem_free
(&msg);
+
p_delete
(&msg);
break;
}
#endif /* USE_NNTP */
default:
debug_print (1, ("function not implemented for mailbox type %d.\n", ctx->magic));
break;
}
#endif /* USE_NNTP */
default:
debug_print (1, ("function not implemented for mailbox type %d.\n", ctx->magic));
-
mem_free
(&msg);
+
p_delete
(&msg);
break;
}
return (msg);
break;
}
return (msg);
@@
-1288,10
+1289,10
@@
int mx_close_message (MESSAGE ** msg)
if ((*msg)->path) {
debug_print (1, ("unlinking %s\n", (*msg)->path));
unlink ((*msg)->path);
if ((*msg)->path) {
debug_print (1, ("unlinking %s\n", (*msg)->path));
unlink ((*msg)->path);
-
mem_free
(&(*msg)->path);
+
p_delete
(&(*msg)->path);
}
}
-
mem_free
(msg);
+
p_delete
(msg);
return (r);
}
return (r);
}
@@
-1308,12
+1309,12
@@
void mx_alloc_memory (CONTEXT * ctx)
}
if (ctx->hdrs) {
}
if (ctx->hdrs) {
-
mem_realloc (&ctx->hdrs, sizeof (HEADER *) * (ctx->hdrmax += 25)
);
-
mem_realloc (&ctx->v2r, sizeof (int) *
ctx->hdrmax);
+
p_realloc(&ctx->hdrs, ctx->hdrmax += 25
);
+
p_realloc(&ctx->v2r,
ctx->hdrmax);
}
else {
}
else {
- ctx->hdrs =
mem_calloc ((ctx->hdrmax += 25), sizeof (HEADER *
));
- ctx->v2r =
mem_calloc (ctx->hdrmax, sizeof (int)
);
+ ctx->hdrs =
p_new(HEADER *, (ctx->hdrmax += 25
));
+ ctx->v2r =
p_new(int, ctx->hdrmax
);
}
for (i = ctx->msgcount; i < ctx->hdrmax; i++) {
ctx->hdrs[i] = NULL;
}
for (i = ctx->msgcount; i < ctx->hdrmax; i++) {
ctx->hdrs[i] = NULL;
@@
-1353,7
+1354,7
@@
void mx_update_context (CONTEXT * ctx, int new_messages)
h2 = hash_find (ctx->id_hash, h->env->supersedes);
h2 = hash_find (ctx->id_hash, h->env->supersedes);
- /*
mem_free
(&h->env->supersedes); should I ? */
+ /*
p_delete
(&h->env->supersedes); should I ? */
if (h2) {
h2->superseded = 1;
if (!ctx->counting && option (OPTSCORE))
if (h2) {
h2->superseded = 1;
if (!ctx->counting && option (OPTSCORE))
@@
-1468,6
+1469,8
@@
int mx_rebuild_cache (void) {
#endif
)
continue;
#endif
)
continue;
+ sidebar_set_current (b->path);
+ sidebar_draw (CurrentMenu);
if ((ctx = mx_open_mailbox (b->path,
M_READONLY | M_NOSORT | M_COUNT,
NULL)) != NULL)
if ((ctx = mx_open_mailbox (b->path,
M_READONLY | M_NOSORT | M_COUNT,
NULL)) != NULL)
@@
-1475,6
+1478,10
@@
int mx_rebuild_cache (void) {
}
mutt_clear_error ();
}
mutt_clear_error ();
+ if (Context && Context->path)
+ sidebar_set_current (Context->path);
+ sidebar_draw (CurrentMenu);
+
return (0);
#endif
}
return (0);
#endif
}