X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=b98b321ab35b5cfe0cddf29b14affa20d5aec69f;hp=6d3fc5c6fb95accaf428f904516614f0432deb9f;hb=c8b8b9539aaf11b48c4c1e5baba434db09722111;hpb=0c12d960399d14b4143b2bb91a96bdaca64e4c56

diff --git a/pgppubring.c b/pgppubring.c
index 6d3fc5c..b98b321 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -22,32 +22,22 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
 #include <lib-hash/hash.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #else
 extern char *optarg;
 extern int optind;
 #endif
-#include <errno.h>
 
 short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
 #include "lib.h"
-#include "pgplib.h"
-#include "pgppacket.h"
+#include <lib-crypt/pgplib.h>
+#include <lib-crypt/pgppacket.h>
 
 #define MD5_DIGEST_LENGTH  16
 
@@ -125,10 +115,10 @@ int main (int argc, char *const argv[])
   }
 
   if (_kring)
-    strfcpy (kring, _kring, sizeof (kring));
+    m_strcpy(kring, sizeof(kring), _kring);
   else {
     if ((env_pgppath = getenv ("PGPPATH")))
-      strfcpy (pgppath, env_pgppath, sizeof (pgppath));
+      m_strcpy(pgppath, sizeof(pgppath), env_pgppath);
     else if ((env_home = getenv ("HOME")))
       snprintf (pgppath, sizeof (pgppath), "%s/.pgp", env_home);
     else {
@@ -706,7 +696,7 @@ static int pgpring_string_matches_hint (const char *s, const char *hints[],
     return 1;
 
   for (i = 0; i < nhints; i++) {
-    if (str_isstr (s, hints[i]) != NULL)
+    if (m_stristr(s, hints[i]) != NULL)
       return 1;
   }
 
@@ -908,13 +898,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
     }
   }
 }
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
-  return (char *) message;
-}