finish the "read" of charset.c

[apps/madmutt.git] / lib-crypt / crypt-gpgme.c

diff --git a/lib-crypt/crypt-gpgme.c b/lib-crypt/crypt-gpgme.c
index accd171..339b97c 100644 (file)
--- a/lib-crypt/crypt-gpgme.c
+++ b/lib-crypt/crypt-gpgme.c
@@ -18,12 +18,34 @@
 
 #ifdef CRYPT_BACKEND_GPGME
 
+#include <sys/wait.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <ctype.h>
+
+#ifdef HAVE_LOCALE_H
+#  include <locale.h>
+#endif
+#ifdef HAVE_LANGINFO_D_T_FMT
+#  include <langinfo.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+#  include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_RESOURCE_H
+#  include <sys/resource.h>
+#endif
+
+#include <gpgme.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -32,6 +54,8 @@
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "lib.h"
+#include "alias.h"
 #include <lib-crypt/crypt.h>
 #include "handler.h"
 #include "copy.h"
@@ -39,32 +63,6 @@
 #include "recvattach.h"
 #include "sort.h"
 
-
-#include <sys/wait.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <errno.h>
-#include <ctype.h>
-
-#include <gpgme.h>
-
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-#ifdef HAVE_LANGINFO_D_T_FMT
-#include <langinfo.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_RESOURCE_H
-# include <sys/resource.h>
-#endif
-
 /*
  * Helper macros.
  */
@@ -1316,7 +1314,6 @@ static int verify_one (BODY * sigbdy, STATE * s,
   gpgme_release (ctx);
 
   state_attach_puts (_("[-- End signature information --]\n\n"), s);
-  debug_print (1, ("returning %d.\n", badsig));
 
   return badsig ? 1 : anywarn ? 2 : 0;
 }
@@ -1721,7 +1718,7 @@ static void copy_clearsigned (gpgme_data_t data, STATE * s, char *charset)
 {
   char buf[HUGE_STRING];
   short complete, armor_header;
-  FGETCONV *fc;
+  fgetconv_t *fc;
   char *fname;
   FILE *fp;
 
@@ -1784,8 +1781,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
 
   char body_charset[STRING];    /* Only used for clearsigned messages. */
 
-  debug_print (2, ("Entering pgp_application_pgp handler\n"));
-
   /* For clearsigned messages we won't be able to get a character set
      but we know that this may only be text thus we assume Latin-1
      here. */
@@ -1947,7 +1942,7 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
         copy_clearsigned (armored_data, s, body_charset);
       }
       else if (pgpout) {
-        FGETCONV *fc;
+        fgetconv_t *fc;
         int c;
 
         rewind (pgpout);
@@ -1989,7 +1984,6 @@ int pgp_gpgme_application_handler (BODY * m, STATE * s)
                          " of PGP message! --]\n\n"), s);
     return (-1);
   }
-  debug_print (2, ("Leaving pgp_application_pgp handler\n"));
   return (err);
 }
 
@@ -2007,7 +2001,6 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
   int is_signed;
   int rc = 0;
 
-  debug_print (2, ("Entering pgp_encrypted handler\n"));
   a = a->parts;
   if (!a || a->type != TYPEAPPLICATION || !a->subtype
       || ascii_strcasecmp ("pgp-encrypted", a->subtype)
@@ -2069,7 +2062,6 @@ int pgp_gpgme_encrypted_handler (BODY * a, STATE * s)
 
   fclose (fpout);
   mutt_unlink (tempfile);
-  debug_print (2, ("Leaving pgp_encrypted handler\n"));
   return (rc);
 }
 
@@ -2082,8 +2074,6 @@ int smime_gpgme_application_handler (BODY * a, STATE * s)
   int is_signed;
   int rc = 0;
 
-  debug_print (2, ("Entering smime_encrypted handler\n"));
-
   a->warnsig = 0;
   mutt_mktemp (tempfile);
   if (!(fpout = safe_fopen (tempfile, "w+"))) {
@@ -2136,7 +2126,6 @@ int smime_gpgme_application_handler (BODY * a, STATE * s)
 
   fclose (fpout);
   mutt_unlink (tempfile);
-  debug_print (2, ("Leaving smime_encrypted handler\n"));
   return (rc);
 }
 
@@ -3455,13 +3444,8 @@ static crypt_key_t *crypt_getkeybyaddr (address_t * a, short abilities,
   if (!keys)
     return NULL;
 
-  debug_print (5, ("looking for %s <%s>.\n", a->personal, a->mailbox));
-
   for (k = keys; k; k = k->next) {
-    debug_print (5, ("  looking at key: %s `%.15s'\n", crypt_keyid (k), k->uid));
-
     if (abilities && !(k->flags & abilities)) {
-      debug_print (5, ("  insufficient abilities: Has %x, want %x\n", k->flags, abilities));
       continue;
     }
 
@@ -3565,7 +3549,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
       continue;
 
     match = 0;
-    debug_print (5, ("matching \"%s\" against " "key %s, \"%s\":\n", p, crypt_keyid (k), k->uid));
 
     if (!*p || !m_strcasecmp(p, crypt_keyid (k))
         || (!m_strncasecmp(p, "0x", 2)
@@ -3576,8 +3559,6 @@ static crypt_key_t *crypt_getkeybystr (char *p, short abilities,
         || m_stristr(k->uid, p)) {
       crypt_key_t *tmp;
 
-      debug_print (5, ("match.\n"));
-
       *matches_endp = tmp = crypt_copy_key (k);
       matches_endp = &tmp->next;
     }