remove a whole lot of #include mutt.h

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

diff --git a/lib-crypt/gnupgparse.c b/lib-crypt/gnupgparse.c
index dff28ca..d4876d6 100644 (file)
--- a/lib-crypt/gnupgparse.c
+++ b/lib-crypt/gnupgparse.c
@@ -18,33 +18,15 @@
  * 
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <time.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/date.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
+#include <lib-sys/unix.h>
+#include <lib-ui/curses.h>
 
-#include "mutt.h"
 #include "pgp.h"
 #include "charset.h"
 
-#include "lib/debug.h"
-
 /****************
  * Read the GNUPG keys.  For now we read the complete keyring by
  * calling gnupg in a special mode.
@@ -82,7 +64,7 @@ static void fix_uid (char *uid)
   }
   *d = '\0';
 
-  if (_chs && (cd = mutt_iconv_open (_chs, "utf-8", 0)) != (iconv_t) - 1) {
+  if (_chs && (cd = mutt_iconv_open (_chs, "utf-8", 0)) != MUTT_ICONV_ERROR) {
     int n = s - uid + 1;        /* chars available in original buffer */
     char *buf;
     const char *ib;
@@ -117,8 +99,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
   if (!*buf)
     return NULL;
 
-  debug_print (2, ("buf = `%s'\n", buf));
-
   for (p = buf; p; p = pend) {
     if ((pend = strchr (p, ':')))
       *pend++ = 0;
@@ -129,8 +109,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     switch (field) {
     case 1:                    /* record type */
       {
-        debug_print (2, ("record type: %s\n", p));
-
         if (!m_strcmp(p, "pub"));
         else if (!m_strcmp(p, "sub"))
           *is_subkey = 1;
@@ -149,8 +127,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       }
     case 2:                    /* trust info */
       {
-        debug_print (2, ("trust info: %s\n", p));
-
         switch (*p) {           /* look only at the first letter */
         case 'e':
           flags |= KEYFLAG_EXPIRED;
@@ -182,18 +158,12 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       }
     case 3:                    /* key length  */
       {
-
-        debug_print (2, ("key len: %s\n", p));
-
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
           k->keylen = atoi (p); /* fixme: add validation checks */
         break;
       }
     case 4:                    /* pubkey algo */
       {
-
-        debug_print (2, ("pubkey algorithm: %s\n", p));
-
         if (!(*is_subkey && option (OPTPGPIGNORESUB))) {
           k->numalg = atoi (p);
           k->algorithm = pgp_pkalgbytype (atoi (p));
@@ -202,8 +172,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
       }
     case 5:                    /* 16 hex digits with the long keyid. */
       {
-        debug_print (2, ("key id: %s\n", p));
-
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
           m_strreplace(&k->keyid, p);
         break;
@@ -214,8 +182,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         char tstr[11];
         struct tm st_time;
 
-        debug_print (2, ("time stamp: %s\n", p));
-
         if (!p)
           break;
         st_time.tm_sec = 0;
@@ -245,8 +211,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         if (!is_uid && (*is_subkey && option (OPTPGPIGNORESUB)))
           break;
 
-        debug_print (2, ("user ID: %s\n", p));
-
         uid = p_new(pgp_uid_t, 1);
         fix_uid (p);
         uid->addr = m_strdup(p);
@@ -266,8 +230,6 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
     case 11:                   /* signature class  */
       break;
     case 12:                   /* key capabilities */
-      debug_print (2, ("capabilities info: %s\n", p));
-
       while (*p) {
         switch (*p++) {
         case 'D':
@@ -299,7 +261,7 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
   return k;
 }
 
-pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
+pgp_key_t pgp_get_candidates (pgp_ring_t keyring, string_list_t * hints)
 {
   FILE *fp;
   pid_t thepid;