projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
finish the "read" of charset.c
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
5c0d497
..
bb55885
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-187,7
+187,7
@@
static void pgp_copy_clearsigned (FILE * fpin, STATE * s, char *charset)
char buf[HUGE_STRING];
short complete, armor_header;
char buf[HUGE_STRING];
short complete, armor_header;
-
FGETCONV
*fc;
+
fgetconv_t
*fc;
rewind (fpin);
rewind (fpin);
@@
-414,7
+414,7
@@
int pgp_application_pgp_handler (BODY * m, STATE * s)
pgp_copy_clearsigned (tmpfp, s, body_charset);
}
else if (pgpout) {
pgp_copy_clearsigned (tmpfp, s, body_charset);
}
else if (pgpout) {
-
FGETCONV
*fc;
+
fgetconv_t
*fc;
rewind (pgpout);
state_set_prefix (s);
rewind (pgpout);
state_set_prefix (s);
@@
-1348,9
+1348,9
@@
BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
else
from_charset = Charset;
else
from_charset = Charset;
- if (!
mut
t_is_us_ascii (body_charset)) {
+ if (!
charse
t_is_us_ascii (body_charset)) {
int c;
int c;
-
FGETCONV
*fc;
+
fgetconv_t
*fc;
if (flags & ENCRYPT)
send_charset = "us-ascii";
if (flags & ENCRYPT)
send_charset = "us-ascii";