#include <lib-lib/str.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-lib/mapping.h>
+
+#include <lib-mime/mime.h>
#include "mutt.h"
#include "enter.h"
#include "mutt_idna.h"
#include "mutt_menu.h"
#include "rfc1524.h"
-#include "mime.h"
#include "attach.h"
#include "recvattach.h"
-#include "mapping.h"
#include "sort.h"
#include "charset.h"
#include "mx.h"
};
#endif
-static void snd_entry (char *b, size_t blen, MUTTMENU * menu, int num) {
+
+static void snd_entry (char *b, ssize_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]),
char pretty[_POSIX_PATH_MAX], msg[_POSIX_PATH_MAX + SHORT_STRING];
for (i = 0; i < idxlen; i++) {
- strfcpy (pretty, idx[i]->content->filename, sizeof (pretty));
+ m_strcpy(pretty, sizeof(pretty), idx[i]->content->filename);
if (stat (idx[i]->content->filename, &st) != 0) {
mutt_pretty_mailbox (pretty);
mutt_error (_("%s [#%d] no longer exists!"), pretty, i + 1);
return 0;
}
-static void draw_envelope_addr (int line, ADDRESS * addr)
+static void draw_envelope_addr (int line, address_t * addr)
{
char buf[STRING];
SETCOLOR (MT_COLOR_NORMAL);
}
-static int edit_address_list (int line, ADDRESS ** addr)
+static int edit_address_list (int line, address_t ** addr)
{
char buf[HUGE_STRING] = ""; /* needs to be large for alias expansion */
char *err = NULL;
mutt_addrlist_to_local (*addr);
rfc822_write_address (buf, sizeof (buf), *addr, 0);
if (mutt_get_field (Prompts[line - 1], buf, sizeof (buf), M_ALIAS) == 0) {
- rfc822_free_address (addr);
+ address_delete (addr);
*addr = mutt_parse_adrlist (*addr, buf);
*addr = mutt_expand_aliases (*addr);
}
break;
case 'v':
- strncpy (buf, mutt_make_version (0), buflen);
+ m_strcpy(buf, buflen, mutt_make_version (0));
break;
case 0:
return (src);
}
-static void compose_status_line (char *buf, size_t buflen, MUTTMENU * menu,
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
int w=(COLS-SW)>buflen?buflen:(COLS-SW);
ATTACHPTR **idx = NULL;
short idxlen = 0;
short idxmax = 0;
- int i, close = 0;
+ int i, closed = 0;
int r = -1; /* return value */
int op = 0;
int loop = 1;
case OP_COMPOSE_EDIT_NEWSGROUPS:
if (news) {
if (msg->env->newsgroups)
- strfcpy (buf, msg->env->newsgroups, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), msg->env->newsgroups);
else
buf[0] = 0;
if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->newsgroups);
str_skip_trailws (buf);
- msg->env->newsgroups = m_strdup(str_skip_initws (buf));
+ msg->env->newsgroups = m_strdup(vskipspaces(buf));
move (HDR_TO, HDR_XOFFSET);
clrtoeol ();
if (msg->env->newsgroups)
if (news) {
buf[0] = 0;
if (msg->env->followup_to)
- strfcpy (buf, msg->env->followup_to, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), msg->env->followup_to);
if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->followup_to);
str_skip_trailws (buf);
- msg->env->followup_to = m_strdup(str_skip_initws (buf));
+ msg->env->followup_to = m_strdup(vskipspaces(buf));
move (HDR_CC, HDR_XOFFSET);
clrtoeol ();
if (msg->env->followup_to)
if (news && option (OPTXCOMMENTTO)) {
buf[0] = 0;
if (msg->env->x_comment_to)
- strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
&& buf[0]) {
p_delete(&msg->env->x_comment_to);
#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)
- strfcpy (buf, msg->env->subject, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), msg->env->subject);
else
buf[0] = 0;
if (mutt_get_field ("Subject: ", buf, sizeof (buf), 0) == 0) {
- str_replace (&msg->env->subject, buf);
+ m_strreplace(&msg->env->subject, buf);
move (HDR_SUBJECT, HDR_XOFFSET + SW);
clrtoeol ();
if (msg->env->subject)
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
case OP_COMPOSE_EDIT_FCC:
- strfcpy (buf, fcc, sizeof (buf));
+ m_strcpy(buf, sizeof(buf), fcc);
if (mutt_get_field ("Fcc: ", buf, sizeof (buf), M_FILE | M_CLEAR) == 0) {
- strfcpy (fcc, buf, _POSIX_PATH_MAX);
+ m_strcpy(fcc, _POSIX_PATH_MAX, buf);
mutt_pretty_mailbox (fcc);
move (HDR_FCC, HDR_XOFFSET + SW);
mutt_paddstr (W, fcc);
(op == OP_COMPOSE_EDIT_HEADERS ||
(op == OP_COMPOSE_EDIT_MESSAGE && option (OPTEDITHDRS)))) {
const char *tag = NULL;
- char *err = NULL;
+ const char *err = NULL;
mutt_env_to_local (msg->env);
mutt_edit_headers (NONULL (Editor), msg->content->filename, msg,
if ((op == OP_COMPOSE_ATTACH_MESSAGE) ^ (Context->magic == M_NNTP))
#endif
{
- strfcpy (fname, NONULL (Context->path), sizeof (fname));
+ m_strcpy(fname, sizeof(fname), NONULL(Context->path));
mutt_pretty_mailbox (fname);
}
set_option (OPTATTACHMSG);
mutt_message _("Tag the messages you want to attach!");
- close = mutt_index_menu ();
+ closed = mutt_index_menu ();
unset_option (OPTATTACHMSG);
if (!Context) {
}
menu->redraw |= REDRAW_FULL;
- if (close == OP_QUIT)
+ if (closed == OP_QUIT)
mx_close_mailbox (Context, NULL);
else
mx_fastclose_mailbox (Context);
case OP_COMPOSE_EDIT_DESCRIPTION:
CHECK_COUNT;
- strfcpy (buf,
- idx[menu->current]->content->description ?
- idx[menu->current]->content->description : "", sizeof (buf));
+ m_strcpy(buf, sizeof(buf),
+ NONULL(idx[menu->current]->content->description));
/* header names should not be translated */
if (mutt_get_field ("Description: ", buf, sizeof (buf), 0) == 0) {
- str_replace (&idx[menu->current]->content->description, buf);
+ m_strreplace(&idx[menu->current]->content->description, buf);
menu->redraw = REDRAW_CURRENT;
}
mutt_message_hook (NULL, msg, M_SEND2HOOK);
case OP_COMPOSE_EDIT_ENCODING:
CHECK_COUNT;
- strfcpy (buf, ENCODING (idx[menu->current]->content->encoding),
- sizeof (buf));
+ m_strcpy(buf, sizeof(buf),
+ ENCODING(idx[menu->current]->content->encoding));
if (mutt_get_field ("Content-Transfer-Encoding: ", buf,
sizeof (buf), 0) == 0 && buf[0]) {
if ((i = mutt_check_encoding (buf)) != ENCOTHER && i != ENCUUENCODED) {
case OP_COMPOSE_RENAME_FILE:
CHECK_COUNT;
- strfcpy (fname, idx[menu->current]->content->filename, sizeof (fname));
+ m_strcpy(fname, sizeof(fname), idx[menu->current]->content->filename);
mutt_pretty_mailbox (fname);
if (mutt_get_field (_("Rename to: "), fname, sizeof (fname), M_FILE)
== 0 && fname[0]) {
if (mutt_rename_file (idx[menu->current]->content->filename, fname))
break;
- str_replace (&idx[menu->current]->content->filename, fname);
+ m_strreplace(&idx[menu->current]->content->filename, fname);
menu->redraw = REDRAW_CURRENT;
if (idx[menu->current]->content->stamp >= st.st_mtime)
update_idx (menu, idx, idxlen++);
idx[menu->current]->content->type = itype;
- str_replace (&idx[menu->current]->content->subtype, p);
+ m_strreplace(&idx[menu->current]->content->subtype, p);
idx[menu->current]->content->unlink = 1;
menu->redraw |= REDRAW_INDEX | REDRAW_STATUS;
fname[0] = '\0';
if (Context) {
- strfcpy (fname, NONULL (Context->path), sizeof (fname));
+ m_strcpy(fname, sizeof(fname), NONULL(Context->path));
mutt_pretty_mailbox (fname);
}
if (idxlen)