# include "config.h"
#endif
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
#include "mutt.h"
#include "enter.h"
#include "mutt_curses.h"
#include "nntp.h"
#endif
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <errno.h>
#include <string.h>
#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
#define W (COLS - HDR_XOFFSET - SW)
-static char *Prompts[] = {
+static const char *Prompts[] = {
"From: ",
"To: ",
"Cc: ",
{N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
{N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#ifdef USE_NNTP
{N_("Attach file"), OP_COMPOSE_ATTACH_FILE},
{N_("Descrip"), OP_COMPOSE_EDIT_DESCRIPTION},
{N_("Help"), OP_HELP},
- {NULL}
+ {NULL, OP_NULL}
};
#endif
-static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num)
-{
- mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt,
+static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) {
+ int w=(COLS-SW)>blen?blen:COLS-SW;
+ mutt_FormatString (b, w, NONULL (AttachFormat), mutt_attach_fmt,
(unsigned long) (((ATTACHPTR **) menu->data)[num]),
M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
}
-
-
#include "mutt_crypt.h"
static void redraw_crypt_lines (HEADER * msg)
static void redraw_mix_line (LIST * chain)
{
int c;
- char *t;
+ const char *t;
mvaddstr (HDR_MIX, SW, " Mix: ");
if (t && t[0] == '0' && t[1] == '\0')
t = "<random>";
- if (c + str_len (t) + 2 >= COLS - SW)
+ if (c + m_strlen(t) + 2 >= COLS - SW)
break;
addstr (NONULL (t));
if (chain->next)
addstr (", ");
- c += str_len (t) + 2;
+ c += m_strlen(t) + 2;
}
}
#endif /* MIXMASTER */
if (mutt_addrlist_to_idna (*addr, &err) != 0) {
mutt_error (_("Warning: '%s' is a bad IDN."), err);
mutt_refresh ();
- mem_free (&err);
+ p_delete(&err);
}
/* redraw the expanded list so the user can see the result */
idx[x]->content->next = NULL;
idx[x]->content->parts = NULL;
mutt_free_body (&(idx[x]->content));
- mem_free (&idx[x]->tree);
- mem_free (&idx[x]);
+ p_delete(&idx[x]->tree);
+ p_delete(&idx[x]);
for (; x < *idxlen - 1; x++)
idx[x] = idx[x + 1];
menu->max = --(*idxlen);
static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu,
const char *p)
{
- mutt_FormatString (buf, buflen, p, compose_format_str,
+ int w=(COLS-SW)>buflen?buflen:(COLS-SW);
+ mutt_FormatString (buf, w, p, compose_format_str,
(unsigned long) menu, 0);
}
ComposeHelp);
if (option (OPTMBOXPANE))
- buffy_check (1);
+ buffy_check (0);
while (loop) {
#ifdef USE_NNTP
unset_option (OPTNEWS); /* for any case */
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
- mem_free (&msg->env->newsgroups);
+ p_delete(&msg->env->newsgroups);
str_skip_trailws (buf);
- msg->env->newsgroups = str_dup (str_skip_initws (buf));
+ msg->env->newsgroups = m_strdup(str_skip_initws (buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
strfcpy (buf, msg->env->followup_to, sizeof (buf));
if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
- mem_free (&msg->env->followup_to);
+ p_delete(&msg->env->followup_to);
str_skip_trailws (buf);
- msg->env->followup_to = str_dup (str_skip_initws (buf));
+ msg->env->followup_to = m_strdup(str_skip_initws (buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
- mem_free (&msg->env->x_comment_to);
- msg->env->x_comment_to = str_dup (buf);
+ p_delete(&msg->env->x_comment_to);
+ msg->env->x_comment_to = m_strdup(buf);
move (HDR_BCC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->x_comment_to)
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_MESSAGE:
- if (Editor && (str_cmp ("builtin", Editor) != 0)
+ if (Editor && (m_strcmp("builtin", Editor) != 0)
&& !option (OPTEDITHDRS)) {
mutt_edit_file (Editor, msg->content->filename);
mutt_update_encoding (msg->content);
}
/* fall through */
case OP_COMPOSE_EDIT_HEADERS:
- if (str_cmp ("builtin", Editor) != 0 &&
+ if (m_strcmp("builtin", Editor) != 0 &&
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
- char *tag = NULL, *err = NULL;
+ const char *tag = NULL, *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
fcc, fcclen);
if (mutt_env_to_idna (msg->env, &tag, &err)) {
mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
- mem_free (&err);
+ p_delete(&err);
}
}
else {
/* attachments may have been added */
if (idxlen && idx[idxlen - 1]->content->next) {
for (i = 0; i < idxlen; i++)
- mem_free (&idx[i]);
+ p_delete(&idx[i]);
idxlen = 0;
idx =
mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0,
if (!(WithCrypto & APPLICATION_PGP))
break;
if (idxlen == idxmax) {
- mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+ p_realloc(&idx, idxmax += 5);
menu->data = idx;
}
- idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
+ idx[idxlen] = p_new(ATTACHPTR, 1);
if ((idx[idxlen]->content =
crypt_pgp_make_key_attachment (NULL)) != NULL) {
update_idx (menu, idx, idxlen++);
menu->redraw |= REDRAW_INDEX;
}
else
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]);
menu->redraw |= REDRAW_STATUS;
break;
if (idxlen + numfiles >= idxmax) {
- mem_realloc (&idx,
- sizeof (ATTACHPTR *) * (idxmax += 5 + numfiles));
+ p_realloc(&idx, idxmax += 5 + numfiles);
menu->data = idx;
}
for (i = 0; i < numfiles; i++) {
char *att = files[i];
- idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
+ idx[idxlen] = p_new(ATTACHPTR, 1);
idx[idxlen]->unowned = 1;
idx[idxlen]->content = mutt_make_file_attach (att);
if (idx[idxlen]->content != NULL)
else {
error = 1;
mutt_error (_("Unable to attach %s!"), att);
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]);
}
}
- mem_free (&files);
+ p_delete(&files);
if (!error)
mutt_clear_error ();
if (!ctx->msgcount) {
mx_close_mailbox (ctx, NULL);
- mem_free (&ctx);
+ p_delete(&ctx);
mutt_error _("No messages in that folder.");
break;
}
if (idxlen + Context->tagged >= idxmax) {
- mem_realloc (&idx,
- sizeof (ATTACHPTR *) * (idxmax +=
- 5 + Context->tagged));
+ p_realloc(&idx, idxmax += 5 + Context->tagged);
menu->data = idx;
}
for (i = 0; i < Context->msgcount; i++) {
h = Context->hdrs[i];
if (h->tagged) {
- idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
+ idx[idxlen] = p_new(ATTACHPTR, 1);
idx[idxlen]->content = mutt_make_message_attach (Context, h, 1);
if (idx[idxlen]->content != NULL)
update_idx (menu, idx, idxlen++);
else {
mutt_error _("Unable to attach!");
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]);
}
}
}
mx_close_mailbox (Context, NULL);
else
mx_fastclose_mailbox (Context);
- mem_free (&Context);
+ p_delete(&Context);
/* go back to the folder we started from */
Context = this;
continue;
}
if (idxlen == idxmax) {
- mem_realloc (&idx, sizeof (ATTACHPTR *) * (idxmax += 5));
+ p_realloc(&idx, idxmax += 5);
menu->data = idx;
}
- idx[idxlen] = (ATTACHPTR *) mem_calloc (1, sizeof (ATTACHPTR));
+ idx[idxlen] = p_new(ATTACHPTR, 1);
/* Touch the file */
if (!(fp = safe_fopen (fname, "w"))) {
mutt_error (_("Can't create file %s"), fname);
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]);
continue;
}
fclose (fp);
if (idx[idxlen]->unowned)
idx[idxlen]->content->unlink = 0;
mutt_free_body (&idx[idxlen]->content);
- mem_free (&idx[idxlen]->tree);
- mem_free (&idx[idxlen]);
+ p_delete(&idx[idxlen]->tree);
+ p_delete(&idx[idxlen]);
}
- mem_free (&idx);
+ p_delete(&idx);
idxlen = 0;
idxmax = 0;
r = -1;
compose_status_line (buf, sizeof (buf), menu, NONULL (ComposeFormat));
CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
SETCOLOR (MT_COLOR_STATUS);
- printw ("%-*.*s", COLS, COLS, buf);
+ move (option (OPTSTATUSONTOP) ? 0 : LINES - 2, SW);
+ printw ("%-*.*s", COLS-SW, COLS-SW, buf);
SETCOLOR (MT_COLOR_NORMAL);
menu->redraw &= ~REDRAW_STATUS;
}
msg->content = idx[0]->content;
for (i = 0; i < idxlen; i++) {
idx[i]->content->aptr = NULL;
- mem_free (&idx[i]);
+ p_delete(&idx[i]);
}
}
else
msg->content = NULL;
- mem_free (&idx);
+ p_delete(&idx);
return (r);
}