# include "config.h"
#endif
+#include <lib-lib/str.h>
+#include <lib-lib/file.h>
+#include <lib-lib/ascii.h>
#include <lib-lib/mem.h>
+#include <lib-lib/macros.h>
#include "mutt.h"
-#include "ascii.h"
#include "handler.h"
#include "mutt_curses.h"
#include "mime.h"
#include "mutt_crypt.h"
#include "pgp.h"
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include <sys/wait.h>
#include <string.h>
/* no .p7c, .p10 support yet. */
- len = str_len (t) - 4;
+ len = m_strlen(t) - 4;
if (len > 0 && *(t + len) == '.') {
len++;
if (!ascii_strcasecmp ((t + len), "p7m"))
-static void crypt_fetch_signatures (BODY *** signatures, BODY * a, int *n)
+static void crypt_fetch_signatures (BODY ***signatures, BODY * a, int *n)
{
if (!WithCrypto)
return;
crypt_fetch_signatures (signatures, a->parts, n);
else {
if ((*n % 5) == 0)
- mem_realloc (signatures, (*n + 6) * sizeof (BODY **));
+ p_realloc(signatures, *n + 6);
(*signatures)[(*n)++] = a;
}