drop the old string API fully.

[apps/madmutt.git] / pgpmicalg.c

diff --git a/pgpmicalg.c b/pgpmicalg.c
index 0caba38..1c322be 100644 (file)
--- a/pgpmicalg.c
+++ b/pgpmicalg.c
@@ -19,7 +19,6 @@
 #include "handler.h"
 #include "pgp.h"
 #include "pgppacket.h"
-#include "mime.h"
 #include "charset.h"
 
 #include <stdio.h>
@@ -27,6 +26,10 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
 #include "lib/debug.h"
 
 static struct {
@@ -59,13 +62,13 @@ static const char *pgp_hash_to_micalg (short id)
 static void pgp_dearmor (FILE * in, FILE * out)
 {
   char line[HUGE_STRING];
-  long start;
-  long end;
+  off_t start;
+  off_t end;
   char *r;
 
   STATE state;
 
-  memset (&state, 0, sizeof (STATE));
+  p_clear(&state, 1);
   state.fpin = in;
   state.fpout = out;
 
@@ -83,7 +86,7 @@ static void pgp_dearmor (FILE * in, FILE * out)
   /* skip the armor header */
 
   while ((r = fgets (line, sizeof (line), in)) != NULL) {
-    SKIPWS (r);
+    r = vskipspaces(r);
     if (!*r)
       break;
   }
@@ -93,7 +96,7 @@ static void pgp_dearmor (FILE * in, FILE * out)
   }
 
   /* actual data starts here */
-  start = ftell (in);
+  start = ftello (in);
 
   /* find the checksum */
 
@@ -106,12 +109,12 @@ static void pgp_dearmor (FILE * in, FILE * out)
     return;
   }
 
-  if ((end = ftell (in) - str_len (line)) < start) {
+  if ((end = ftello (in) - m_strlen(line)) < start) {
     debug_print (1, ("end < start???\n"));
     return;
   }
 
-  if (fseek (in, start, SEEK_SET) == -1) {
+  if (fseeko (in, start, SEEK_SET) == -1) {
     debug_print (1, ("Can't seekto start.\n"));
     return;
   }