#include <lib-mime/mime.h>
#include <lib-ui/curses.h>
+#include <lib-mx/mx.h>
-#include "mx.h"
#include "alias.h"
#include "handler.h"
#include "copy.h"
}
/* otherwise inline won't work...ask for revert */
- if ((i =
- query_quadoption (OPT_PGPMIMEAUTO,
- _
- ("Message can't be sent inline. Revert to using PGP/MIME?")))
+ if ((i = query_quadoption(OPT_PGPMIMEAUTO,
+ _("Message can't be sent inline. Revert to using PGP/MIME?")))
!= M_YES) {
mutt_error _("Mail not sent.");
}
-int crypt_write_signed (BODY * a, STATE * s, const char *tempfile)
+static void crypt_write_signed(BODY * a, STATE * s, FILE *fp)
{
- FILE *fp;
- int c;
- short hadcr;
- size_t bytes;
-
- if (!(fp = safe_fopen (tempfile, "w"))) {
- mutt_perror (tempfile);
- return -1;
- }
-
- fseeko (s->fpin, a->hdr_offset, 0);
- bytes = a->length + a->offset - a->hdr_offset;
- hadcr = 0;
- while (bytes > 0) {
- if ((c = fgetc (s->fpin)) == EOF)
- break;
-
- bytes--;
-
- if (c == '\r')
- hadcr = 1;
- else {
- if (c == '\n' && !hadcr)
- fputc ('\r', fp);
-
- hadcr = 0;
+ int c;
+ short hadcr;
+ size_t bytes;
+
+ fseeko (s->fpin, a->hdr_offset, 0);
+ bytes = a->length + a->offset - a->hdr_offset;
+ hadcr = 0;
+ while (bytes > 0) {
+ if ((c = fgetc (s->fpin)) == EOF)
+ break;
+
+ bytes--;
+
+ if (c == '\r')
+ hadcr = 1;
+ else {
+ if (c == '\n' && !hadcr)
+ fputc ('\r', fp);
+
+ hadcr = 0;
+ }
+ fputc (c, fp);
}
-
- fputc (c, fp);
-
- }
- fclose (fp);
-
- return 0;
}
address_t *tmp = NULL;
FILE *fpout;
- mutt_mktemp (tempfname);
- if (!(fpout = safe_fopen (tempfname, "w"))) {
- mutt_perror (tempfname);
+ fpout = m_tempfile(tempfname, sizeof(tempfname), NONULL(Tempdir), NULL);
+ if (!fpout) {
+ mutt_error(_("Could not create temporary file"));
return;
}
if (Context->hdrs[Context->v2r[i]]->security & ENCRYPT &&
!crypt_valid_passphrase (Context->hdrs[Context->v2r[i]]->
security)) {
- fclose (fpout);
+ m_fclose(&fpout);
break;
}
}
}
- fclose (fpout);
+ m_fclose(&fpout);
if (isendwin ())
mutt_any_key_to_continue (NULL);
int mutt_signed_handler (BODY * a, STATE * s)
{
char tempfile[_POSIX_PATH_MAX];
+ FILE * tempfp;
char *protocol;
int protocol_major = TYPEOTHER;
char *protocol_minor = NULL;
crypt_fetch_signatures (&signatures, a->next, &sigcnt);
if (sigcnt) {
- mutt_mktemp (tempfile);
- if (crypt_write_signed (a, s, tempfile) == 0) {
+ tempfp = m_tempfile(tempfile, sizeof(tempfile), NONULL(Tempdir), NULL);
+ if (!tempfp) {
+ mutt_error(_("Could not create temporary file"));
+ } else {
+ crypt_write_signed(a, s, tempfp);
+ m_fclose(&tempfp);
for (i = 0; i < sigcnt; i++) {
if (signatures[i]->type == TYPEAPPLICATION
&& !m_strcasecmp(signatures[i]->subtype, "pgp-signature")) {