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? */
addstr ("Subject: ");
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);
+ m_strreplace(&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);
char **buf = NULL;
int bufmax = 0, buflen = 0;
char tmp[LONG_STRING];
- int abort = 0;
+ int aborted = 0;
int done = 0;
int i;
char *p;
addstr (_("missing filename.\n"));
break;
case 's':
- str_replace (&msg->env->subject, p);
+ m_strreplace(&msg->env->subject, p);
break;
case 't':
msg->env->to = rfc822_parse_adrlist (msg->env->to, p);
be_barf_file (*p ? p : path, buf, buflen);
break;
case 'x':
- abort = 1;
+ aborted = 1;
done = 1;
break;
default:
tmp[0] = 0;
}
- if (!abort)
+ if (!aborted)
be_barf_file (path, buf, buflen);
be_free_memory (buf, buflen);
- return (abort ? -1 : 0);
+ return (aborted ? -1 : 0);
}