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

diff --git a/pgppubring.c b/pgppubring.c
index 6d3fc5c..bb27da1 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -125,10 +125,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 +706,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;
   }