projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
oops
[apps/madmutt.git]
/
pgpmicalg.c
diff --git
a/pgpmicalg.c
b/pgpmicalg.c
index
344eba5
..
1c322be
100644
(file)
--- a/
pgpmicalg.c
+++ b/
pgpmicalg.c
@@
-16,9
+16,9
@@
#endif
#include "mutt.h"
#endif
#include "mutt.h"
+#include "handler.h"
#include "pgp.h"
#include "pgppacket.h"
#include "pgp.h"
#include "pgppacket.h"
-#include "mime.h"
#include "charset.h"
#include <stdio.h>
#include "charset.h"
#include <stdio.h>
@@
-26,6
+26,10
@@
#include <string.h>
#include <ctype.h>
#include <string.h>
#include <ctype.h>
+#include <lib-lib/file.h>
+
+#include <lib-mime/mime.h>
+
#include "lib/debug.h"
static struct {
#include "lib/debug.h"
static struct {
@@
-58,13
+62,13
@@
static const char *pgp_hash_to_micalg (short id)
static void pgp_dearmor (FILE * in, FILE * out)
{
char line[HUGE_STRING];
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;
char *r;
STATE state;
-
memset (&state, 0, sizeof (STATE)
);
+
p_clear(&state, 1
);
state.fpin = in;
state.fpout = out;
state.fpin = in;
state.fpout = out;
@@
-82,7
+86,7
@@
static void pgp_dearmor (FILE * in, FILE * out)
/* skip the armor header */
while ((r = fgets (line, sizeof (line), in)) != NULL) {
/* skip the armor header */
while ((r = fgets (line, sizeof (line), in)) != NULL) {
-
SKIPWS
(r);
+
r = vskipspaces
(r);
if (!*r)
break;
}
if (!*r)
break;
}
@@
-92,7
+96,7
@@
static void pgp_dearmor (FILE * in, FILE * out)
}
/* actual data starts here */
}
/* actual data starts here */
- start = ftell (in);
+ start = ftell
o
(in);
/* find the checksum */
/* find the checksum */
@@
-105,12
+109,12
@@
static void pgp_dearmor (FILE * in, FILE * out)
return;
}
return;
}
- if ((end = ftell
(in) - str_len
(line)) < start) {
+ if ((end = ftell
o (in) - m_strlen
(line)) < start) {
debug_print (1, ("end < start???\n"));
return;
}
debug_print (1, ("end < start???\n"));
return;
}
- if (fseek (in, start, SEEK_SET) == -1) {
+ if (fseek
o
(in, start, SEEK_SET) == -1) {
debug_print (1, ("Can't seekto start.\n"));
return;
}
debug_print (1, ("Can't seekto start.\n"));
return;
}