#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "handler.h"
#include "mutt_curses.h"
-#include "mime.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "pgp.h"
convert_to_7bit (a->parts);
}
else if (a->type == TYPEMESSAGE &&
- str_casecmp (a->subtype, "delivery-status")) {
+ m_strcasecmp(a->subtype, "delivery-status")) {
if (a->encoding != ENC7BIT)
mutt_message_to_7bit (a, NULL);
}
{
int i;
char tempfname[_POSIX_PATH_MAX], *mbox;
- ADDRESS *tmp = NULL;
+ address_t *tmp = NULL;
FILE *fpout;
if (!WithCrypto)
if ((protocol_minor = strchr (protocol, '/')))
protocol_minor++;
- strfcpy (major, protocol, sizeof (major));
+ m_strcpy(major, sizeof(major), protocol);
if ((t = strchr (major, '/')))
*t = '\0';
/* consistency check */
if (!(a && a->next && a->next->type == protocol_major &&
- !str_casecmp (a->next->subtype, protocol_minor))) {
+ !m_strcasecmp(a->next->subtype, protocol_minor))) {
state_attach_puts (_("[-- Error: "
"Inconsistent multipart/signed structure! --]\n\n"),
s);
if ((WithCrypto & APPLICATION_PGP)
&& protocol_major == TYPEAPPLICATION
- && !str_casecmp (protocol_minor, "pgp-signature"));
+ && !m_strcasecmp(protocol_minor, "pgp-signature"));
else if ((WithCrypto & APPLICATION_SMIME)
&& protocol_major == TYPEAPPLICATION
- && !(str_casecmp (protocol_minor, "x-pkcs7-signature")
- && str_casecmp (protocol_minor, "pkcs7-signature")));
+ && !(m_strcasecmp(protocol_minor, "x-pkcs7-signature")
+ && m_strcasecmp(protocol_minor, "pkcs7-signature")));
else if (protocol_major == TYPEMULTIPART
- && !str_casecmp (protocol_minor, "mixed"));
+ && !m_strcasecmp(protocol_minor, "mixed"));
else {
state_printf (s, _("[-- Error: "
"Unknown multipart/signed protocol %s! --]\n\n"),
for (i = 0; i < sigcnt; i++) {
if ((WithCrypto & APPLICATION_PGP)
&& signatures[i]->type == TYPEAPPLICATION
- && !str_casecmp (signatures[i]->subtype, "pgp-signature")) {
+ && !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {
if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;
if ((WithCrypto & APPLICATION_SMIME)
&& signatures[i]->type == TYPEAPPLICATION
&&
- (!str_casecmp (signatures[i]->subtype, "x-pkcs7-signature")
- || !str_casecmp (signatures[i]->subtype,
+ (!m_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature")
+ || !m_strcasecmp(signatures[i]->subtype,
"pkcs7-signature"))) {
if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0)
goodsig = 0;