projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bye bye DT_SYS variables.
[apps/madmutt.git]
/
lib-crypt
/
pgp.c
diff --git
a/lib-crypt/pgp.c
b/lib-crypt/pgp.c
index
7a23728
..
297eb73
100644
(file)
--- a/
lib-crypt/pgp.c
+++ b/
lib-crypt/pgp.c
@@
-454,6
+454,7
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
char tempfile[_POSIX_PATH_MAX];
char buf[HUGE_STRING];
FILE *tfp;
char tempfile[_POSIX_PATH_MAX];
char buf[HUGE_STRING];
FILE *tfp;
+ int tempfd;
short sgn = 0;
short enc = 0;
short sgn = 0;
short enc = 0;
@@
-465,14
+466,14
@@
static int pgp_check_traditional_one_body (FILE * fp, BODY * b,
if (tagged_only && !b->tagged)
return 0;
if (tagged_only && !b->tagged)
return 0;
-
mutt_mktemp (tempfile
);
- if (mutt_decode_save_attachment (fp, b, tempf
ile, 0
, 0) != 0) {
+
tempfd = m_tempfd(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL
);
+ if (mutt_decode_save_attachment (fp, b, tempf
d
, 0) != 0) {
unlink (tempfile);
return 0;
}
unlink (tempfile);
return 0;
}
- if (
(tfp = fopen (tempfile, "r")) == NULL
) {
- unlink
(tempfile);
+ if (
!(tfp = fopen(tempfile, "r"))
) {
+ unlink(tempfile);
return 0;
}
return 0;
}
@@
-1022,8
+1023,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
last = &((*last)->next);
}
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
+ rfc822_qualify (tmp, fqdn);
address_list_uniq(tmp);
address_list_uniq(tmp);
@@
-1048,8
+1048,7
@@
char *pgp_findKeys (address_t * to, address_t * cc, address_t * bcc)
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
/* check for e-mail address */
if ((t = strchr (keyID, '@')) &&
(addr = rfc822_parse_adrlist (NULL, keyID))) {
- if (fqdn)
- rfc822_qualify (addr, fqdn);
+ rfc822_qualify (addr, fqdn);
q = addr;
}
else
q = addr;
}
else
@@
-1388,7
+1387,7
@@
BODY *pgp_traditional_encryptsign (BODY * a, int flags, char *keylist)
int pgp_send_menu (HEADER * msg, int *redraw)
{
pgp_key_t p;
int pgp_send_menu (HEADER * msg, int *redraw)
{
pgp_key_t p;
- char input_signas[S
HORT_S
TRING];
+ char input_signas[STRING];
char prompt[LONG_STRING];
char prompt[LONG_STRING];