#include "pgp.h"
#include "mime.h"
#include "copy.h"
+#include "attach.h"
#include "lib/mem.h"
#include "lib/intl.h"
fputs (line, fpout);
fputc ('\n', fpout);
}
- FREE (&line);
+ mem_free (&line);
}
else {
debug_print (2, ("No pattern.\n"));
state_attach_puts (_("[-- End of PGP output --]\n\n"), s);
}
}
- }
- /* treat empty result as sign of failure */
- if (pgpout !=NULL)
- if (! ftell(pgpout)) {
- mutt_error _("Could not decrypt PGP message");
- goto out;
+ /* treat empty result as sign of failure */
+ if (!(pgpout && ftell (pgpout))) {
+ mutt_error _("Could not decrypt PGP message");
+ goto out;
}
+ }
/*
* Now, copy cleartext to the screen. NOTE - we expect that PGP
k_info = pgp_getkeybystr (keyID, KEYFLAG_CANENCRYPT, PGP_PUBRING);
}
else if (r == -1) {
- FREE (&keylist);
+ mem_free (&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
if ((key = pgp_ask_for_key (buf, q->mailbox,
KEYFLAG_CANENCRYPT, PGP_PUBRING)) == NULL) {
- FREE (&keylist);
+ mem_free (&keylist);
rfc822_free_address (&tmp);
rfc822_free_address (&addr);
return NULL;
bypass_selection:
keylist_size += str_len (keyID) + 4;
- safe_realloc (&keylist, keylist_size);
+ mem_realloc (&keylist, keylist_size);
sprintf (keylist + keylist_used, "%s0x%s", keylist_used ? " " : "", /* __SPRINTF_CHECKED__ */
keyID);
keylist_used = str_len (keylist);