else if (ascii_strncasecmp ("X-Mutt-Fcc:", tmp->data, 11) == 0) {
p = tmp->data + 11;
SKIPWS (p);
- strfcpy (fcc, p, fcclen);
+ m_strcpy(fcc, fcclen, p);
mutt_pretty_mailbox (fcc);
/* remove the X-Mutt-Fcc: header field */
tmp = next;
}
else if ((WithCrypto & APPLICATION_PGP)
- && (str_ncmp ("Pgp:", tmp->data, 4) == 0 /* this is generated
+ && (m_strncmp("Pgp:", tmp->data, 4) == 0 /* this is generated
* by old mutt versions
*/
- || str_ncmp ("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+ || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_PGP;
tmp = next;
}
else if ((WithCrypto & APPLICATION_SMIME)
- && str_ncmp ("X-Mutt-SMIME:", tmp->data, 13) == 0) {
+ && m_strncmp("X-Mutt-SMIME:", tmp->data, 13) == 0) {
hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
hdr->security |= APPLICATION_SMIME;
}
#ifdef MIXMASTER
- else if (str_ncmp ("X-Mutt-Mix:", tmp->data, 11) == 0) {
+ else if (m_strncmp("X-Mutt-Mix:", tmp->data, 11) == 0) {
char *t;
mutt_free_list (&hdr->chain);
file[0] = '\0';
if (b->filename) {
- strfcpy (file, b->filename, sizeof (file));
+ m_strcpy(file, sizeof(file), b->filename);
b->d_filename = m_strdup(b->filename);
}
else {