move some decoding functions right into the str module, with a bit more

[apps/madmutt.git] / crypt.c

diff --git a/crypt.c b/crypt.c
index e5019ec..b10ed05 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -16,10 +16,13 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
 #include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "mutt_curses.h"
 #include "mime.h"
@@ -27,8 +30,6 @@
 #include "mutt_crypt.h"
 #include "pgp.h"
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <sys/wait.h>
 #include <string.h>
@@ -389,7 +390,7 @@ int mutt_is_application_smime (BODY * m)
 
     /* no .p7c, .p10 support yet. */
 
-    len = str_len (t) - 4;
+    len = m_strlen(t) - 4;
     if (len > 0 && *(t + len) == '.') {
       len++;
       if (!ascii_strcasecmp ((t + len), "p7m"))
@@ -531,7 +532,7 @@ void convert_to_7bit (BODY * a)
         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);
     }
@@ -749,7 +750,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
     if ((protocol_minor = strchr (protocol, '/')))
       protocol_minor++;
 
-    strfcpy (major, protocol, sizeof (major));
+    m_strcpy(major, sizeof(major), protocol);
     if ((t = strchr (major, '/')))
       *t = '\0';
 
@@ -759,7 +760,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
   /* 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);
@@ -769,13 +770,13 @@ int mutt_signed_handler (BODY * a, STATE * 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"),
@@ -793,7 +794,7 @@ int mutt_signed_handler (BODY * a, STATE * s)
         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;
 
@@ -803,8 +804,8 @@ int mutt_signed_handler (BODY * a, STATE * s)
           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;