Rocco Rutte:

[apps/madmutt.git] / pgpkey.c

diff --git a/pgpkey.c b/pgpkey.c
index 8e8f253..8bf2534 100644 (file)
--- a/pgpkey.c
+++ b/pgpkey.c
@@ -23,6 +23,7 @@
 #include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
+#include "lib/debug.h"
 
 #include <string.h>
 #include <ctype.h>
@@ -518,13 +519,13 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
 
       mutt_mktemp (tempfile);
       if ((devnull = fopen ("/dev/null", "w")) == NULL) {       /* __FOPEN_CHECKED__ */
-        mutt_perror _("Can't open /dev/null");
+        mutt_perror (_("Can't open /dev/null"));
 
         break;
       }
       if ((fp = safe_fopen (tempfile, "w")) == NULL) {
         fclose (devnull);
-        mutt_perror _("Can't create temporary file");
+        mutt_perror (_("Can't create temporary file"));
 
         break;
       }
@@ -538,7 +539,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, ADDRESS * p, const char *s)
       if ((thepid = pgp_invoke_verify_key (NULL, NULL, NULL, -1,
                                            fileno (fp), fileno (devnull),
                                            tmpbuf)) == -1) {
-        mutt_perror _("Can't create filter");
+        mutt_perror (_("Can't create filter"));
 
         unlink (tempfile);
         fclose (fp);
@@ -703,13 +704,13 @@ BODY *pgp_make_key_attachment (char *tempf)
   }
 
   if ((tempfp = safe_fopen (tempf, tempf == tempfb ? "w" : "a")) == NULL) {
-    mutt_perror _("Can't create temporary file");
+    mutt_perror (_("Can't create temporary file"));
 
     return NULL;
   }
 
   if ((devnull = fopen ("/dev/null", "w")) == NULL) {   /* __FOPEN_CHECKED__ */
-    mutt_perror _("Can't open /dev/null");
+    mutt_perror (_("Can't open /dev/null"));
 
     fclose (tempfp);
     if (tempf == tempfb)
@@ -723,7 +724,7 @@ BODY *pgp_make_key_attachment (char *tempf)
   if ((thepid =
        pgp_invoke_export (NULL, NULL, NULL, -1,
                           fileno (tempfp), fileno (devnull), tmp)) == -1) {
-    mutt_perror _("Can't create filter");
+    mutt_perror (_("Can't create filter"));
 
     unlink (tempf);
     fclose (tempfp);
@@ -762,7 +763,7 @@ static LIST *pgp_add_string_to_hints (LIST * hints, const char *str)
 
   for (t = strtok (scratch, " ,.:\"()<>\n"); t;
        t = strtok (NULL, " ,.:\"()<>\n")) {
-    if (safe_strlen (t) > 3)
+    if (mutt_strlen (t) > 3)
       hints = mutt_add_list (hints, t);
   }
 
@@ -811,17 +812,15 @@ pgp_key_t pgp_getkeybyaddr (ADDRESS * a, short abilities, pgp_ring_t keyring)
   if (!keys)
     return NULL;
 
-  dprint (5, (debugfile, "pgp_getkeybyaddr: looking for %s <%s>.",
-              a->personal, a->mailbox));
-
+  debug_print (5, ("looking for %s <%s>\n", a->personal, a->mailbox));
 
   for (k = keys; k; k = kn) {
     kn = k->next;
 
-    dprint (5, (debugfile, "  looking at key: %s\n", pgp_keyid (k)));
+    debug_print (5, ("  looking at key: %s\n", pgp_keyid (k)));
 
     if (abilities && !(k->flags & abilities)) {
-      dprint (5, (debugfile, "  insufficient abilities: Has %x, want %x\n",
+      debug_print (5, ("  insufficient abilities: Has %x, want %x\n",
                   k->flags, abilities));
       continue;
     }
@@ -928,17 +927,14 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
     match = 0;
 
     for (a = k->address; a; a = a->next) {
-      dprint (5,
-              (debugfile,
-               "pgp_getkeybystr: matching \"%s\" against key %s, \"%s\": ", p,
-               pgp_keyid (k), a->addr));
+      debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr));
       if (!*p || safe_strcasecmp (p, pgp_keyid (k)) == 0
           || (!safe_strncasecmp (p, "0x", 2)
               && !safe_strcasecmp (p + 2, pgp_keyid (k)))
           || (option (OPTPGPLONGIDS) && !safe_strncasecmp (p, "0x", 2)
               && !safe_strcasecmp (p + 2, k->keyid + 8))
           || str_isstr (a->addr, p)) {
-        dprint (5, (debugfile, "match.\n"));
+        debug_print (5, ("match.\n"));
         match = 1;
         break;
       }