# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/mapping.h>
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mx.h"
#include "mutt_menu.h"
-#include "mapping.h"
#include "sort.h"
#include "recvattach.h"
#include "buffy.h"
#include "mutt_sasl.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <ctype.h>
#define UNREAD(h) mutt_thread_contains_unread (Context, h)
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-extern const char *ReleaseDate;
extern size_t UngetCount;
void index_make_entry (char *s, size_t l, MUTTMENU * menu, int num)
/* save the list of new messages */
if (oldcount && check != M_REOPENED && ((Sort & SORT_MASK) == SORT_THREADS)) {
- save_new =
- (HEADER **) mem_malloc (sizeof (HEADER *) *
- (Context->msgcount - oldcount));
+ save_new = p_new(HEADER*, Context->msgcount - oldcount);
for (j = oldcount; j < Context->msgcount; j++)
save_new[j - oldcount] = Context->hdrs[j];
}
mutt_uncollapse_thread (Context, h);
}
}
- mem_free (&save_new);
+ p_delete(&save_new);
mutt_set_virtual (Context);
}
}
{N_("Reply"), OP_REPLY},
{N_("Group"), OP_GROUP_REPLY},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#ifdef USE_NNTP
{N_("Followup"), OP_FOLLOWUP},
{N_("Catchup"), OP_CATCHUP},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#endif
sidebar_set_current (Context->path);
}
- FOREVER {
+ for (;;) {
tag = 0; /* clear the tag-prefix */
menu->max = Context ? Context->vcount : 0;
if ((check = mx_check_mailbox (Context, &index_hint, 0)) < 0) {
if (!Context->path) {
/* fatal error occurred */
- mem_free (&Context);
+ p_delete(&Context);
menu->redraw = REDRAW_FULL;
}
set_option (OPTSEARCHINVALID);
break;
}
- strfcpy (buf, ref->data, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), ref->data);
}
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
if (!Context->id_hash)
Context->id_hash = mutt_make_id_hash (Context);
- strfcpy (buf, CURHDR->env->message_id, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
if (op == OP_RECONSTRUCT_THREAD) {
LIST *ref = CURHDR->env->references;
nntp_check_msgid (Context, ref->data);
/* the last msgid in References is the root message */
if (!ref->next)
- strfcpy (buf, ref->data, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), ref->data);
ref = ref->next;
}
}
set_option (OPTHIDEREAD);
}
else {
- strfcpy (buf, Context->pattern + 8, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), Context->pattern + 8);
if (!*buf || strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
- mem_free (&Context->pattern);
- Context->pattern = str_dup (buf);
+ p_delete(&Context->pattern);
+ Context->pattern = m_strdup(buf);
}
if ((op == OP_TOGGLE_READ && mutt_pattern_func (M_LIMIT, NULL) == 0) ||
mutt_pattern_func (M_LIMIT, _("Limit to messages matching: ")) == 0)
/* check for a fatal error, or all messages deleted */
if (!Context->path)
- mem_free (&Context);
+ p_delete(&Context);
/* if we were in the pager, redisplay the message */
if (menu->menu == MENU_PAGER) {
#endif
{
if (Context && Context->path)
- strncpy (buf, Context->path, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), Context->path);
if (op != OP_SIDEBAR_OPEN)
buffy_next (buf, sizeof (buf));
}
if (op == OP_SIDEBAR_OPEN) {
- strncpy (buf, NONULL(sidebar_get_current ()), sizeof (buf));
+ m_strcpy(buf, sizeof(buf), sidebar_get_current());
}
else if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) {
if (menu->menu == MENU_PAGER) {
menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
break;
}
- mem_free (&Context);
+ p_delete(&Context);
}
mutt_sleep (0);
{
if (Context) {
mx_fastclose_mailbox (Context);
- mem_free (&Context);
+ p_delete(&Context);
}
done = 1;
}
sleep (2);
}
else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
- str_casecmp (CURHDR->env->followup_to, "poster") ||
+ m_strcasecmp(CURHDR->env->followup_to, "poster") ||
query_quadoption (OPT_FOLLOWUPTOPOSTER,
_("Reply by mail as poster prefers?")) !=
M_YES) {