X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppacket.c;h=39ebdf25b2539d95a52cbb93bdd8dadf6b998ea9;hp=3fd6ff3b4472dc03564eb833a2871a973c25cdae;hb=b8c71f93b0296f815a6538182343ba67e88c0012;hpb=df70e07e24add1869bcc9b7af2277d9d0c09a281

diff --git a/pgppacket.c b/pgppacket.c
index 3fd6ff3..39ebdf2 100644
--- a/pgppacket.c
+++ b/pgppacket.c
@@ -1,20 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 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.
  */
 
 #if HAVE_CONFIG_H
@@ -27,7 +17,9 @@
 #include <unistd.h>
 #include <time.h>
 
-#include "sha1.h"
+#include <lib-lib/mem.h>
+#include <lib-hash/hash.h>
+
 #include "lib.h"
 #include "pgplib.h"
 #include "pgppacket.h"
@@ -65,16 +57,15 @@ static int read_material (size_t material, size_t * used, FILE * fp)
 unsigned char *pgp_read_packet (FILE * fp, size_t * len)
 {
   size_t used = 0;
-  long startpos;
+  off_t startpos;
   unsigned char ctb;
   unsigned char b;
   size_t material;
 
-  startpos = ftell (fp);
+  startpos = ftello (fp);
 
   if (!plen) {
-    plen = CHUNKSIZE;
-    pbuf = safe_malloc (plen);
+    pbuf = p_new(char, plen = CHUNKSIZE);
   }
 
   if (fread (&ctb, 1, 1, fp) < 1) {
@@ -201,12 +192,12 @@ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
 
 bail:
 
-  fseek (fp, startpos, SEEK_SET);
+  fseeko (fp, startpos, SEEK_SET);
   return NULL;
 }
 
 void pgp_release_packet (void)
 {
   plen = 0;
-  FREE (&pbuf);
+  p_delete(&pbuf);
 }