force our cflags in subdirs as well.

[apps/madmutt.git] / crypt.c

diff --git a/crypt.c b/crypt.c
index 2f20bc1..54d60fe 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -17,6 +17,8 @@
 #endif
 
 #include "mutt.h"
+#include "ascii.h"
+#include "handler.h"
 #include "mutt_curses.h"
 #include "mime.h"
 #include "copy.h"
@@ -49,7 +51,7 @@
 
 
 /* print the current time to avoid spoofing of the signature output */
-void crypt_current_time (STATE * s, char *app_name)
+void crypt_current_time (STATE * s, const char *app_name)
 {
   time_t t;
   char p[STRING], tmp[STRING];
@@ -485,7 +487,7 @@ int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
     return -1;
   }
 
-  fseek (s->fpin, a->hdr_offset, 0);
+  fseeko (s->fpin, a->hdr_offset, 0);
   bytes = a->length + a->offset - a->hdr_offset;
   hadcr = 0;
   while (bytes > 0) {
@@ -705,7 +707,7 @@ static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
       crypt_fetch_signatures (signatures, a->parts, n);
     else {
       if ((*n % 5) == 0)
-        safe_realloc (signatures, (*n + 6) * sizeof (BODY **));
+        mem_realloc (signatures, (*n + 6) * sizeof (BODY **));
 
       (*signatures)[(*n)++] = a;
     }
@@ -717,7 +719,7 @@ static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
  * This routine verifies a  "multipart/signed"  body.
  */
 
-void mutt_signed_handler (BODY * a, STATE * s)
+int mutt_signed_handler (BODY * a, STATE * s)
 {
   char tempfile[_POSIX_PATH_MAX];
   char *protocol;
@@ -729,9 +731,10 @@ void mutt_signed_handler (BODY * a, STATE * s)
   int sigcnt = 0;
   int i;
   short goodsig = 1;
+  int rc = 0;
 
   if (!WithCrypto)
-    return;
+    return (-1);
 
   protocol = mutt_get_parameter ("protocol", a->parameter);
   a = a->parts;
@@ -759,8 +762,7 @@ void mutt_signed_handler (BODY * a, STATE * s)
     state_attach_puts (_("[-- Error: "
                          "Inconsistent multipart/signed structure! --]\n\n"),
                        s);
-    mutt_body_handler (a, s);
-    return;
+    return mutt_body_handler (a, s);
   }
 
 
@@ -777,8 +779,7 @@ void mutt_signed_handler (BODY * a, STATE * s)
     state_printf (s, _("[-- Error: "
                        "Unknown multipart/signed protocol %s! --]\n\n"),
                   protocol);
-    mutt_body_handler (a, s);
-    return;
+    return mutt_body_handler (a, s);
   }
 
   if (s->flags & M_DISPLAY) {
@@ -825,15 +826,17 @@ void mutt_signed_handler (BODY * a, STATE * s)
       state_attach_puts (_("[-- The following data is signed --]\n\n"), s);
 
 
-      FREE (&signatures);
+      mem_free (&signatures);
     }
     else
       state_attach_puts (_("[-- Warning: Can't find any signatures. --]\n\n"),
                          s);
   }
 
-  mutt_body_handler (a, s);
+  rc = mutt_body_handler (a, s);
 
   if (s->flags & M_DISPLAY && sigcnt)
     state_attach_puts (_("\n[-- End of signed data --]\n"), s);
+
+  return (rc);
 }