#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
+#include <lib-lib/file.h>
#include "mutt.h"
-#include "ascii.h"
#include "enter.h"
#include "mutt_curses.h"
#include "mutt_idna.h"
tmp[sizeof (tmp) - 1] = 0;
if (prefix) {
- strfcpy (tmp, NONULL (Prefix), sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(Prefix));
tmplen = m_strlen(tmp);
p = tmp + tmplen;
tmplen = sizeof (tmp) - tmplen;
rfc822_write_address (tmp, sizeof (tmp), e->to, 0);
if (!e->to || force) {
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 4, 0) == 0) {
- rfc822_free_address (&e->to);
+ address_delete (&e->to);
e->to = mutt_parse_adrlist (e->to, tmp);
e->to = mutt_expand_aliases (e->to);
mutt_addrlist_to_idna (e->to, NULL); /* XXX - IDNA error reporting? */
if (!e->subject || force) {
addstr ("Subject: ");
- strfcpy (tmp, e->subject ? e->subject : "", sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), NONULL(e->subject));
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 9, 0) == 0)
str_replace (&e->subject, tmp);
addch ('\n');
mutt_addrlist_to_local (e->cc);
rfc822_write_address (tmp, sizeof (tmp), e->cc, 0);
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 4, 0) == 0) {
- rfc822_free_address (&e->cc);
+ address_delete (&e->cc);
e->cc = mutt_parse_adrlist (e->cc, tmp);
e->cc = mutt_expand_aliases (e->cc);
tmp[0] = 0;
mutt_addrlist_to_local (e->bcc);
rfc822_write_address (tmp, sizeof (tmp), e->bcc, 0);
if (mutt_enter_string (tmp, sizeof (tmp), LINES - 1, 5, 0) == 0) {
- rfc822_free_address (&e->bcc);
+ address_delete (&e->bcc);
e->bcc = mutt_parse_adrlist (e->bcc, tmp);
e->bcc = mutt_expand_aliases (e->bcc);
mutt_addrlist_to_idna (e->bcc, NULL);
while (p >= tmp && ISSPACE (*p))
*p-- = 0;
- p = tmp + 2;
- SKIPWS (p);
+ p = vskipspaces(tmp + 2);
switch (tmp[1]) {
case '?':
break;
case 'r':
if (*p) {
- strncpy (tmp, p, sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), p);
mutt_expand_path (tmp, sizeof (tmp));
buf = be_snarf_file (tmp, buf, &bufmax, &buflen, 1);
}
case 'u':
if (buflen) {
buflen--;
- strfcpy (tmp, buf[buflen], sizeof (tmp));
+ m_strcpy(tmp, sizeof(tmp), buf[buflen]);
tmp[m_strlen(tmp) - 1] = 0;
p_delete(&buf[buflen]);
buf[buflen] = NULL;
break;
}
}
- else if (str_cmp (".", tmp) == 0)
+ else if (m_strcmp(".", tmp) == 0)
done = 1;
else {
- str_cat (tmp, sizeof (tmp), "\n");
+ m_strcat(tmp, sizeof(tmp), "\n");
if (buflen == bufmax)
p_realloc(&buf, bufmax += 25);
buf[buflen++] = m_strdup(tmp[1] == '~' ? tmp + 1 : tmp);