projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drop the old string API fully.
[apps/madmutt.git]
/
pgpmicalg.c
diff --git
a/pgpmicalg.c
b/pgpmicalg.c
index
1b6ecc9
..
1c322be
100644
(file)
--- a/
pgpmicalg.c
+++ b/
pgpmicalg.c
@@
-19,7
+19,6
@@
#include "handler.h"
#include "pgp.h"
#include "pgppacket.h"
#include "handler.h"
#include "pgp.h"
#include "pgppacket.h"
-#include "mime.h"
#include "charset.h"
#include <stdio.h>
#include "charset.h"
#include <stdio.h>
@@
-27,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 {
@@
-83,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;
}