X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=crypt-gpgme.c;h=4932abd82966b30d99597c789ad1e092a8336c38;hb=fd64f718a3d2c9ea13aac19f48b6b03bcf502118;hp=6b74774c6ef42114f268f1838c4f87ec8aed60b0;hpb=c3e57678c8be193fc137854020f3a90887be97c9;p=apps%2Fmadmutt.git

diff --git a/crypt-gpgme.c b/crypt-gpgme.c
index 6b74774..4932abd 100644
--- a/crypt-gpgme.c
+++ b/crypt-gpgme.c
@@ -27,6 +27,10 @@
 #include "pager.h"
 #include "sort.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <sys/wait.h>
 #include <string.h>
 #include <stdlib.h>
@@ -144,7 +148,7 @@ static const char *crypt_keyid (crypt_key_t * k)
 
   if (k->kobj && k->kobj->subkeys) {
     s = k->kobj->subkeys->keyid;
-    if ((!option (OPTPGPLONGIDS)) && (strlen (s) == 16))
+    if ((!option (OPTPGPLONGIDS)) && (mutt_strlen (s) == 16))
       /* Return only the short keyID.  */
       s += 8;
   }
@@ -998,7 +1002,7 @@ static int show_sig_summary (unsigned long sum,
       state_attach_puts (": ", s);
       if (t0)
         state_attach_puts (t0, s);
-      if (t1 && !(t0 && !strcmp (t0, t1))) {
+      if (t1 && !(t0 && !mutt_strcmp (t0, t1))) {
         if (t0)
           state_attach_puts (",", s);
         state_attach_puts (t1, s);
@@ -1025,10 +1029,10 @@ static void show_fingerprint (gpgme_key_t key, STATE * state)
     return;
   is_pgp = (key->protocol == GPGME_PROTOCOL_OpenPGP);
 
-  buf = safe_malloc (strlen (prefix) + strlen (s) * 4 + 2);
+  buf = safe_malloc (mutt_strlen (prefix) + mutt_strlen (s) * 4 + 2);
   strcpy (buf, prefix);         /* __STRCPY_CHECKED__ */
-  p = buf + strlen (buf);
-  if (is_pgp && strlen (s) == 40) {     /* PGP v4 style formatted. */
+  p = buf + mutt_strlen (buf);
+  if (is_pgp && mutt_strlen (s) == 40) {     /* PGP v4 style formatted. */
     for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
       *p++ = s[0];
       *p++ = s[1];
@@ -1293,7 +1297,7 @@ static int verify_one (BODY * sigbdy, STATE * s,
             if (notation->value) {
               state_attach_puts (notation->value, s);
               if (!(*notation->value
-                    && (notation->value[strlen (notation->value) - 1] ==
+                    && (notation->value[mutt_strlen (notation->value) - 1] ==
                         '\n')))
                 state_attach_puts ("\n", s);
             }
@@ -1820,13 +1824,13 @@ void pgp_gpgme_application_handler (BODY * m, STATE * s)
 
       /* Copy PGP material to an data container */
       armored_data = create_gpgme_data ();
-      gpgme_data_write (armored_data, buf, strlen (buf));
+      gpgme_data_write (armored_data, buf, mutt_strlen (buf));
       while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL) {
         offset = ftell (s->fpin);
         bytes -= (offset - last_pos);   /* don't rely on mutt_strlen(buf) */
         last_pos = offset;
 
-        gpgme_data_write (armored_data, buf, strlen (buf));
+        gpgme_data_write (armored_data, buf, mutt_strlen (buf));
 
         if ((needpass && !mutt_strcmp ("-----END PGP MESSAGE-----\n", buf))
             || (!needpass
@@ -2475,10 +2479,10 @@ static int print_dn_part (FILE * fp, struct dn_array_s *dn, const char *key)
   int any = 0;
 
   for (; dn->key; dn++) {
-    if (!strcmp (dn->key, key)) {
+    if (!mutt_strcmp (dn->key, key)) {
       if (any)
         fputs (" + ", fp);
-      print_utf8 (fp, dn->value, strlen (dn->value));
+      print_utf8 (fp, dn->value, mutt_strlen (dn->value));
       any = 1;
     }
   }
@@ -2501,7 +2505,7 @@ static void print_dn_parts (FILE * fp, struct dn_array_s *dn)
   /* now print the rest without any specific ordering */
   for (; dn->key; dn++) {
     for (i = 0; stdpart[i]; i++) {
-      if (!strcmp (dn->key, stdpart[i]))
+      if (!mutt_strcmp (dn->key, stdpart[i]))
         break;
     }
     if (!stdpart[i]) {
@@ -2754,7 +2758,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
       putc (' ', fp);
     }
     if (is_pgp)
-      print_utf8 (fp, s, strlen (s));
+      print_utf8 (fp, s, mutt_strlen (s));
     else
       parse_and_print_user_id (fp, s);
     putc ('\n', fp);
@@ -2816,7 +2820,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
   if (key->subkeys) {
     s = key->subkeys->fpr;
     fputs (_("Fingerprint: "), fp);
-    if (is_pgp && strlen (s) == 40) {
+    if (is_pgp && mutt_strlen (s) == 40) {
       for (i = 0; *s && s[1] && s[2] && s[3] && s[4]; s += 4, i++) {
         putc (*s, fp);
         putc (s[1], fp);
@@ -2862,7 +2866,7 @@ static void print_key_info (gpgme_key_t key, FILE * fp)
       s = subkey->keyid;
 
       putc ('\n', fp);
-      if (strlen (s) == 16)
+      if (mutt_strlen (s) == 16)
         s += 8;                 /* display only the short keyID */
       fprintf (fp, "Subkey ....: 0x%s", s);
       if (subkey->revoked) {
@@ -2975,7 +2979,7 @@ static void verify_key (crypt_key_t * key)
 
   k = key->kobj;
   gpgme_key_ref (k);
-  while ((s = k->chain_id) && k->subkeys && strcmp (s, k->subkeys->fpr)) {
+  while ((s = k->chain_id) && k->subkeys && mutt_strcmp (s, k->subkeys->fpr)) {
     putc ('\n', fp);
     err = gpgme_op_keylist_start (listctx, s, 0);
     gpgme_key_release (k);
@@ -3214,7 +3218,7 @@ static LIST *crypt_add_string_to_hints (LIST * hints, const char *str)
 
   for (t = strtok (scratch, " ,.:\"()<>\n"); t;
        t = strtok (NULL, " ,.:\"()<>\n")) {
-    if (strlen (t) > 3)
+    if (mutt_strlen (t) > 3)
       hints = mutt_add_list (hints, t);
   }
 
@@ -3919,9 +3923,9 @@ static int verify_sender (HEADER * h, gpgme_protocol_t protocol)
       int sender_length = 0;
       int uid_length = 0;
 
-      sender_length = strlen (sender->mailbox);
+      sender_length = mutt_strlen (sender->mailbox);
       for (uid = key->uids; uid && ret; uid = uid->next) {
-        uid_length = strlen (uid->email);
+        uid_length = mutt_strlen (uid->email);
         if (1 && (uid->email[0] == '<')
             && (uid->email[uid_length - 1] == '>')
             && (uid_length == sender_length + 2)