projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ADDRESS -> address_t
[apps/madmutt.git]
/
pgp.c
diff --git
a/pgp.c
b/pgp.c
index
13104bc
..
e198331
100644
(file)
--- a/
pgp.c
+++ b/
pgp.c
@@
-27,12
+27,13
@@
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
#include <lib-lib/macros.h>
#include <lib-lib/file.h>
+#include <lib-mime/mime.h>
+
#include "mutt.h"
#include "enter.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
#include "mutt.h"
#include "enter.h"
#include "handler.h"
#include "mutt_curses.h"
#include "pgp.h"
-#include "mime.h"
#include "copy.h"
#include "attach.h"
#include "copy.h"
#include "attach.h"
@@
-211,7
+212,7
@@
static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset)
break;
if (armor_header) {
break;
if (armor_header) {
- char *p =
str_skip_initws
(buf);
+ char *p =
vskipspaces
(buf);
if (*p == '\0')
armor_header = 0;
if (*p == '\0')
armor_header = 0;
@@
-269,7
+270,7
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
bytes -= (offset - last_pos); /* don't rely on m_strlen(buf) */
last_pos = offset;
- if (
str_ncmp
("-----BEGIN PGP ", buf, 15) == 0) {
+ if (
m_strncmp
("-----BEGIN PGP ", buf, 15) == 0) {
clearsign = 0;
start_pos = last_pos;
clearsign = 0;
start_pos = last_pos;
@@
-507,7
+508,7
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
}
while (fgets (buf, sizeof (buf), tfp)) {
}
while (fgets (buf, sizeof (buf), tfp)) {
- if (
str_ncmp
("-----BEGIN PGP ", buf, 15) == 0) {
+ if (
m_strncmp
("-----BEGIN PGP ", buf, 15) == 0) {
if (m_strcmp("MESSAGE-----\n", buf + 15) == 0)
enc = 1;
else if (m_strcmp("SIGNED MESSAGE-----\n", buf + 15) == 0)
if (m_strcmp("MESSAGE-----\n", buf + 15) == 0)
enc = 1;
else if (m_strcmp("SIGNED MESSAGE-----\n", buf + 15) == 0)
@@
-1077,14
+1078,14
@@
static short is_numerical_keyid (const char *s)
/* This routine attempts to find the keyids of the recipients of a message.
* It returns NULL if any of the keys can not be found.
*/
/* This routine attempts to find the keyids of the recipients of a message.
* It returns NULL if any of the keys can not be found.
*/
-char *pgp_findKeys (
ADDRESS * to, ADDRESS * cc, ADDRESS
* bcc)
+char *pgp_findKeys (
address_t * to, address_t * cc, address_t
* bcc)
{
char *keyID, *keylist = NULL, *t;
size_t keylist_size = 0;
size_t keylist_used = 0;
{
char *keyID, *keylist = NULL, *t;
size_t keylist_size = 0;
size_t keylist_used = 0;
-
ADDRESS
*tmp = NULL, *addr = NULL;
-
ADDRESS
**last = &tmp;
-
ADDRESS
*p, *q;
+
address_t
*tmp = NULL, *addr = NULL;
+
address_t
**last = &tmp;
+
address_t
*p, *q;
int i;
pgp_key_t k_info = NULL, key = NULL;
int i;
pgp_key_t k_info = NULL, key = NULL;