projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simplify block_try function.
[apps/madmutt.git]
/
crypt.c
diff --git
a/crypt.c
b/crypt.c
index
c1225ac
..
c0c64ad
100644
(file)
--- a/
crypt.c
+++ b/
crypt.c
@@
-22,10
+22,11
@@
#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
#include <lib-lib/mem.h>
#include <lib-lib/macros.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "handler.h"
#include "mutt_curses.h"
#include "mutt.h"
#include "handler.h"
#include "mutt_curses.h"
-#include "mime.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "pgp.h"
#include "copy.h"
#include "mutt_crypt.h"
#include "pgp.h"
@@
-555,7
+556,7
@@
void crypt_extract_keys_from_messages (HEADER * h)
{
int i;
char tempfname[_POSIX_PATH_MAX], *mbox;
{
int i;
char tempfname[_POSIX_PATH_MAX], *mbox;
-
ADDRESS
*tmp = NULL;
+
address_t
*tmp = NULL;
FILE *fpout;
if (!WithCrypto)
FILE *fpout;
if (!WithCrypto)
@@
-750,7
+751,7
@@
int mutt_signed_handler (BODY * a, STATE * s)
if ((protocol_minor = strchr (protocol, '/')))
protocol_minor++;
if ((protocol_minor = strchr (protocol, '/')))
protocol_minor++;
-
strfcpy (major, protocol, sizeof (major)
);
+
m_strcpy(major, sizeof(major), protocol
);
if ((t = strchr (major, '/')))
*t = '\0';
if ((t = strchr (major, '/')))
*t = '\0';