X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=159a9d5dccd0d6037eb0535fbdf5fa75412f2042;hp=7e62d836a045a017893f8691d7dd8bb84befe6b1;hb=ba4333b5854d2caf6b486372b060376990fe089e;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/pgppubring.c b/pgppubring.c
index 7e62d83..159a9d5 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -1,22 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1997-2001 Thomas Roessler <roessler@does-not-exist.org>
- * 
- *     This program is free software; you can redistribute it
- *     and/or modify it under the terms of the GNU General Public
- *     License as published by the Free Software Foundation; either
- *     version 2 of the License, or (at your option) any later
- *     version.
- * 
- *     This program is distributed in the hope that it will be
- *     useful, but WITHOUT ANY WARRANTY; without even the implied
- *     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *     PURPOSE.  See the GNU General Public License for more
- *     details.
- * 
- *     You should have received a copy of the GNU General Public
- *     License along with this program; if not, write to the Free
- *     Software Foundation, Inc., 59 Temple Place - Suite 330,
- *     Boston, MA  02111, USA.
+ *
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 /*
@@ -38,6 +26,9 @@
 # include "config.h"
 #endif
 
+#include "lib/mem.h"
+#include "lib/str.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -255,13 +246,13 @@ static pgp_key_t pgp_parse_pgp2_key (unsigned char *buff, size_t l)
               "%08lX", id);
   }
 
-  p->keyid = safe_strdup ((char *) scratch);
+  p->keyid = str_dup ((char *) scratch);
 
   return p;
 
 bailout:
 
-  FREE (&p);
+  mem_free (&p);
   return NULL;
 }
 
@@ -357,7 +348,7 @@ static pgp_key_t pgp_parse_pgp3_key (unsigned char *buff, size_t l)
               id);
   }
 
-  p->keyid = safe_strdup ((char *) scratch);
+  p->keyid = str_dup ((char *) scratch);
 
   return p;
 }
@@ -645,7 +636,7 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
     case PT_SIG:
       {
         if (lsig) {
-          pgp_sig_t *signature = safe_calloc (sizeof (pgp_sig_t), 1);
+          pgp_sig_t *signature = mem_calloc (sizeof (pgp_sig_t), 1);
 
           *lsig = signature;
           lsig = &signature->next;
@@ -676,12 +667,12 @@ static pgp_key_t pgp_parse_keyblock (FILE * fp)
         if (!addr)
           break;
 
-        chr = safe_malloc (l);
+        chr = mem_malloc (l);
         memcpy (chr, buff + 1, l - 1);
         chr[l - 1] = '\0';
 
 
-        *addr = uid = safe_calloc (1, sizeof (pgp_uid_t));      /* XXX */
+        *addr = uid = mem_calloc (1, sizeof (pgp_uid_t));      /* XXX */
         uid->addr = chr;
         uid->parent = p;
         uid->trust = 0;
@@ -719,7 +710,7 @@ static int pgpring_string_matches_hint (const char *s, const char *hints[],
     return 1;
 
   for (i = 0; i < nhints; i++) {
-    if (mutt_stristr (s, hints[i]) != NULL)
+    if (str_isstr (s, hints[i]) != NULL)
       return 1;
   }
 
@@ -752,11 +743,11 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
     char *error_buf;
     size_t error_buf_len;
 
-    error_buf_len = sizeof ("fopen: ") - 1 + strlen (ringfile) + 1;
-    error_buf = safe_malloc (error_buf_len);
+    error_buf_len = sizeof ("fopen: ") - 1 + str_len (ringfile) + 1;
+    error_buf = mem_malloc (error_buf_len);
     snprintf (error_buf, error_buf_len, "fopen: %s", ringfile);
     perror (error_buf);
-    FREE (&error_buf);
+    mem_free (&error_buf);
     return;
   }
 
@@ -773,7 +764,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
       keypos = pos;
     }
     else if (pt == PT_NAME) {
-      char *tmp = safe_malloc (l);
+      char *tmp = mem_malloc (l);
 
       memcpy (tmp, buff + 1, l - 1);
       tmp[l - 1] = '\0';
@@ -794,7 +785,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
         pgp_free_key (&p);
       }
 
-      FREE (&tmp);
+      mem_free (&tmp);
     }
 
     FGETPOS (rfp, pos);